diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3e1635228df..20b0c5d4718 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ You are welcome to submit a contribution for review and possible inclusion in th 2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html). -3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. +3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission. 4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. @@ -14,11 +14,11 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code. #### Branches -PRs should usually be made to the `staging` branch as this contains the most recent version of the code. +PRs should usually be made to the `4.0-dev` branch as this contains the most recent version of the code. There are other branches available which serve specific purposes. | Branch | Purpose | | ------ | ------- | -| staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. The 3.9.0 release will include the Privacy Tools Suite features. | -| 3.10-dev | Branch for the next minor Joomla version. The 3.10.0 release will only include compatibility features for 4.0. Commits to staging will be applied to this branch as well. | -| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. | +| 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. | +| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. | +| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. | diff --git a/README.md b/README.md index d44022a4796..597575304eb 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,13 @@ Joomla is not installable out of the box from this repository, please use: How to get a working installation from the source --------------------- -For detailed instructions please visit https://docs.joomla.org/J4.x:Setting_Up_Your_Local_Environment +For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment You will need: -- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Configuring_a_LAMPP_server_for_PHP_development) +- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Special:MyLanguage/Configuring_a_LAMPP_server_for_PHP_development) - Composer - for managing Joomla's PHP Dependencies. For help installing composer please read the documentation at https://getcomposer.org/doc/00-intro.md - Node.js - for compiling Joomla's Javascript and SASS files. For help installing Node.js please follow the instructions available on https://nodejs.org/en/ -- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc). +- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc). **Steps to setup the local environment:** - Clone the repository: @@ -70,6 +70,7 @@ Do you want to improve Joomla? * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org). * Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers). * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers). +* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms) Copyright --------------------- diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 2f162b8c3ab..039caafc6bc 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -91,8 +91,9 @@ public function update($installer) // Informational log only } - // Ensure we delete the repeatable fields plugin before we remove its files + // Uninstall plugins before removing their files and folders $this->uninstallRepeatableFieldsPlugin(); + $this->uninstallEosPlugin(); // This needs to stay for 2.5 update compatibility $this->deleteUnexistingFiles(); @@ -507,6 +508,56 @@ protected function uninstallRepeatableFieldsPlugin() } } + /** + * Uninstall the 3.10 EOS plugin + * + * @return void + * + * @since 4.0.0 + */ + protected function uninstallEosPlugin() + { + $db = Factory::getDbo(); + + // Check if the plg_quickicon_eos310 plugin is present + $extensionId = $db->setQuery( + $db->getQuery(true) + ->select('extension_id') + ->from('#__extensions') + ->where('name = ' . $db->quote('plg_quickicon_eos310')) + )->loadResult(); + + // Skip uninstalling if it doesn't exist + if (!$extensionId) + { + return; + } + + try + { + $db->transactionStart(); + + // Unprotect the plugin so we can uninstall it + $db->setQuery( + $db->getQuery(true) + ->update('#__extensions') + ->set('protected = 0') + ->where($db->quoteName('extension_id') . ' = ' . $extensionId) + )->execute(); + + // Uninstall the plugin + $installer = new Installer; + $installer->uninstall('plugin', $extensionId); + + $db->transactionCommit(); + } + catch (\Exception $e) + { + $db->transactionRollback(); + throw $e; + } + } + /** * Update the manifest caches * @@ -644,6 +695,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql', '/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql', '/administrator/components/com_admin/sql/updates/mysql/3.10.0-2020-08-10.sql', + '/administrator/components/com_admin/sql/updates/mysql/3.10.0-2021-05-28.sql', '/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql', '/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql', '/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql', @@ -765,6 +817,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql', '/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql', '/administrator/components/com_admin/sql/updates/postgresql/3.10.0-2020-08-10.sql', + '/administrator/components/com_admin/sql/updates/postgresql/3.10.0-2021-05-28.sql', '/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql', '/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql', '/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql', @@ -887,6 +940,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql', '/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql', '/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql', + '/administrator/components/com_admin/sql/updates/sqlazure/3.10.0-2021-05-28.sql', '/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql', '/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql', '/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql', @@ -2854,6 +2908,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/components/com_contact/helpers/association.php', '/components/com_contact/helpers/category.php', '/components/com_contact/helpers/legacyrouter.php', + '/components/com_contact/layouts/joomla/form/renderfield.php', '/components/com_contact/models/categories.php', '/components/com_contact/models/category.php', '/components/com_contact/models/contact.php', @@ -3800,6 +3855,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/src/Form/FormWrapper.php', '/libraries/src/Helper/ContentHistoryHelper.php', '/libraries/src/Helper/SearchHelper.php', + '/libraries/src/Http/Transport/cacert.pem', '/libraries/src/Http/Wrapper/FactoryWrapper.php', '/libraries/src/Language/LanguageStemmer.php', '/libraries/src/Language/Stemmer/Porteren.php', @@ -4801,20 +4857,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/system/css/jquery.Jcrop.min.css', '/media/system/css/modal.css', '/media/system/css/system.css', - '/media/system/images/modal/bg_e.png', - '/media/system/images/modal/bg_n.png', - '/media/system/images/modal/bg_ne.png', - '/media/system/images/modal/bg_nw.png', - '/media/system/images/modal/bg_s.png', - '/media/system/images/modal/bg_se.png', - '/media/system/images/modal/bg_sw.png', - '/media/system/images/modal/bg_w.png', - '/media/system/images/modal/closebox.png', - '/media/system/images/modal/spinner.gif', - '/media/system/images/notice-alert.png', - '/media/system/images/notice-download.png', - '/media/system/images/notice-info.png', - '/media/system/images/notice-note.png', '/media/system/js/associations-edit-uncompressed.js', '/media/system/js/associations-edit.js', '/media/system/js/calendar-setup-uncompressed.js', @@ -4830,6 +4872,50 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/system/js/combobox-uncompressed.js', '/media/system/js/combobox.js', '/media/system/js/core-uncompressed.js', + '/media/system/js/fields/calendar-locales/af.js', + '/media/system/js/fields/calendar-locales/ar.js', + '/media/system/js/fields/calendar-locales/bg.js', + '/media/system/js/fields/calendar-locales/bn.js', + '/media/system/js/fields/calendar-locales/bs.js', + '/media/system/js/fields/calendar-locales/ca.js', + '/media/system/js/fields/calendar-locales/cs.js', + '/media/system/js/fields/calendar-locales/cy.js', + '/media/system/js/fields/calendar-locales/da.js', + '/media/system/js/fields/calendar-locales/de.js', + '/media/system/js/fields/calendar-locales/el.js', + '/media/system/js/fields/calendar-locales/en.js', + '/media/system/js/fields/calendar-locales/es.js', + '/media/system/js/fields/calendar-locales/eu.js', + '/media/system/js/fields/calendar-locales/fa-ir.js', + '/media/system/js/fields/calendar-locales/fi.js', + '/media/system/js/fields/calendar-locales/fr.js', + '/media/system/js/fields/calendar-locales/ga.js', + '/media/system/js/fields/calendar-locales/hr.js', + '/media/system/js/fields/calendar-locales/hu.js', + '/media/system/js/fields/calendar-locales/it.js', + '/media/system/js/fields/calendar-locales/ja.js', + '/media/system/js/fields/calendar-locales/ka.js', + '/media/system/js/fields/calendar-locales/kk.js', + '/media/system/js/fields/calendar-locales/ko.js', + '/media/system/js/fields/calendar-locales/lt.js', + '/media/system/js/fields/calendar-locales/mk.js', + '/media/system/js/fields/calendar-locales/nb.js', + '/media/system/js/fields/calendar-locales/nl.js', + '/media/system/js/fields/calendar-locales/pl.js', + '/media/system/js/fields/calendar-locales/prs-af.js', + '/media/system/js/fields/calendar-locales/pt.js', + '/media/system/js/fields/calendar-locales/ru.js', + '/media/system/js/fields/calendar-locales/sk.js', + '/media/system/js/fields/calendar-locales/sl.js', + '/media/system/js/fields/calendar-locales/sr-rs.js', + '/media/system/js/fields/calendar-locales/sr-yu.js', + '/media/system/js/fields/calendar-locales/sv.js', + '/media/system/js/fields/calendar-locales/sw.js', + '/media/system/js/fields/calendar-locales/ta.js', + '/media/system/js/fields/calendar-locales/th.js', + '/media/system/js/fields/calendar-locales/uk.js', + '/media/system/js/fields/calendar-locales/zh-CN.js', + '/media/system/js/fields/calendar-locales/zh-TW.js', '/media/system/js/frontediting-uncompressed.js', '/media/system/js/frontediting.js', '/media/system/js/helpsite.js', @@ -5860,9 +5946,142 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/com_fields/js/admin-field-edit-modal.min.js', '/media/com_fields/js/admin-field-edit-modal.min.js.gz', // 4.0 from RC 3 to RC 4 - '/components/com_contact/layouts/joomla/form/renderfield.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php', + '/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php', '/language/en-GB/com_messages.ini', - '/libraries/src/Http/Transport/cacert.pem', + '/media/system/css/fields/joomla-image-select.css', + '/media/system/css/fields/joomla-image-select.min.css', + '/media/system/css/fields/joomla-image-select.min.css.gz', + '/media/system/js/fields/joomla-image-select-es5.js', + '/media/system/js/fields/joomla-image-select-es5.min.js', + '/media/system/js/fields/joomla-image-select-es5.min.js.gz', + '/media/system/js/fields/joomla-image-select.js', + '/media/system/js/fields/joomla-image-select.min.js', + '/media/system/js/fields/joomla-image-select.min.js.gz', + // 4.0 from RC 4 to RC 5 + '/media/system/js/fields/calendar-locales/af.min.js', + '/media/system/js/fields/calendar-locales/af.min.js.gz', + '/media/system/js/fields/calendar-locales/ar.min.js', + '/media/system/js/fields/calendar-locales/ar.min.js.gz', + '/media/system/js/fields/calendar-locales/bg.min.js', + '/media/system/js/fields/calendar-locales/bg.min.js.gz', + '/media/system/js/fields/calendar-locales/bn.min.js', + '/media/system/js/fields/calendar-locales/bn.min.js.gz', + '/media/system/js/fields/calendar-locales/bs.min.js', + '/media/system/js/fields/calendar-locales/bs.min.js.gz', + '/media/system/js/fields/calendar-locales/ca.min.js', + '/media/system/js/fields/calendar-locales/ca.min.js.gz', + '/media/system/js/fields/calendar-locales/cs.min.js', + '/media/system/js/fields/calendar-locales/cs.min.js.gz', + '/media/system/js/fields/calendar-locales/cy.min.js', + '/media/system/js/fields/calendar-locales/cy.min.js.gz', + '/media/system/js/fields/calendar-locales/da.min.js', + '/media/system/js/fields/calendar-locales/da.min.js.gz', + '/media/system/js/fields/calendar-locales/de.min.js', + '/media/system/js/fields/calendar-locales/de.min.js.gz', + '/media/system/js/fields/calendar-locales/el.min.js', + '/media/system/js/fields/calendar-locales/el.min.js.gz', + '/media/system/js/fields/calendar-locales/en.min.js', + '/media/system/js/fields/calendar-locales/en.min.js.gz', + '/media/system/js/fields/calendar-locales/es.min.js', + '/media/system/js/fields/calendar-locales/es.min.js.gz', + '/media/system/js/fields/calendar-locales/eu.min.js', + '/media/system/js/fields/calendar-locales/eu.min.js.gz', + '/media/system/js/fields/calendar-locales/fa-ir.min.js', + '/media/system/js/fields/calendar-locales/fa-ir.min.js.gz', + '/media/system/js/fields/calendar-locales/fi.min.js', + '/media/system/js/fields/calendar-locales/fi.min.js.gz', + '/media/system/js/fields/calendar-locales/fr.min.js', + '/media/system/js/fields/calendar-locales/fr.min.js.gz', + '/media/system/js/fields/calendar-locales/ga.min.js', + '/media/system/js/fields/calendar-locales/ga.min.js.gz', + '/media/system/js/fields/calendar-locales/hr.min.js', + '/media/system/js/fields/calendar-locales/hr.min.js.gz', + '/media/system/js/fields/calendar-locales/hu.min.js', + '/media/system/js/fields/calendar-locales/hu.min.js.gz', + '/media/system/js/fields/calendar-locales/it.min.js', + '/media/system/js/fields/calendar-locales/it.min.js.gz', + '/media/system/js/fields/calendar-locales/ja.min.js', + '/media/system/js/fields/calendar-locales/ja.min.js.gz', + '/media/system/js/fields/calendar-locales/ka.min.js', + '/media/system/js/fields/calendar-locales/ka.min.js.gz', + '/media/system/js/fields/calendar-locales/kk.min.js', + '/media/system/js/fields/calendar-locales/kk.min.js.gz', + '/media/system/js/fields/calendar-locales/ko.min.js', + '/media/system/js/fields/calendar-locales/ko.min.js.gz', + '/media/system/js/fields/calendar-locales/lt.min.js', + '/media/system/js/fields/calendar-locales/lt.min.js.gz', + '/media/system/js/fields/calendar-locales/mk.min.js', + '/media/system/js/fields/calendar-locales/mk.min.js.gz', + '/media/system/js/fields/calendar-locales/nb.min.js', + '/media/system/js/fields/calendar-locales/nb.min.js.gz', + '/media/system/js/fields/calendar-locales/nl.min.js', + '/media/system/js/fields/calendar-locales/nl.min.js.gz', + '/media/system/js/fields/calendar-locales/pl.min.js', + '/media/system/js/fields/calendar-locales/pl.min.js.gz', + '/media/system/js/fields/calendar-locales/prs-af.min.js', + '/media/system/js/fields/calendar-locales/prs-af.min.js.gz', + '/media/system/js/fields/calendar-locales/pt.min.js', + '/media/system/js/fields/calendar-locales/pt.min.js.gz', + '/media/system/js/fields/calendar-locales/ru.min.js', + '/media/system/js/fields/calendar-locales/ru.min.js.gz', + '/media/system/js/fields/calendar-locales/sk.min.js', + '/media/system/js/fields/calendar-locales/sk.min.js.gz', + '/media/system/js/fields/calendar-locales/sl.min.js', + '/media/system/js/fields/calendar-locales/sl.min.js.gz', + '/media/system/js/fields/calendar-locales/sr-rs.min.js', + '/media/system/js/fields/calendar-locales/sr-rs.min.js.gz', + '/media/system/js/fields/calendar-locales/sr-yu.min.js', + '/media/system/js/fields/calendar-locales/sr-yu.min.js.gz', + '/media/system/js/fields/calendar-locales/sv.min.js', + '/media/system/js/fields/calendar-locales/sv.min.js.gz', + '/media/system/js/fields/calendar-locales/sw.min.js', + '/media/system/js/fields/calendar-locales/sw.min.js.gz', + '/media/system/js/fields/calendar-locales/ta.min.js', + '/media/system/js/fields/calendar-locales/ta.min.js.gz', + '/media/system/js/fields/calendar-locales/th.min.js', + '/media/system/js/fields/calendar-locales/th.min.js.gz', + '/media/system/js/fields/calendar-locales/uk.min.js', + '/media/system/js/fields/calendar-locales/uk.min.js.gz', + '/media/system/js/fields/calendar-locales/zh-CN.min.js', + '/media/system/js/fields/calendar-locales/zh-CN.min.js.gz', + '/media/system/js/fields/calendar-locales/zh-TW.min.js', + '/media/system/js/fields/calendar-locales/zh-TW.min.js.gz', + // 4.0 from RC 5 to RC 6 + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.js', + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js', + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js.gz', + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu.js', + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu.min.js', + '/media/templates/cassiopeia/js/mod_menu/menu-metismenu.min.js.gz', + '/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.css', + '/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css', + '/templates/cassiopeia/css/vendor/fontawesome-free/fontawesome.min.css.gz', + '/templates/cassiopeia/scss/vendor/fontawesome-free/fontawesome.scss', + // 4.0 from RC 6 to 4.0.0 (stable) + '/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToIdnTest.php', + '/libraries/vendor/algo26-matthias/idna-convert/tests/integration/ToUnicodeTest.php', + '/libraries/vendor/algo26-matthias/idna-convert/tests/unit/.gitkeep', + '/libraries/vendor/algo26-matthias/idna-convert/tests/unit/namePrepTest.php', + '/libraries/vendor/doctrine/inflector/docs/en/index.rst', + '/libraries/vendor/jakeasmith/http_build_url/tests/HttpBuildUrlTest.php', + '/libraries/vendor/jakeasmith/http_build_url/tests/bootstrap.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptLanguageTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/AcceptTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/BaseAcceptTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/CharsetNegotiatorTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/EncodingNegotiatorTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/LanguageNegotiatorTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/MatchTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/NegotiatorTest.php', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/TestCase.php', + '/libraries/vendor/willdurand/negotiation/tests/bootstrap.php', ); $folders = array( @@ -5935,7 +6154,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/plugins/content/confirmconsent/fields', '/plugins/captcha/recaptcha/postinstall', '/plugins/authentication/gmail', - '/media/system/images/modal', '/media/plg_twofactorauth_totp/js', '/media/plg_twofactorauth_totp', '/media/plg_system_highlight', @@ -6460,6 +6678,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/components/com_contact/models/rules', '/components/com_contact/models/forms', '/components/com_contact/models', + '/components/com_contact/layouts/joomla/form', + '/components/com_contact/layouts/joomla', '/components/com_contact/controllers', '/components/com_config/view/templates/tmpl', '/components/com_config/view/templates', @@ -7054,7 +7274,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/joomla/controller', '/api/components/com_installer/src/View/Languages', '/administrator/components/com_finder/src/Indexer/Driver', - // 4.0 from Beta 2 to Beta 5 + // 4.0 from Beta 4 to Beta 5 '/plugins/content/imagelazyload', // 4.0 from Beta 5 to Beta 6 '/media/system/js/core.es6', @@ -7103,6 +7323,22 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/administrator/components/com_admin/tmpl/profile', '/administrator/components/com_admin/src/View/Profile', '/administrator/components/com_admin/forms', + // 4.0 from RC 5 to RC 6 + '/templates/cassiopeia/scss/vendor/fontawesome-free', + '/templates/cassiopeia/css/vendor/fontawesome-free', + '/media/templates/cassiopeia/js/mod_menu', + '/media/templates/cassiopeia/js', + '/media/templates/cassiopeia', + // 4.0 from RC 6 to 4.0.0 (stable) + '/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests', + '/libraries/vendor/willdurand/negotiation/tests/Negotiation', + '/libraries/vendor/willdurand/negotiation/tests', + '/libraries/vendor/jakeasmith/http_build_url/tests', + '/libraries/vendor/doctrine/inflector/docs/en', + '/libraries/vendor/doctrine/inflector/docs', + '/libraries/vendor/algo26-matthias/idna-convert/tests/unit', + '/libraries/vendor/algo26-matthias/idna-convert/tests/integration', + '/libraries/vendor/algo26-matthias/idna-convert/tests', ); $status['files_checked'] = $files; diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql index 8283d5d2772..dbae8b67ed5 100644 --- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql +++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql @@ -20,8 +20,8 @@ INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, ` ('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES -('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 1 AND `template` IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'), -('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 0 AND `template` IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}'); +('atum', 1, (CASE WHEN (SELECT b.`count` FROM (SELECT count(a.`id`) AS `count` FROM `#__template_styles` a WHERE a.`home` = '1' AND a.`client_id` = 1 AND a.`template` IN ('isis', 'hathor')) AS b) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'), +('cassiopeia', 0, (CASE WHEN (SELECT d.`count` FROM (SELECT count(c.`id`) AS `count` FROM `#__template_styles` c WHERE c.`home` = '1' AND c.`client_id` = 0 AND c.`template` IN ('protostar', 'beez3')) AS d) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}'); -- -- Move mod_version to the right position for the atum template diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql index 817cb62c9fa..d6620523b66 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql @@ -20,8 +20,8 @@ INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", " ('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); INSERT INTO "#__template_styles" ("template", "client_id", "home", "title", "params") VALUES -('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 1 AND "template" IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'), -('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 0 AND "template" IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}'); +('atum', 1, (CASE WHEN (SELECT b."count" FROM (SELECT count(a."id") AS "count" FROM "#__template_styles" a WHERE a."home" = '1' AND a."client_id" = 1 AND a."template" IN ('isis', 'hathor')) AS b) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'), +('cassiopeia', 0, (CASE WHEN (SELECT d."count" FROM (SELECT count(c."id") AS "count" FROM "#__template_styles" c WHERE c."home" = '1' AND c."client_id" = 0 AND c."template" IN ('protostar', 'beez3')) AS d) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}'); -- -- Move mod_version to the right position for the atum template diff --git a/administrator/components/com_admin/tmpl/sysinfo/default.php b/administrator/components/com_admin/tmpl/sysinfo/default.php index d1fc8f05b13..8423582c109 100644 --- a/administrator/components/com_admin/tmpl/sysinfo/default.php +++ b/administrator/components/com_admin/tmpl/sysinfo/default.php @@ -16,7 +16,7 @@ ?>
- 'site']); ?> + 'site', 'recall' => true, 'breakpoint' => 768]); ?> loadTemplate('system'); ?> diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 3ed40def53a..68484020dff 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -120,9 +120,9 @@ escape($item->title); ?> typeFields['alias'])) : ?> - +
escape($item->alias)); ?> - +
typeFields['catid'])) : ?>
diff --git a/administrator/components/com_banners/src/Model/BannersModel.php b/administrator/components/com_banners/src/Model/BannersModel.php index 2fc49a19660..6a18caa75c7 100644 --- a/administrator/components/com_banners/src/Model/BannersModel.php +++ b/administrator/components/com_banners/src/Model/BannersModel.php @@ -28,7 +28,6 @@ class BannersModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/administrator/components/com_banners/src/Model/ClientsModel.php b/administrator/components/com_banners/src/Model/ClientsModel.php index c967622224d..da569440e06 100644 --- a/administrator/components/com_banners/src/Model/ClientsModel.php +++ b/administrator/components/com_banners/src/Model/ClientsModel.php @@ -27,7 +27,6 @@ class ClientsModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php index 6a893acf9a9..17597aa89ff 100644 --- a/administrator/components/com_banners/src/Model/TracksModel.php +++ b/administrator/components/com_banners/src/Model/TracksModel.php @@ -40,7 +40,6 @@ class TracksModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php index 3badc363819..3320b312111 100644 --- a/administrator/components/com_banners/tmpl/banner/edit.php +++ b/administrator/components/com_banners/tmpl/banner/edit.php @@ -29,7 +29,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php index 0bedb508b34..8e34d411148 100644 --- a/administrator/components/com_banners/tmpl/banners/default.php +++ b/administrator/components/com_banners/tmpl/banners/default.php @@ -137,9 +137,9 @@ escape($item->name); ?> - +
escape($item->alias)); ?> - +
escape($item->category_title); ?>
diff --git a/administrator/components/com_banners/tmpl/banners/default_batch_body.php b/administrator/components/com_banners/tmpl/banners/default_batch_body.php index e35f0ca9d83..f53c0395e2d 100644 --- a/administrator/components/com_banners/tmpl/banners/default_batch_body.php +++ b/administrator/components/com_banners/tmpl/banners/default_batch_body.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; /** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */ @@ -20,11 +21,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php index 76f95f9f474..9b8466a5301 100644 --- a/administrator/components/com_banners/tmpl/client/edit.php +++ b/administrator/components/com_banners/tmpl/client/edit.php @@ -28,7 +28,7 @@
- 'general']); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?> item->id) ? Text::_('COM_BANNERS_NEW_CLIENT') : Text::_('COM_BANNERS_EDIT_CLIENT')); ?>
diff --git a/administrator/components/com_banners/tmpl/download/default.php b/administrator/components/com_banners/tmpl/download/default.php index 2fd1ab213dc..ed5be743908 100644 --- a/administrator/components/com_banners/tmpl/download/default.php +++ b/administrator/components/com_banners/tmpl/download/default.php @@ -11,7 +11,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Router\Route; -use \Joomla\CMS\Session\Session; +use Joomla\CMS\Session\Session; /** @var \Joomla\Component\Banners\Administrator\View\Download\HtmlView $this */ diff --git a/administrator/components/com_cache/src/View/Cache/HtmlView.php b/administrator/components/com_cache/src/View/Cache/HtmlView.php index cb57886f9a4..58ee08bdf95 100644 --- a/administrator/components/com_cache/src/View/Cache/HtmlView.php +++ b/administrator/components/com_cache/src/View/Cache/HtmlView.php @@ -11,7 +11,6 @@ \defined('_JEXEC') or die; -use Exception; use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; use Joomla\CMS\Language\Text; diff --git a/administrator/components/com_categories/src/Controller/CategoryController.php b/administrator/components/com_categories/src/Controller/CategoryController.php index 2fe54ba6751..ea78b2ccdcf 100644 --- a/administrator/components/com_categories/src/Controller/CategoryController.php +++ b/administrator/components/com_categories/src/Controller/CategoryController.php @@ -45,7 +45,6 @@ class CategoryController extends FormController * @param Input|null $input Input * * @since 1.6 - * @see \JControllerLegacy * @throws \Exception */ public function __construct($config = array(), MVCFactoryInterface $factory = null, CMSApplication $app = null, Input $input = null) diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php index f025f7cca1d..019362535d4 100644 --- a/administrator/components/com_categories/src/Model/CategoriesModel.php +++ b/administrator/components/com_categories/src/Model/CategoriesModel.php @@ -34,7 +34,6 @@ class CategoriesModel extends ListModel * @param array $config An optional associative array of configuration settings. * @param MVCFactoryInterface|null $factory The factory. * - * @see \JControllerLegacy * @since 1.6 */ public function __construct($config = array(), MVCFactoryInterface $factory = null) diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php index 9cda90741fb..41b109ce7c9 100644 --- a/administrator/components/com_categories/tmpl/categories/default.php +++ b/administrator/components/com_categories/tmpl/categories/default.php @@ -200,13 +200,13 @@
- - note)) : ?> - escape($item->alias)); ?> - - escape($item->alias), $this->escape($item->note)); ?> - - + + note)) : ?> + escape($item->alias)); ?> + + escape($item->alias), $this->escape($item->note)); ?> + +
items[0]) && property_exists($this->items[0], 'count_published')) : ?> diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_body.php b/administrator/components/com_categories/tmpl/categories/default_batch_body.php index d995527ffc3..700addd6f67 100644 --- a/administrator/components/com_categories/tmpl/categories/default_batch_body.php +++ b/administrator/components/com_categories/tmpl/categories/default_batch_body.php @@ -9,6 +9,7 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; @@ -19,11 +20,13 @@
-
-
- + +
+
+ +
-
+
@@ -47,7 +50,7 @@
-
+
@@ -59,4 +62,3 @@
- diff --git a/administrator/components/com_categories/tmpl/category/edit.php b/administrator/components/com_categories/tmpl/category/edit.php index fd91c60e970..26dfa454f4a 100644 --- a/administrator/components/com_categories/tmpl/category/edit.php +++ b/administrator/components/com_categories/tmpl/category/edit.php @@ -34,12 +34,14 @@ $c = Factory::getApplication()->bootComponent($this->state->get('category.extension')); -$wcontext = $c->getCategoryWorkflowContext($this->state->get('category.section')); - -if (!$c instanceof WorkflowServiceInterface - || !$c->isWorkflowActive($wcontext)) +if ($c instanceof WorkflowServiceInterface) { - $this->ignore_fieldsets[] = 'workflow'; + $wcontext = $c->getCategoryWorkflowContext($this->state->get('category.section')); + + if (!$c->isWorkflowActive($wcontext)) + { + $this->ignore_fieldsets[] = 'workflow'; + } } $this->useCoreUI = true; @@ -55,7 +57,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php index e3f447d5d06..35b73e3e145 100644 --- a/administrator/components/com_config/tmpl/application/default.php +++ b/administrator/components/com_config/tmpl/application/default.php @@ -36,7 +36,7 @@
- 'page-site')); ?> + 'page-site', 'recall' => true, 'breakpoint' => 768]); ?> loadTemplate('site'); ?> loadTemplate('metadata'); ?> diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php index 121264b1ed7..ad464613ad6 100644 --- a/administrator/components/com_config/tmpl/component/default.php +++ b/administrator/components/com_config/tmpl/component/default.php @@ -56,7 +56,7 @@ fieldsets) : ?> - + true, 'breakpoint' => 768]); ?> fieldsets as $name => $fieldSet) : ?>
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768)); ?> item->id) ? Text::_('COM_CONTACT_NEW_CONTACT') : Text::_('COM_CONTACT_EDIT_CONTACT')); ?>
@@ -97,7 +98,7 @@
- +
@@ -105,7 +106,7 @@
- +
@@ -115,10 +116,10 @@
- -
- -
+ +
+ +
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php index 88485b20643..a50bb39c2a0 100644 --- a/administrator/components/com_contact/tmpl/contacts/default.php +++ b/administrator/components/com_contact/tmpl/contacts/default.php @@ -142,9 +142,9 @@ escape($item->name); ?> - +
escape($item->alias)); ?> - +
escape($item->category_title); ?>
diff --git a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php index db6035a4feb..4d5bcd3610f 100644 --- a/administrator/components/com_contact/tmpl/contacts/default_batch_body.php +++ b/administrator/components/com_contact/tmpl/contacts/default_batch_body.php @@ -8,6 +8,7 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; $published = $this->state->get('filter.published'); @@ -16,11 +17,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_content/forms/category.xml b/administrator/components/com_content/forms/category.xml index 61f0f961f17..7fb3cbd4790 100644 --- a/administrator/components/com_content/forms/category.xml +++ b/administrator/components/com_content/forms/category.xml @@ -10,7 +10,7 @@ size="1" sql_select="id, title" sql_from="#__workflows" - sql_where="published = 1" + sql_where="published = 1 AND extension = 'com_content.article'" sql_order="ordering" key_field="id" value_field="title" diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php index 81065a2b674..84780cc8ec0 100644 --- a/administrator/components/com_content/src/Extension/ContentComponent.php +++ b/administrator/components/com_content/src/Extension/ContentComponent.php @@ -202,7 +202,7 @@ public function getWorkflowContexts(): array * * @return string|null * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getCategoryWorkflowContext(?string $section = null): string { diff --git a/administrator/components/com_content/src/Helper/ContentHelper.php b/administrator/components/com_content/src/Helper/ContentHelper.php index 539a8aedd25..3d26fc915fc 100644 --- a/administrator/components/com_content/src/Helper/ContentHelper.php +++ b/administrator/components/com_content/src/Helper/ContentHelper.php @@ -116,6 +116,7 @@ public static function onPrepareForm(Form $form, $data) [ $db->quoteName('default') . ' = 1', $db->quoteName('published') . ' = 1', + $db->quoteName('extension') . ' = ' . $db->quote('com_content.article'), ] ); @@ -146,6 +147,7 @@ public static function onPrepareForm(Form $form, $data) [ $db->quoteName('id') . ' = :workflowId', $db->quoteName('published') . ' = 1', + $db->quoteName('extension') . ' = ' . $db->quote('com_content.article'), ] ) ->bind(':workflowId', $workflow_id, ParameterType::INTEGER); diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php index bf359a97e0f..fd9add68c99 100644 --- a/administrator/components/com_content/tmpl/article/edit.php +++ b/administrator/components/com_content/tmpl/article/edit.php @@ -56,7 +56,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 062d2ff8782..d3fa1fb904e 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -221,7 +221,8 @@ 'transitions' => $transitions, 'title' => Text::_($item->stage_title), 'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)), - 'id' => 'workflow-' . $item->id + 'id' => 'workflow-' . $item->id, + 'task' => 'articles.runTransition' ]; echo (new TransitionButton($options)) diff --git a/administrator/components/com_content/tmpl/articles/default_batch_body.php b/administrator/components/com_content/tmpl/articles/default_batch_body.php index ecd8a930ad4..eaa3e08bbea 100644 --- a/administrator/components/com_content/tmpl/articles/default_batch_body.php +++ b/administrator/components/com_content/tmpl/articles/default_batch_body.php @@ -10,6 +10,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; $params = ComponentHelper::getParams('com_content'); @@ -21,11 +22,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 52624114666..c57e7ef6f93 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -227,7 +227,8 @@ 'transitions' => $transitions, 'title' => Text::_($item->stage_title), 'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)), - 'id' => 'workflow-' . $item->id + 'id' => 'workflow-' . $item->id, + 'task' => 'articles.runTransitions' ]; echo (new TransitionButton($options)) diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php index 65e5950db36..a357d89c792 100644 --- a/administrator/components/com_fields/tmpl/field/edit.php +++ b/administrator/components/com_fields/tmpl/field/edit.php @@ -32,7 +32,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php index ee46daf5d96..5736147e551 100644 --- a/administrator/components/com_fields/tmpl/fields/default.php +++ b/administrator/components/com_fields/tmpl/fields/default.php @@ -144,13 +144,13 @@ escape($item->title); ?> - +
note)) : ?> escape($item->name)); ?> escape($item->name), $this->escape($item->note)); ?> - +
only_use_in_subform) : ?>
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php index 5c07fe160b8..700f26699ad 100644 --- a/administrator/components/com_fields/tmpl/fields/default_batch_body.php +++ b/administrator/components/com_fields/tmpl/fields/default_batch_body.php @@ -9,6 +9,7 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; @@ -22,11 +23,13 @@
-
-
- + +
+
+ +
-
+
@@ -35,7 +38,7 @@
-
+
state->get('filter.context') . '&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" aria-label="item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate">
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php index e4f1ab82d31..3a67ff0042e 100644 --- a/administrator/components/com_fields/tmpl/groups/default.php +++ b/administrator/components/com_fields/tmpl/groups/default.php @@ -136,11 +136,11 @@ escape($item->title); ?> - +
note) : ?> escape($item->note)); ?> - +
diff --git a/administrator/components/com_fields/tmpl/groups/default_batch_body.php b/administrator/components/com_fields/tmpl/groups/default_batch_body.php index 9cd4df9187d..9b44ea54a43 100644 --- a/administrator/components/com_fields/tmpl/groups/default_batch_body.php +++ b/administrator/components/com_fields/tmpl/groups/default_batch_body.php @@ -8,17 +8,19 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; - ?>
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_finder/src/Helper/FinderHelper.php b/administrator/components/com_finder/src/Helper/FinderHelper.php index 74d478e82ad..ca51836df73 100644 --- a/administrator/components/com_finder/src/Helper/FinderHelper.php +++ b/administrator/components/com_finder/src/Helper/FinderHelper.php @@ -11,7 +11,7 @@ \defined('_JEXEC') or die; -use Joomla\CMS\Factory; +use Joomla\CMS\Extension\ExtensionHelper; /** * Helper class for Finder. @@ -28,14 +28,6 @@ class FinderHelper */ public static $extension = 'com_finder'; - /** - * The finder plugin id. - * - * @var integer - * @since __DEPLOY_VERSION__ - */ - protected static $pluginId; - /** * Gets the finder system plugin extension id. * @@ -45,26 +37,8 @@ class FinderHelper */ public static function getFinderPluginId() { - if (self::$pluginId === null) - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('extension_id')) - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('folder') . ' = ' . $db->quote('content')) - ->where($db->quoteName('element') . ' = ' . $db->quote('finder')); - $db->setQuery($query); - - try - { - self::$pluginId = (int) $db->loadResult(); - } - catch (\RuntimeException $e) - { - Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); - } - } + $pluginRecord = ExtensionHelper::getExtensionRecord('finder', 'plugin', null, 'content'); - return self::$pluginId; + return $pluginRecord !== null ? $pluginRecord->extension_id : 0; } } diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php index 2e85cdd7ae6..7cec87a044d 100644 --- a/administrator/components/com_finder/tmpl/filter/edit.php +++ b/administrator/components/com_finder/tmpl/filter/edit.php @@ -35,7 +35,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_finder/tmpl/index/emptystate.php b/administrator/components/com_finder/tmpl/index/emptystate.php index 3af4b9b4e45..dea524c6f41 100644 --- a/administrator/components/com_finder/tmpl/index/emptystate.php +++ b/administrator/components/com_finder/tmpl/index/emptystate.php @@ -9,8 +9,10 @@ defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; $displayData = [ 'textPrefix' => 'COM_FINDER', @@ -23,3 +25,29 @@ ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); + +if ($this->finderPluginId) : ?> + finderPluginId . '&tmpl=component&layout=modal'); ?> + finderPluginId . 'Modal', + array( + 'url' => $link, + 'title' => Text::_('COM_FINDER_EDIT_PLUGIN_SETTINGS'), + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'closeButton' => false, + 'backdrop' => 'static', + 'keyboard' => false, + 'footer' => '' + . '' + . '' + ) + ); ?> + diff --git a/administrator/components/com_installer/src/Controller/InstallController.php b/administrator/components/com_installer/src/Controller/InstallController.php index 9b341b9bedf..af365d77941 100644 --- a/administrator/components/com_installer/src/Controller/InstallController.php +++ b/administrator/components/com_installer/src/Controller/InstallController.php @@ -11,6 +11,7 @@ \defined('_JEXEC') or die; +use Joomla\CMS\Access\Exception\NotAllowed; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\Response\JsonResponse; @@ -37,6 +38,11 @@ public function install() // Check for request forgeries. $this->checkToken(); + if (!$this->app->getIdentity()->authorise('core.admin')) + { + throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403); + } + /** @var \Joomla\Component\Installer\Administrator\Model\InstallModel $model */ $model = $this->getModel('install'); @@ -86,8 +92,12 @@ public function ajax_upload() // Check for request forgeries. Session::checkToken() or jexit(Text::_('JINVALID_TOKEN')); - $app = $this->app; - $message = $app->getUserState('com_installer.message'); + if (!$this->app->getIdentity()->authorise('core.admin')) + { + throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403); + } + + $message = $this->app->getUserState('com_installer.message'); // Do install $result = $this->install(); @@ -97,12 +107,12 @@ public function ajax_upload() // Push message queue to session because we will redirect page by \Javascript, not $app->redirect(). // The "application.queue" is only set in redirect() method, so we must manually store it. - $app->getSession()->set('application.queue', $app->getMessageQueue()); + $this->app->getSession()->set('application.queue', $this->app->getMessageQueue()); header('Content-Type: application/json'); echo new JsonResponse(array('redirect' => $redirect), $message, !$result); - $app->close(); + $this->app->close(); } } diff --git a/administrator/components/com_installer/src/Controller/ManageController.php b/administrator/components/com_installer/src/Controller/ManageController.php index fc1f213b352..3eb258e6b69 100644 --- a/administrator/components/com_installer/src/Controller/ManageController.php +++ b/administrator/components/com_installer/src/Controller/ManageController.php @@ -37,7 +37,6 @@ class ManageController extends BaseController * @param Input $input Input * * @since 1.6 - * @see \JControllerLegacy */ public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { diff --git a/administrator/components/com_installer/src/Controller/UpdatesitesController.php b/administrator/components/com_installer/src/Controller/UpdatesitesController.php index 314ad9b28f9..b9cd5b37da3 100644 --- a/administrator/components/com_installer/src/Controller/UpdatesitesController.php +++ b/administrator/components/com_installer/src/Controller/UpdatesitesController.php @@ -45,7 +45,6 @@ class UpdatesitesController extends AdminController * @param Input $input Input * * @since 1.6 - * @see \JControllerLegacy */ public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php index 8e7250f9386..1391aae10ee 100644 --- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php +++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php @@ -380,8 +380,13 @@ public function rebuild(): void { /** * Search if the extension exists in the extensions table. Excluding Joomla - * core extensions (id < 10000) and discovered extensions. + * core extensions and discovered but not yet installed extensions. */ + + $name = (string) $manifest->name; + $pkgName = (string) $manifest->packagename; + $type = (string) $manifest['type']; + $query = $db->getQuery(true) ->select($db->quoteName('extension_id')) ->from($db->quoteName('#__extensions')) @@ -400,9 +405,9 @@ public function rebuild(): void 'OR' ) ->whereNotIn($db->quoteName('extension_id'), $joomlaCoreExtensionIds) - ->bind(':name', $manifest->name) - ->bind(':pkgname', $manifest->packagename) - ->bind(':type', $manifest['type']); + ->bind(':name', $name) + ->bind(':pkgname', $pkgName) + ->bind(':type', $type); $db->setQuery($query); $eid = (int) $db->loadResult(); diff --git a/administrator/components/com_installer/src/Model/WarningsModel.php b/administrator/components/com_installer/src/Model/WarningsModel.php index ba53b4664a9..395add43e35 100644 --- a/administrator/components/com_installer/src/Model/WarningsModel.php +++ b/administrator/components/com_installer/src/Model/WarningsModel.php @@ -95,7 +95,11 @@ public function getItems() return $messages; } - $messages = array(); + $messages = []; + + // 16MB + $minMemory = 16 * 1024 * 1024; + $file_uploads = ini_get('file_uploads'); if (!$file_uploads) @@ -111,13 +115,10 @@ public function getItems() $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC')); } - else + elseif (!is_writable($upload_dir)) { - if (!is_writable($upload_dir)) - { - $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'), - 'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir)); - } + $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'), + 'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir)); } $tmp_path = Factory::getApplication()->get('tmp_path'); @@ -127,26 +128,23 @@ public function getItems() $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC')); } - else + elseif (!is_writable($tmp_path)) { - if (!is_writable($tmp_path)) - { - $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'), - 'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path)); - } + $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'), + 'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path)); } $memory_limit = $this->return_bytes(ini_get('memory_limit')); - if ($memory_limit < (8 * 1024 * 1024) && $memory_limit != -1) + if ($memory_limit < $minMemory && $memory_limit != -1) { - // 8MB + // 16MB $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC')); } - elseif ($memory_limit < (16 * 1024 * 1024) && $memory_limit != -1) + elseif ($memory_limit < ($minMemory * 1.5) && $memory_limit != -1) { - // 16MB + // 24MB $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC')); } @@ -160,13 +158,13 @@ public function getItems() 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC')); } - if ($post_max_size < (8 * 1024 * 1024)) // 8MB + if ($post_max_size < $minMemory) { $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC')); } - if ($upload_max_filesize < (8 * 1024 * 1024)) // 8MB + if ($upload_max_filesize < $minMemory) { $messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'), 'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC')); diff --git a/administrator/components/com_installer/src/View/Install/HtmlView.php b/administrator/components/com_installer/src/View/Install/HtmlView.php index ec911436212..b0929b8a7e6 100644 --- a/administrator/components/com_installer/src/View/Install/HtmlView.php +++ b/administrator/components/com_installer/src/View/Install/HtmlView.php @@ -11,6 +11,9 @@ \defined('_JEXEC') or die; +use Joomla\CMS\Access\Exception\NotAllowed; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault; @@ -33,6 +36,11 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { + if (!Factory::getUser()->authorise('core.admin')) + { + throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403); + } + $paths = new \stdClass; $paths->first = ''; diff --git a/administrator/components/com_installer/src/View/Languages/HtmlView.php b/administrator/components/com_installer/src/View/Languages/HtmlView.php index 689e2160927..b8383a3f2cb 100644 --- a/administrator/components/com_installer/src/View/Languages/HtmlView.php +++ b/administrator/components/com_installer/src/View/Languages/HtmlView.php @@ -11,6 +11,8 @@ \defined('_JEXEC') or die; +use Joomla\CMS\Access\Exception\NotAllowed; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; @@ -44,6 +46,11 @@ class HtmlView extends InstallerViewDefault */ public function display($tpl = null) { + if (!Factory::getUser()->authorise('core.admin')) + { + throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403); + } + // Get data from the model. $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); diff --git a/administrator/components/com_installer/tmpl/discover/emptystate.php b/administrator/components/com_installer/tmpl/discover/emptystate.php index 0520a191204..547c2b77acf 100644 --- a/administrator/components/com_installer/tmpl/discover/emptystate.php +++ b/administrator/components/com_installer/tmpl/discover/emptystate.php @@ -16,7 +16,7 @@ $displayData = [ 'textPrefix' => 'COM_INSTALLER', 'formURL' => 'index.php?option=com_installer&task=discover.refresh', - 'helpURL' => 'https://docs.joomla.org/Help4.x:Extensions:_Discover', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Discover', 'icon' => 'icon-puzzle-piece install', 'createURL' => 'index.php?option=com_installer&task=discover.refresh&' . Session::getFormToken() . '=1', 'content' => Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'), diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php index a61194ac868..151bf9fa384 100644 --- a/administrator/components/com_installer/tmpl/install/default.php +++ b/administrator/components/com_installer/tmpl/install/default.php @@ -51,7 +51,7 @@ - $tabs[0]['name'] ?? '']); ?> + $tabs[0]['name'] ?? '', 'recall' => true, 'breakpoint' => 768]); ?> diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php index 9fc9f1174cf..e31691f9b02 100644 --- a/administrator/components/com_installer/tmpl/update/default.php +++ b/administrator/components/com_installer/tmpl/update/default.php @@ -124,7 +124,7 @@ changelogurl)) : ?> - + 'COM_INSTALLER', 'formURL' => 'index.php?option=com_installer&view=update', - 'helpURL' => 'https://docs.joomla.org/Help4.x:Extensions:_Update', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Update', 'icon' => 'icon-puzzle-piece install', ]; diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php index 57f6fdf15fe..ce0c7cf9a7d 100644 --- a/administrator/components/com_installer/tmpl/updatesites/default.php +++ b/administrator/components/com_installer/tmpl/updatesites/default.php @@ -102,12 +102,10 @@ update_site_name); ?> -
- +
escape($item->location); ?> - -
- +
+
downloadKey['valid']) : ?> @@ -123,7 +121,7 @@ - +
diff --git a/administrator/components/com_installer/tmpl/warnings/emptystate.php b/administrator/components/com_installer/tmpl/warnings/emptystate.php index 10cb596b5b3..03ebbd1bc86 100644 --- a/administrator/components/com_installer/tmpl/warnings/emptystate.php +++ b/administrator/components/com_installer/tmpl/warnings/emptystate.php @@ -13,7 +13,7 @@ use Joomla\CMS\Layout\LayoutHelper; $displayData = [ - 'helpURL' => 'https://docs.joomla.org/Help4.x:Information:_Warnings', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings', 'icon' => 'icon-puzzle-piece install', 'title' => Text::_('COM_INSTALLER_MSG_WARNINGS_NONE'), 'content' => '', diff --git a/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php index 1432a4ebd07..75534fc13bc 100644 --- a/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php +++ b/administrator/components/com_joomlaupdate/src/Controller/DisplayController.php @@ -14,6 +14,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\Response\JsonResponse; +use Joomla\CMS\Router\Route; /** * Joomla! Update Controller @@ -45,6 +46,12 @@ public function display($cachable = false, $urlparams = false) // Get and render the view. if ($view = $this->getView($vName, $vFormat)) { + // Only super user can access file upload + if ($view == 'upload' && !$this->app->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) + { + $this->app->redirect(Route::_('index.php?option=com_joomlaupdate', true)); + } + // Get the model for the view. /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */ $model = $this->getModel('Update'); diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php index 93e374900ce..e3eb2e31b78 100644 --- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php +++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php @@ -172,6 +172,69 @@ public function refreshUpdates($force = false) } } + /** + * Makes sure that the Joomla! Update Component Update is in the database and check if there is a new version. + * + * @return boolean True if there is an update else false + * + * @since 4.0.0 + */ + public function getCheckForSelfUpdate() + { + $db = $this->getDbo(); + + $query = $db->getQuery(true) + ->select($db->quoteName('extension_id')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate')); + $db->setQuery($query); + + try + { + // Get the component extension ID + $joomlaUpdateComponentId = $db->loadResult(); + } + catch (\RuntimeException $e) + { + // Something is wrong here! + $joomlaUpdateComponentId = 0; + Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + } + + // Try the update only if we have an extension id + if ($joomlaUpdateComponentId != 0) + { + // Always force to check for an update! + $cache_timeout = 0; + + $updater = Updater::getInstance(); + $updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, Updater::STABILITY_STABLE); + + // Fetch the update information from the database. + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__updates')) + ->where($db->quoteName('extension_id') . ' = :id') + ->bind(':id', $joomlaUpdateComponentId, ParameterType::INTEGER); + $db->setQuery($query); + + try + { + $joomlaUpdateComponentObject = $db->loadObject(); + } + catch (\RuntimeException $e) + { + // Something is wrong here! + $joomlaUpdateComponentObject = null; + Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + } + + return !empty($joomlaUpdateComponentObject); + } + + return false; + } + /** * Returns an array with the Joomla! update information. * @@ -1333,7 +1396,7 @@ public function getNonCoreExtensions() $decode = json_decode($extension->manifest_cache); // Removed description so that CDATA content does not cause javascript error during pre-update check - $decode->description = ''; + unset($decode->description); $this->translateExtensionName($extension); $extension->version @@ -1354,7 +1417,7 @@ public function getNonCoreExtensions() * * @since 3.10.0 */ - public function getNonCorePlugins($folderFilter = array()) + public function getNonCorePlugins($folderFilter = ['system','user','authentication','actionlog','twofactorauth']) { $db = $this->getDbo(); $query = $db->getQuery(true); @@ -1584,9 +1647,11 @@ private function getCollectionDetailsUrls($updateSiteInfo, $joomlaTargetVersion) */ private function checkCompatibility($updateFileUrl, $joomlaTargetVersion) { - $update = new \Joomla\CMS\Updater\Update; + $minimumStability = ComponentHelper::getParams('com_installer')->get('minimum_stability', Updater::STABILITY_STABLE); + + $update = new Update; $update->set('jversion.full', $joomlaTargetVersion); - $update->loadFromXml($updateFileUrl); + $update->loadFromXml($updateFileUrl, $minimumStability); $downloadUrl = $update->get('downloadurl'); @@ -1642,6 +1707,6 @@ protected function translateExtensionName(&$item) || $lang->load($extension, $source); // Translate the extension name if possible - $item->name = Text::_($item->name); + $item->name = strip_tags(Text::_($item->name)); } } diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 954085328f6..23801a5c165 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -16,8 +16,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\CMS\Updater\Updater; -use Joomla\Database\ParameterType; /** * Joomla! Update's Default View @@ -68,7 +66,25 @@ class HtmlView extends BaseHtmlView * @var \JObject * @since 4.0.0 */ - public $state; + protected $state; + + /** + * Flag if the update component itself has to be updated + * + * @var boolean True when update is available otherwise false + * + * @since 4.0.0 + */ + protected $selfUpdateAvailable = false; + + /** + * A special prefix used for the emptystate layout variable + * + * @var string The prefix + * + * @since 4.0.0 + */ + protected $messagePrefix = ''; /** * Renders the view @@ -81,42 +97,77 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - // Get data from the model. - $this->state = $this->get('State'); + $this->updateInfo = $this->get('UpdateInformation'); + $this->selfUpdateAvailable = $this->get('CheckForSelfUpdate'); - // Load useful classes. - /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */ - $model = $this->getModel(); + // Get results of pre update check evaluations + $this->phpOptions = $this->get('PhpOptions'); + $this->phpSettings = $this->get('PhpSettings'); + $this->nonCoreExtensions = $this->get('NonCoreExtensions'); + $this->nonCoreCriticalPlugins = $this->get('NonCorePlugins'); - // Assign view variables. - $this->updateInfo = $model->getUpdateInformation(); + // Set to true if a required PHP option is not ok + $isCritical = false; - // Get results of pre update check evaluations - $this->phpOptions = $model->getPhpOptions(); - $this->phpSettings = $model->getPhpSettings(); - $this->nonCoreExtensions = $model->getNonCoreExtensions(); - $this->nonCoreCriticalPlugins = $model->getNonCorePlugins(array('system','user','authentication','actionlog','twofactorauth')); + foreach ($this->phpOptions as $option) + { + if (!$option->state) + { + $isCritical = true; + break; + } + } - // Set the toolbar information. - ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'joomla install'); - ToolbarHelper::custom('update.purge', 'loop', '', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false); + $this->state = $this->get('State'); - // Add toolbar buttons. - if (Factory::getUser()->authorise('core.admin')) + $hasUpdate = !empty($this->updateInfo['hasUpdate']); + $hasDownload = isset($this->updateInfo['object']->downloadurl->_data); + + // Fresh update, show it + if ($this->getLayout() == 'complete') { - ToolbarHelper::preferences('com_joomlaupdate'); + // Complete message, nothing to do here + } + // There is an update for the updater itself. So we have to update it first + elseif ($this->selfUpdateAvailable) + { + $this->setLayout('selfupdate'); } + elseif (!$hasDownload || !$hasUpdate) + { + // Could be that we have a download file but no update, so we offer a re-install + if ($hasDownload) + { + // We can reinstall if we have a URL but no update + $this->setLayout('reinstall'); + } + // No download available + else + { + if ($hasUpdate) + { + $this->messagePrefix = '_NODOWNLOAD'; + } - ToolbarHelper::divider(); - ToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); + $this->setLayout('noupdate'); + } + } + // Here we have now two options: preupdatecheck or update + elseif ($this->getLayout() != 'update' || $isCritical) + { + $this->setLayout('preupdatecheck'); + } - if (!is_null($this->updateInfo['object'])) + if (in_array($this->getLayout(), ['preupdatecheck', 'update', 'upload'])) { - // Show the message if an update is found. - Factory::getApplication()->enqueueMessage(Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'warning'); + $language = Factory::getLanguage(); + $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true); + $language->load('com_installer', JPATH_ADMINISTRATOR, null, true); + + Factory::getApplication()->enqueueMessage(Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'notice'); } - $params = ComponentHelper::getParams('com_joomlaupdate'); + $params = ComponentHelper::getParams('com_joomlaupdate'); switch ($params->get('updatesource', 'default')) { @@ -151,102 +202,52 @@ public function display($tpl = null) $this->updateSourceKey = Text::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT'); } - $this->warnings = array(); - /** @var \Joomla\Component\Installer\Administrator\Model\WarningsModel $warningsModel */ - $warningsModel = $this->getModel('warnings'); - - if (is_object($warningsModel) && $warningsModel instanceof \Joomla\CMS\MVC\Model\BaseDatabaseModel) - { - $language = Factory::getLanguage(); - $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true); - $language->load('com_installer', JPATH_ADMINISTRATOR, null, true); - - $this->warnings = $warningsModel->getItems(); - } - - $this->selfUpdate = $this->checkForSelfUpdate(); - - // Only Super Users have access to the Update & Install for obvious security reasons - $this->showUploadAndUpdate = Factory::getUser()->authorise('core.admin'); - // Remove temporary files - $model->removePackageFiles(); + $this->getModel()->removePackageFiles(); + + $this->addToolbar(); // Render the view. parent::display($tpl); } /** - * Makes sure that the Joomla! Update Component Update is in the database and check if there is a new version. + * Add the page title and toolbar. * - * @return boolean True if there is an update else false + * @return void * - * @since 3.6.3 + * @since 4.0.0 */ - private function checkForSelfUpdate() + protected function addToolbar() { - $db = Factory::getDbo(); - - $query = $db->getQuery(true) - ->select($db->quoteName('extension_id')) - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate')); - $db->setQuery($query); + // Set the toolbar information. + ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'joomla install'); - try + if (in_array($this->getLayout(), ['update', 'complete'])) { - // Get the component extension ID - $joomlaUpdateComponentId = $db->loadResult(); + $arrow = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left'; + + ToolbarHelper::link('index.php?option=com_joomlaupdate', 'JTOOLBAR_BACK', $arrow); + + ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD'), 'joomla install'); } - catch (\RuntimeException $e) + elseif (!$this->selfUpdateAvailable) { - // Something is wrong here! - $joomlaUpdateComponentId = 0; - Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + ToolbarHelper::custom('update.purge', 'loop', '', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false); } - // Try the update only if we have an extension id - if ($joomlaUpdateComponentId != 0) + // Add toolbar buttons. + if (Factory::getUser()->authorise('core.admin')) { - // Always force to check for an update! - $cache_timeout = 0; - - $updater = Updater::getInstance(); - $updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, Updater::STABILITY_STABLE); - - // Fetch the update information from the database. - $query = $db->getQuery(true) - ->select('*') - ->from($db->quoteName('#__updates')) - ->where($db->quoteName('extension_id') . ' = :id') - ->bind(':id', $joomlaUpdateComponentId, ParameterType::INTEGER); - $db->setQuery($query); - - try - { - $joomlaUpdateComponentObject = $db->loadObject(); - } - catch (\RuntimeException $e) - { - // Something is wrong here! - $joomlaUpdateComponentObject = null; - Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); - } - - if (is_null($joomlaUpdateComponentObject)) - { - // No Update great! - return false; - } - - return true; + ToolbarHelper::preferences('com_joomlaupdate'); } + + ToolbarHelper::divider(); + ToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); } /** * Returns true, if the pre update check should be displayed. - * This logic is not hardcoded in tmpl files, because it is - * used by the Hathor tmpl too. * * @return boolean * @@ -255,7 +256,6 @@ private function checkForSelfUpdate() public function shouldDisplayPreUpdateCheck() { return isset($this->updateInfo['object']->downloadurl->_data) - && $this->getModel()->isDatabaseTypeSupported() - && $this->getModel()->isPhpVersionSupported(); + && !empty($this->updateInfo['hasUpdate']); } } diff --git a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php index bcf09376e1b..59d7c5c1542 100644 --- a/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php @@ -23,6 +23,33 @@ */ class HtmlView extends BaseHtmlView { + /** + * An array with the Joomla! update information. + * + * @var array + * + * @since 4.0.0 + */ + protected $updateInfo = null; + + /** + * Flag if the update component itself has to be updated + * + * @var boolean True when update is available otherwise false + * + * @since 4.0.0 + */ + protected $selfUpdateAvailable = false; + + /** + * Warnings for the upload update + * + * @var array An array of warnings which could prevent the upload update + * + * @since 4.0.0 + */ + protected $warnings = []; + /** * Renders the view. * @@ -34,17 +61,40 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - // Set the toolbar information. - ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install'); - ToolbarHelper::divider(); - ToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); - // Load com_installer's language $language = Factory::getLanguage(); $language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true); $language->load('com_installer', JPATH_ADMINISTRATOR, null, true); + $this->updateInfo = $this->get('UpdateInformation'); + $this->selfUpdateAvailable = $this->get('CheckForSelfUpdate'); + + if ($this->getLayout() !== 'captive') + { + $this->warnings = $this->get('Items', 'warnings'); + } + + $this->addToolbar(); + // Render the view. parent::display($tpl); } + + /** + * Add the page title and toolbar. + * + * @return void + * + * @since 4.0.0 + */ + protected function addToolbar() + { + // Set the toolbar information. + ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'sync install'); + + $arrow = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left'; + ToolbarHelper::link('index.php?option=com_joomlaupdate&' . ($this->getLayout() == 'captive' ? 'view=upload' : ''), 'JTOOLBAR_BACK', $arrow); + ToolbarHelper::divider(); + ToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); + } } diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php index 8827ecd4457..01a8d4eb7fe 100644 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php @@ -14,16 +14,15 @@ use Joomla\CMS\Router\Route; ?> - 'complete')); ?> - - +
+

+
- - - +
+
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php deleted file mode 100644 index 098986c9a17..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php +++ /dev/null @@ -1,98 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Factory; -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\WebAsset\WebAssetManager; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ - -/** @var WebAssetManager $wa */ -$wa = $this->document->getWebAssetManager(); -$wa->useScript('core') - ->useScript('com_joomlaupdate.default') - ->useScript('bootstrap.popover'); - -Text::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); -Text::script('JYES'); -Text::script('JNO'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'); -Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP'); - -$latestJoomlaVersion = $this->updateInfo['latest']; -$currentJoomlaVersion = isset($this->updateInfo['current']) ? $this->updateInfo['current'] : JVERSION; -?> - -
- showUploadAndUpdate) : ?> - $this->shouldDisplayPreUpdateCheck() ? 'pre-update-check' : 'online-update')); ?> - shouldDisplayPreUpdateCheck()) : ?> - - loadTemplate('preupdatecheck'); ?> - - - - - - - - selfUpdate) : ?> - - enqueueMessage(Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST'), 'error'); ?> - loadTemplate('updatemefirst'); ?> - - updateInfo['object']->downloadurl->_data) - && !$this->updateInfo['hasUpdate'])) : ?> - - loadTemplate('noupdate'); ?> - updateInfo['object']->downloadurl->_data) - || !$this->getModel()->isDatabaseTypeSupported() - || !$this->getModel()->isPhpVersionSupported()) : ?> - - loadTemplate('nodownload'); ?> - updateInfo['hasUpdate']) : ?> - - loadTemplate('reinstall'); ?> - - - loadTemplate('update'); ?> - - - - - - - - - - - showUploadAndUpdate) : ?> - - - loadTemplate('upload'); ?> - - - - - -
-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php deleted file mode 100644 index dc94a63d685..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ -?> - -
- - - -
- getModel()->isDatabaseTypeSupported()) : ?> -

- -

-

- updateInfo['latest']); ?> -

- - getModel()->isPhpVersionSupported()) : ?> -

- -

-

- updateInfo['latest']); ?> -

- - updateInfo['object']->downloadurl->_data) && $this->updateInfo['installed'] < $this->updateInfo['latest'] && $this->getModel()->isPhpVersionSupported() && $this->getModel()->isDatabaseTypeSupported()) : ?> -

- -

-

- updateInfo['latest']); ?> -

- -
-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php deleted file mode 100644 index 28f06e3d08d..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ -?> -
- - - -

- langKey, $this->updateSourceKey); ?> -

-
- -
-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php deleted file mode 100644 index e1b0831320f..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php +++ /dev/null @@ -1,269 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Uri\Uri; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ - -// JText::script doesn't have a sprintf equivalent so work around this -Factory::getDocument()->addScriptOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '', true)) - ->addScriptOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION', Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION', '', true)) - ->addScriptOptions('nonCoreCriticalPlugins', $this->nonCoreCriticalPlugins); - -$compatibilityTypes = array( - 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS' => array( - 'class' => 'alert-secondary', - 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES', - 'group' => 0, - ), - 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED' => array( - 'class' => 'alert-danger', - 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED_NOTES', - 'group' => 4, - ), - 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION' => array( - 'class' => 'alert-danger', - 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES', - 'group' => 1, - ), - 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE' => array( - 'class' => 'alert-warning', - 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES', - 'group' => 2, - ), - 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE' => array( - 'class' => 'alert-success', - 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES', - 'group' => 3, - ), -); -?> - -

- updateInfo['latest']); ?> -

-

- -

- -
-
-
- - phpOptions as $option) : ?> - state) : ?> - - - - - -

- -
- ' - ); ?> -
-

- - -
-
- -
-
- - phpSettings as $setting) : ?> - state !== $setting->recommended) : ?> - - - - - - -

- -
- ' - ); ?> -
-

- - -
-
-
-
- nonCoreExtensions)) : ?> -
-

- -

- $compatibilityData) : ?> - - - -
- -

- -
- ' - ); ?> -
- - -

- -
- -
- - - - - - - - - - - - - - nonCoreExtensions as $extension) : ?> - - - - - - - - - -
- - - -
- name; ?> - - type)); ?> -
-
- -
- -
-

- -

-
- - -
-
- -
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php deleted file mode 100644 index 8967a6aa987..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php +++ /dev/null @@ -1,83 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Updater\Update; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ -?> -
- - - -

- - - -

-

langKey, $this->updateSourceKey); ?>

-

- - - -

- updateInfo['object']) && ($this->updateInfo['object'] instanceof Update)) : ?> -
-
- -
-
- updateInfo['object']->downloadurl->_data, - $this->updateInfo['object']->downloadurl->_data, - [ - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - 'title' => Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->downloadurl->_data) - ] - ); ?> -
-
- - updateInfo['object']->get('infourl')->_data) - && isset($this->updateInfo['object']->get('infourl')->title)) : ?> -
-
- -
-
- updateInfo['object']->get('infourl')->_data, - $this->updateInfo['object']->get('infourl')->title, - [ - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - 'title' => Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->get('infourl')->title) - ] - ); ?> -
-
- - -
- -
-
- -
-
- - -
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php deleted file mode 100644 index 71a1394cafb..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php +++ /dev/null @@ -1,205 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ -?> - -
- - - -

- langKey, $this->updateSourceKey); ?> -

- -
-
- -
-
- updateInfo['installed']; ?> -
-
- -
-
- -
-
- updateInfo['latest']; ?> -
-
- -
-
- -
-
- updateInfo['object']->downloadurl->_data, - $this->updateInfo['object']->downloadurl->_data, - [ - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - 'title' => Text::sprintf('JBROWSERTARGET_DOWNLOAD', $this->updateInfo['object']->downloadurl->_data) - ] - ); ?> -
-
- - updateInfo['object']->get('infourl')->_data) - && isset($this->updateInfo['object']->get('infourl')->title)) : ?> -
-
- -
-
- updateInfo['object']->get('infourl')->_data, - $this->updateInfo['object']->get('infourl')->title, - [ - 'target' => '_blank', - 'rel' => 'noopener noreferrer', - 'title' => Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->get('infourl')->title) - ] - ); ?> -
-
- - -
-

- -

-
-
- -
-
-
- - - -
- -
- -
- - - - - - - - - nonCoreCriticalPlugins as $nonCoreCriticalPlugin) : ?> - - - package_id > 0) : ?> - nonCoreExtensions as $nonCoreExtension) : ?> - package_id == $nonCoreExtension->extension_id) : ?> - - - - - - - - - - - - - -
- - - - - - - -
- name); ?> - - name; ?> - - - - manifest_cache->author)) : ?> - manifest_cache->author); ?> - package_id > 0) : ?> - nonCoreExtensions as $nonCoreExtension) : ?> - package_id == $nonCoreExtension->extension_id) : ?> - - name; ?> - - - manifest_cache->authorUrl)) : ?> - manifest_cache->authorUrl; ?> - package_id > 0) : ?> - nonCoreExtensions as $nonCoreExtension) : ?> - package_id == $nonCoreExtension->extension_id) : ?> - manifest_cache->authorUrl; ?> - - - - - - - - - - -
-
- - - - -
- - - -
- -
- -
-
- -
-
-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php deleted file mode 100644 index 9d441843378..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ -defined('_JEXEC') or die; - -use Joomla\CMS\Language\Text; - -?> - -
- - - -

- -

-

- -

-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php deleted file mode 100644 index 5f654d09be9..00000000000 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php +++ /dev/null @@ -1,84 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -defined('_JEXEC') or die; - -use Joomla\CMS\HTML\HTMLHelper; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Utility\Utility; -use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; - -/** @var HtmlView $this */ - -HTMLHelper::_('behavior.core'); -Text::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); -Text::script('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG', true); -Text::script('JGLOBAL_SELECTED_UPLOAD_FILE_SIZE', true); -?> - -
- - -
- -warnings)) : ?> -

- warnings as $warning) : ?> -
-

- - - -

-

-
- -
-

- - - -

-

-
- - -
-
- - -
- -
- - - - -
- - -
-
-
-
- -
-
- -
- - - - - -
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php new file mode 100644 index 00000000000..3f2fa6a9ec1 --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php @@ -0,0 +1,49 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Session\Session; + +$uploadLink = 'index.php?option=com_joomlaupdate&view=upload'; + +$displayData = [ + 'textPrefix' => 'COM_JOOMLAUPDATE' . $this->messagePrefix, + 'content' => Text::sprintf($this->langKey, $this->updateSourceKey), + 'formURL' => 'index.php?option=com_joomlaupdate&view=joomlaupdate', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version', + 'icon' => 'icon-loop joomlaupdate', + 'createURL' => 'index.php?option=com_joomlaupdate&task=update.purge&' . Session::getFormToken() . '=1' +]; + +if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) +{ + $displayData['formAppend'] = '
' . HTMLHelper::_('link', $uploadLink, Text::_($displayData['textPrefix'] . '_EMPTYSTATE_APPEND')) . '
'; +} + +if (isset($this->updateInfo['object']) && isset($this->updateInfo['object']->get('infourl')->_data)) : + $displayData['content'] .= '
' . HTMLHelper::_('link', + $this->updateInfo['object']->get('infourl')->_data, + Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL'), + [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'title' => isset($this->updateInfo['object']->get('infourl')->title) ? Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->get('infourl')->title) : '' + ] + ); +endif; + +$content = LayoutHelper::render('joomla.content.emptystate', $displayData); + +// Inject Joomla! version +echo str_replace('%1$s', '‎' . $this->updateInfo['latest'], $content); diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php new file mode 100644 index 00000000000..8b8934592f6 --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php @@ -0,0 +1,348 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; +use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; + +/** @var HtmlView $this */ + +/** @var WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('core') + ->useScript('com_joomlaupdate.default') + ->useScript('bootstrap.popover') + ->useScript('bootstrap.tab'); + +// Text::script doesn't have a sprintf equivalent so work around this +Factory::getDocument()->addScriptOptions('nonCoreCriticalPlugins', $this->nonCoreCriticalPlugins); + +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_SERVER_ERROR'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'); +Text::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP'); + +$compatibilityTypes = array( + 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS' => array( + 'class' => 'info', + 'icon' => 'hourglass fa-spin', + 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES', + 'group' => 0, + ), + 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE' => array( + 'class' => 'danger', + 'icon' => 'times', + 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES', + 'group' => 2, + ), + 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED' => array( + 'class' => 'warning', + 'icon' => 'exclamation-triangle', + 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PRE_UPDATE_CHECKS_FAILED_NOTES', + 'group' => 4, + ), + 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION' => array( + 'class' => 'warning', + 'icon' => 'exclamation-triangle', + 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES', + 'group' => 1, + ), + 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE' => array( + 'class' => 'success', + 'icon' => 'check', + 'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES', + 'group' => 3, + ), +); + +$latestJoomlaVersion = $this->updateInfo['latest']; +$currentJoomlaVersion = isset($this->updateInfo['current']) ? $this->updateInfo['current'] : JVERSION; + +$updatePossible = true; + +?> + +
+ +

+ updateInfo['latest']); ?> +

+

+ +

+ +
+
+ + + +
+ +
+
+

+ +

+
+ + + + + + + + + + phpOptions as $option) : ?> + + + + + + +
+ + + +
+ label; ?> + notice) : ?> +
+ notice; ?> +
+ + 		+ + state ? 'JYES' : 'JNO'); ?> + +
+
+
+
+

+ +

+
+ + + + + + + + + + + phpSettings as $setting) : ?> + + + + + + + +
+ +
+ + + + + +
+ label; ?> + + recommended ? 'JON' : 'JOFF'); ?> + + + state ? 'JON' : 'JOFF'); ?> + +
+
+
+
+

+ +

+
+
+

+ +

+
+
+ +
+
+
+
+ + + + nonCoreExtensions)) : ?> +
+ $data) : ?> +
+

+ + + 0) : ?> + + +

+ +
+ + + + + + + + + + + + + + nonCoreExtensions as $extension) : ?> + + + + + + + + +
+ +
+ + + +
+ name; ?> + + + type)); ?> +
+
+
+ +
+ +
+ + +
+ +
+
+
+ + + +
+ +
+
+ + +
+
+ + +
+ + +
+ + +
+ + authorise('core.admin')) : ?> +
+ +
+ +
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php new file mode 100644 index 00000000000..ea9314a92df --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php @@ -0,0 +1,56 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; + +/** @var HtmlView $this */ + +/** @var WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('core') + ->useScript('com_joomlaupdate.default') + ->useScript('bootstrap.popover'); + +$uploadLink = 'index.php?option=com_joomlaupdate&view=upload'; + +$displayData = [ + 'textPrefix' => 'COM_JOOMLAUPDATE_REINSTALL', + 'content' => Text::sprintf($this->langKey, $this->updateSourceKey), + 'formURL' => 'index.php?option=com_joomlaupdate&view=joomlaupdate', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version', + 'icon' => 'icon-loop joomlaupdate', + 'createURL' => '#' +]; + +if (isset($this->updateInfo['object']) && isset($this->updateInfo['object']->get('infourl')->_data)) : + $displayData['content'] .= '
' . HTMLHelper::_('link', + $this->updateInfo['object']->get('infourl')->_data, + Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL'), + [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'title' => isset($this->updateInfo['object']->get('infourl')->title) ? Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->get('infourl')->title) : '' + ] + ); +endif; + +if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) : + $displayData['formAppend'] = '
' . HTMLHelper::_('link', $uploadLink, Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND')) . '
'; +endif; + +echo '
'; + +echo LayoutHelper::render('joomla.content.emptystate', $displayData); + +echo '
'; diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php new file mode 100644 index 00000000000..0ca24eb8efa --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php @@ -0,0 +1,21 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ +defined('_JEXEC') or die; + +use Joomla\CMS\Layout\LayoutHelper; + +$displayData = [ + 'textPrefix' => 'COM_JOOMLAUPDATE_SELF', + 'formURL' => 'index.php?option=com_joomlaupdate&view=joomlaupdate', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version', + 'icon' => 'icon-loop joomlaupdate', + 'createURL' => 'index.php?option=com_installer&view=update' +]; + +echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php new file mode 100644 index 00000000000..52c698f9981 --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php @@ -0,0 +1,65 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Layout\LayoutHelper; + +/** @var HtmlView $this */ + +/** @var WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('core') + ->useScript('com_joomlaupdate.default') + ->useScript('bootstrap.popover'); + +$uploadLink = 'index.php?option=com_joomlaupdate&view=upload'; + +$displayData = [ + 'textPrefix' => 'COM_JOOMLAUPDATE_UPDATE', + 'title' => Text::sprintf('COM_JOOMLAUPDATE_UPDATE_EMPTYSTATE_TITLE', $this->escape($this->updateInfo['latest'])), + 'content' => Text::sprintf($this->langKey, $this->updateSourceKey), + 'formURL' => 'index.php?option=com_joomlaupdate&view=joomlaupdate', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version', + 'icon' => 'icon-loop joomlaupdate', + 'createURL' => '#' +]; + +if (isset($this->updateInfo['object']) && isset($this->updateInfo['object']->get('infourl')->_data)) : + $displayData['content'] .= '
' . HTMLHelper::_('link', + $this->updateInfo['object']->get('infourl')->_data, + Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL'), + [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'title' => isset($this->updateInfo['object']->get('infourl')->title) ? Text::sprintf('JBROWSERTARGET_NEW_TITLE', $this->updateInfo['object']->get('infourl')->title) : '' + ] + ); +endif; + +// Confirm backup and check +$displayData['content'] .= '
+ + +
'; + +if (Factory::getApplication()->getIdentity()->authorise('core.admin', 'com_joomlaupdate')) : + $displayData['formAppend'] = '
' . HTMLHelper::_('link', $uploadLink, Text::_('COM_JOOMLAUPDATE_EMPTYSTATE_APPEND')) . '
'; +endif; + +echo '
'; + +echo LayoutHelper::render('joomla.content.emptystate', $displayData); + +echo '
'; diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php index 42302d20475..86af707b216 100644 --- a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php +++ b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php @@ -40,9 +40,9 @@
-
-
- + +
+
diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/default.php b/administrator/components/com_joomlaupdate/tmpl/upload/default.php new file mode 100644 index 00000000000..08909922509 --- /dev/null +++ b/administrator/components/com_joomlaupdate/tmpl/upload/default.php @@ -0,0 +1,100 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +defined('_JEXEC') or die; + +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Updater\Update; +use Joomla\CMS\Utility\Utility; +use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView; + +/** @var HtmlView $this */ + +/** @var WebAssetManager $wa */ +$wa = $this->document->getWebAssetManager(); +$wa->useScript('core') + ->useScript('com_joomlaupdate.default') + ->useScript('bootstrap.popover'); + +HTMLHelper::_('behavior.core'); +Text::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); +Text::script('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG', true); +Text::script('JGLOBAL_SELECTED_UPLOAD_FILE_SIZE', true); + +$latestJoomlaVersion = $this->updateInfo['latest']; +$currentJoomlaVersion = isset($this->updateInfo['current']) ? $this->updateInfo['current'] : JVERSION; +?> + +
+
+ + + updateInfo['object']) && ($this->updateInfo['object'] instanceof Update)) : ?> +

+ + updateInfo['object']->downloadurl->_data); ?> + +
+ +warnings)) : ?> +

+ warnings as $warning) : ?> +
+

+ + + +

+

+
+ +
+

+ + + +

+

+
+ + + + +
+ + + + + + +
+ + +
+ +
+ + +
+ + + + + + + + +
diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php index ad451a1cd3e..295afe970e7 100644 --- a/administrator/components/com_languages/src/Controller/InstalledController.php +++ b/administrator/components/com_languages/src/Controller/InstalledController.php @@ -12,7 +12,7 @@ \defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Installer\Installer; +use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; @@ -92,8 +92,8 @@ public function switchAdminLanguage() $file = JPATH_ADMINISTRATOR . '/language/' . $cid . '/' . $cid . '.xml'; } - $info = Installer::parseXMLInstallFile($file); - $languageName = $info['name']; + $info = LanguageHelper::parseXMLLanguageFile($file); + $languageName = $info['nativeName']; if ($model->switchAdminLanguage($cid)) { diff --git a/administrator/components/com_languages/src/Service/HTML/Languages.php b/administrator/components/com_languages/src/Service/HTML/Languages.php index 475a542bb10..935b4447d96 100644 --- a/administrator/components/com_languages/src/Service/HTML/Languages.php +++ b/administrator/components/com_languages/src/Service/HTML/Languages.php @@ -49,6 +49,7 @@ public function published($published) public function id($rowNum, $language) { return ' - 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_mails/config.xml b/administrator/components/com_mails/config.xml index 936524653bc..09a4519a9b8 100644 --- a/administrator/components/com_mails/config.xml +++ b/administrator/components/com_mails/config.xml @@ -62,7 +62,7 @@ label="JCONFIG_PERMISSIONS_LABEL" filter="rules" validate="rules" - component="com_messages" + component="com_mails" section="component" />
diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php index 8164be4c345..5cb4c6f7409 100644 --- a/administrator/components/com_mails/tmpl/template/edit.php +++ b/administrator/components/com_mails/tmpl/template/edit.php @@ -37,14 +37,14 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>

- escape($this->item->language); ?> - (escape($this->master->template_id); ?>)

+
escape($this->master->template_id); ?>

@@ -54,17 +54,20 @@ form->renderField('subject'); ?>
- +
- form->getField('body')) : ?>
form->renderField('body'); ?>
- +

master, 'body'); ?> @@ -79,7 +82,9 @@ form->renderField('htmlbody'); ?>
- +

master, 'htmlbody'); ?> diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php index f8b0944c9fa..f25ee2e8b7c 100644 --- a/administrator/components/com_mails/tmpl/templates/default.php +++ b/administrator/components/com_mails/tmpl/templates/default.php @@ -72,8 +72,8 @@ languages) > 1) : ?> - -
@@ -187,6 +187,7 @@ diff --git a/administrator/components/com_media/tmpl/media/default.php b/administrator/components/com_media/tmpl/media/default.php index 5e00040e136..aff6f9b1f0d 100644 --- a/administrator/components/com_media/tmpl/media/default.php +++ b/administrator/components/com_media/tmpl/media/default.php @@ -49,7 +49,7 @@ 'imagesExtensions' => explode(',', $params->get('image_extensions', 'bmp,gif,jpg,jpeg,png,webp')), 'audioExtensions' => explode(',', $params->get('audio_extensions', 'mp3,m4a,mp4a,ogg')), 'videoExtensions' => explode(',', $params->get('video_extensions', 'mp4,mp4v,mpeg,mov,webm')), - 'documentExtensions' => explode(',', $params->get('doc_extensions', 'doc,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv')), + 'documentExtensions' => explode(',', $params->get('doc_extensions', 'doc,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv')), 'maxUploadSizeMb' => $params->get('upload_maxsize', 10), 'providers' => (array) $this->providers, 'currentPath' => $this->currentPath, diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml index d15fbed09ef..0bc733b2dd8 100644 --- a/administrator/components/com_menus/presets/alternate.xml +++ b/administrator/components/com_menus/presets/alternate.xml @@ -375,12 +375,12 @@ title="MOD_MENU_EXTENSIONS_EXTENSION_MANAGER" type="component" element="com_installer" - link="index.php?option=com_installer"> + link="index.php?option=com_installer&view=manage"> setRedirect('index.php?option=com_menus&view=menus'); } - /** - * Rebuild the menu tree. - * - * @return boolean False on failure or error, true on success. - * - * @since 1.6 - */ - public function rebuild() - { - $this->checkToken(); - - $this->setRedirect('index.php?option=com_menus&view=menus'); - - /** @var \Joomla\Component\Menus\Administrator\Model\ItemModel $model */ - $model = $this->getModel('Item'); - - if ($model->rebuild()) - { - // Reorder succeeded. - $this->setMessage(Text::_('JTOOLBAR_REBUILD_SUCCESS')); - - return true; - } - else - { - // Rebuild failed. - $this->setMessage(Text::sprintf('JTOOLBAR_REBUILD_FAILED', $model->getError()), 'error'); - - return false; - } - } - /** * Temporary method. This should go into the 1.5 to 1.6 upgrade routines. * diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php index 1612087644f..44f5767cb1f 100644 --- a/administrator/components/com_menus/src/Helper/MenusHelper.php +++ b/administrator/components/com_menus/src/Helper/MenusHelper.php @@ -515,7 +515,7 @@ protected static function installPresetItems($node, $menutype) 'menutype' => $menutype, 'type' => $item->type, 'title' => $item->title, - 'parent_id' => $item->getParent()->id, + 'parent_id' => (int) $item->getParent()->id, 'client_id' => 1, ); $table->load($keys); @@ -541,7 +541,7 @@ protected static function installPresetItems($node, $menutype) 'menutype' => $menutype, 'type' => $item->type, 'link' => $item->link, - 'parent_id' => $item->getParent()->id, + 'parent_id' => (int) $item->getParent()->id, 'client_id' => 1, ); $table->load($keys); @@ -577,7 +577,7 @@ protected static function installPresetItems($node, $menutype) 'img' => $item->class, 'access' => $item->access, 'component_id' => array_search($item->element, $components) ?: 0, - 'parent_id' => $item->getParent()->id, + 'parent_id' => (int) $item->getParent()->id, 'client_id' => 1, 'published' => 1, 'language' => '*', diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php index a5f1ce10096..7d1beda77a8 100644 --- a/administrator/components/com_menus/src/View/Menu/XmlView.php +++ b/administrator/components/com_menus/src/View/Menu/XmlView.php @@ -58,7 +58,7 @@ public function display($tpl = null) $root = MenusHelper::getMenuItems($menutype, true); } - if ($root->hasChildren()) + if (!$root->hasChildren()) { Log::add(Text::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), Log::WARNING, 'jerror'); @@ -67,9 +67,9 @@ public function display($tpl = null) return; } - $this->items = $root->getChildren(); + $this->items = $root->getChildren(true); - $xml = new \SimpleXMLElement('' @@ -121,7 +121,7 @@ protected function addXmlChild($xml, $item) if ($item->title) { - $node['title'] = $item->title; + $node['title'] = htmlentities($item->title, ENT_XML1); } if ($item->link) @@ -136,7 +136,7 @@ protected function addXmlChild($xml, $item) if ($item->class) { - $node['class'] = $item->class; + $node['class'] = htmlentities($item->class, ENT_XML1); } if ($item->access) @@ -153,7 +153,7 @@ protected function addXmlChild($xml, $item) { $hideitems = $item->getParams()->get('hideitems'); - if (count($hideitems)) + if ($hideitems) { $db = Factory::getDbo(); $query = $db->getQuery(true); @@ -169,7 +169,7 @@ protected function addXmlChild($xml, $item) $item->getParams()->set('hideitems', $hideitems); } - $node->addChild('params', (string) $item->getParams()); + $node->addChild('params', htmlentities((string) $item->getParams(), ENT_XML1)); } foreach ($item->submenu as $sub) diff --git a/administrator/components/com_menus/src/View/Menus/HtmlView.php b/administrator/components/com_menus/src/View/Menus/HtmlView.php index 034598fa92e..fccf099fbcf 100644 --- a/administrator/components/com_menus/src/View/Menus/HtmlView.php +++ b/administrator/components/com_menus/src/View/Menus/HtmlView.php @@ -125,8 +125,6 @@ protected function addToolbar() ToolbarHelper::deleteList('COM_MENUS_MENU_CONFIRM_DELETE', 'menus.delete', 'JTOOLBAR_DELETE'); } - ToolbarHelper::custom('menus.rebuild', 'refresh', '', 'JTOOLBAR_REBUILD', false); - if ($canDo->get('core.admin') && $this->state->get('client_id') == 1) { ToolbarHelper::custom('menu.exportXml', 'download', '', 'COM_MENUS_MENU_EXPORT_BUTTON', true); diff --git a/administrator/components/com_menus/tmpl/item/edit.php b/administrator/components/com_menus/tmpl/item/edit.php index f903b685cf0..dc9f5991e17 100644 --- a/administrator/components/com_menus/tmpl/item/edit.php +++ b/administrator/components/com_menus/tmpl/item/edit.php @@ -67,7 +67,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index 3d8c157eae2..57400eb71ad 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -182,15 +182,15 @@
- type != 'url') : ?> - note)) : ?> - escape($item->alias)); ?> - - escape($item->alias), $this->escape($item->note)); ?> + type != 'url') : ?> + note)) : ?> + escape($item->alias)); ?> + + escape($item->alias), $this->escape($item->note)); ?> + + type == 'url' && $item->note) : ?> + escape($item->note)); ?> - type == 'url' && $item->note) : ?> - escape($item->note)); ?> -
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php index eb3ce1101ee..a329cd86e25 100644 --- a/administrator/components/com_menus/tmpl/items/default_batch_body.php +++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php @@ -10,6 +10,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; @@ -33,11 +34,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_menus/tmpl/menu/edit.php b/administrator/components/com_menus/tmpl/menu/edit.php index e3887c5638c..8c523b6ef9f 100644 --- a/administrator/components/com_menus/tmpl/menu/edit.php +++ b/administrator/components/com_menus/tmpl/menu/edit.php @@ -25,7 +25,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?> diff --git a/administrator/components/com_modules/src/Controller/ModuleController.php b/administrator/components/com_modules/src/Controller/ModuleController.php index 3a1d093ab77..ef53b80adf3 100644 --- a/administrator/components/com_modules/src/Controller/ModuleController.php +++ b/administrator/components/com_modules/src/Controller/ModuleController.php @@ -280,9 +280,9 @@ public function orderPosition() $moduleId = $this->input->getValue('module_id'); // Access check. - if (!Factory::getUser()->authorise('core.create', 'com_modules') - && !Factory::getUser()->authorise('core.edit.state', 'com_modules') - && ($moduleId && !Factory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $moduleId))) + if (!$this->app->getIdentity()->authorise('core.create', 'com_modules') + && !$this->app->getIdentity()->authorise('core.edit.state', 'com_modules') + && ($moduleId && !$this->app->getIdentity()->authorise('core.edit.state', 'com_modules.module.' . $moduleId))) { $app->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 'error'); echo new JsonResponse; diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php index 26d76efa39f..f7e5e315761 100644 --- a/administrator/components/com_modules/tmpl/module/edit.php +++ b/administrator/components/com_modules/tmpl/module/edit.php @@ -57,7 +57,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?> diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php index ecec65b7779..34dcd86d2be 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php @@ -41,7 +41,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?> item->id) ? Text::_('COM_NEWSFEEDS_NEW_NEWSFEED') : Text::_('COM_NEWSFEEDS_EDIT_NEWSFEED')); ?>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php index 589ead10a7f..70f12a91c15 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php @@ -133,9 +133,9 @@ escape($item->name); ?> - +
escape($item->alias)); ?> - +
escape($item->category_title); ?>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php index 1b3c4c09dd7..71e3729811e 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_body.php @@ -8,6 +8,7 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; $published = (int) $this->state->get('filter.published'); @@ -15,11 +16,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php index 9015c0375fa..75a08fefa49 100644 --- a/administrator/components/com_plugins/tmpl/plugin/edit.php +++ b/administrator/components/com_plugins/tmpl/plugin/edit.php @@ -32,7 +32,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?> diff --git a/administrator/components/com_redirect/src/Model/LinksModel.php b/administrator/components/com_redirect/src/Model/LinksModel.php index dd3dffef417..abae160418a 100644 --- a/administrator/components/com_redirect/src/Model/LinksModel.php +++ b/administrator/components/com_redirect/src/Model/LinksModel.php @@ -30,7 +30,6 @@ class LinksModel extends ListModel * @param array $config An optional associative array of configuration settings. * @param MVCFactoryInterface $factory The factory. * - * @see \JControllerLegacy * @since 1.6 */ public function __construct($config = array(), MVCFactoryInterface $factory = null) diff --git a/administrator/components/com_redirect/tmpl/link/edit.php b/administrator/components/com_redirect/tmpl/link/edit.php index 6efd4c1eb39..83809e81a65 100644 --- a/administrator/components/com_redirect/tmpl/link/edit.php +++ b/administrator/components/com_redirect/tmpl/link/edit.php @@ -20,7 +20,7 @@
- 'basic')); ?> + 'basic', 'recall' => true, 'breakpoint' => 768]); ?> item->id) ? Text::_('COM_REDIRECT_NEW_LINK') : Text::sprintf('COM_REDIRECT_EDIT_LINK', $this->item->id)); ?> diff --git a/administrator/components/com_tags/src/Model/TagsModel.php b/administrator/components/com_tags/src/Model/TagsModel.php index c0d72b1b5b7..1b08eaeb7f0 100644 --- a/administrator/components/com_tags/src/Model/TagsModel.php +++ b/administrator/components/com_tags/src/Model/TagsModel.php @@ -29,8 +29,6 @@ class TagsModel extends ListModel /** * Constructor. * - * @see \JControllerLegacy - * * @param MVCFactoryInterface $factory The factory. * * @param array $config An optional associative array of configuration settings. diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php index f0cbb7af742..d4cd2270515 100644 --- a/administrator/components/com_tags/tmpl/tag/edit.php +++ b/administrator/components/com_tags/tmpl/tag/edit.php @@ -30,7 +30,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php index 648d1acd7ed..7b225f77461 100644 --- a/administrator/components/com_tags/tmpl/tags/default.php +++ b/administrator/components/com_tags/tmpl/tags/default.php @@ -200,13 +200,13 @@ escape($item->title); ?> - +
note)) : ?> escape($item->alias)); ?> escape($item->alias), $this->escape($item->note)); ?> - +
items[0]) && property_exists($this->items[0], 'count_published')) : ?> diff --git a/administrator/components/com_tags/tmpl/tags/default_batch_body.php b/administrator/components/com_tags/tmpl/tags/default_batch_body.php index a7cc78f9ad5..bc82733e4de 100644 --- a/administrator/components/com_tags/tmpl/tags/default_batch_body.php +++ b/administrator/components/com_tags/tmpl/tags/default_batch_body.php @@ -8,6 +8,7 @@ */ defined('_JEXEC') or die; +use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Layout\LayoutHelper; $published = $this->state->get('filter.published'); @@ -15,11 +16,13 @@
-
-
- + +
+
+ +
-
+
diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php index ccf68a202ff..da5eed2152a 100644 --- a/administrator/components/com_templates/tmpl/style/edit.php +++ b/administrator/components/com_templates/tmpl/style/edit.php @@ -28,7 +28,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?> diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php index 7508cb006e5..865dcd22435 100644 --- a/administrator/components/com_templates/tmpl/template/default.php +++ b/administrator/components/com_templates/tmpl/template/default.php @@ -58,7 +58,7 @@ ?>
- 'editor')); ?> + 'editor', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_templates/tmpl/template/readonly.php b/administrator/components/com_templates/tmpl/template/readonly.php index 4301ac0a163..157cff97362 100644 --- a/administrator/components/com_templates/tmpl/template/readonly.php +++ b/administrator/components/com_templates/tmpl/template/readonly.php @@ -17,7 +17,7 @@ $input = Factory::getApplication()->input; ?> - 'description')); ?> + 'description', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_users/forms/group.xml b/administrator/components/com_users/forms/group.xml index 3a901a70698..e8614b4a2fc 100644 --- a/administrator/components/com_users/forms/group.xml +++ b/administrator/components/com_users/forms/group.xml @@ -21,6 +21,7 @@ name="parent_id" type="groupparent" label="COM_USERS_GROUP_FIELD_PARENT_LABEL" + validate="options" /> getAll(); - $currentGroupId = $this->form->getValue('id'); + $options = UserGroupsHelper::getInstance()->getAll(); + $currentGroupId = (int) Factory::getApplication()->input->get('id', 0, 'int'); // Prevent to set yourself as parent if ($currentGroupId) @@ -75,7 +75,7 @@ protected function getOptions() } // We should not remove any groups when we are creating a new group - if ($currentGroupId !== null && $currentGroupId !== 0) + if ($currentGroupId !== 0) { // Prevent parenting direct children and children of children of this item. $options = $this->cleanOptionsChildrenByFather($options, $currentGroupId); diff --git a/administrator/components/com_users/src/Model/GroupModel.php b/administrator/components/com_users/src/Model/GroupModel.php index 802efd9a814..1907564630f 100644 --- a/administrator/components/com_users/src/Model/GroupModel.php +++ b/administrator/components/com_users/src/Model/GroupModel.php @@ -260,21 +260,16 @@ public function delete(&$pks) // Check if I am a Super Admin $iAmSuperAdmin = $user->authorise('core.admin'); - // Do not allow to delete groups to which the current user belongs foreach ($pks as $pk) { + // Do not allow to delete groups to which the current user belongs if (in_array($pk, $groups)) { Factory::getApplication()->enqueueMessage(Text::_('COM_USERS_DELETE_ERROR_INVALID_GROUP'), 'error'); return false; } - } - - // Iterate the items to check if all of them exist. - foreach ($pks as $i => $pk) - { - if (!$table->load($pk)) + elseif (!$table->load($pk)) { // Item is not in the table. $this->setError($table->getError()); diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php index 821f26da2cd..794604205ec 100644 --- a/administrator/components/com_users/src/Model/UserModel.php +++ b/administrator/components/com_users/src/Model/UserModel.php @@ -344,6 +344,12 @@ public function save($data) return false; } + // Destroy all active sessions for the user after changing the password or blocking him + if ($data['password2'] || $data['block']) + { + UserHelper::destroyUserSessions($user->id, true); + } + $this->setState('user.id', $user->id); return true; @@ -515,6 +521,11 @@ public function block(&$pks, $value = 1) return false; } + if ($table->block) + { + UserHelper::destroyUserSessions($table->id); + } + // Trigger the after save event Factory::getApplication()->triggerEvent($this->event_after_save, [$table->getProperties(), false, true, null]); } diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php index 5b433c9c45f..78cbe1b15ab 100644 --- a/administrator/components/com_users/tmpl/group/edit.php +++ b/administrator/components/com_users/tmpl/group/edit.php @@ -21,7 +21,7 @@ ?> - 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
form->renderField('title'); ?> diff --git a/administrator/components/com_users/tmpl/level/edit.php b/administrator/components/com_users/tmpl/level/edit.php index 80116fdd040..e991e8217f3 100644 --- a/administrator/components/com_users/tmpl/level/edit.php +++ b/administrator/components/com_users/tmpl/level/edit.php @@ -19,7 +19,7 @@ ?> - 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php index b74c44bb79f..e23bec93c12 100644 --- a/administrator/components/com_users/tmpl/user/edit.php +++ b/administrator/components/com_users/tmpl/user/edit.php @@ -35,7 +35,7 @@

form->getValue('name', null, Text::_('COM_USERS_USER_NEW_USER_TITLE')); ?>

- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php index 5f0d531012e..29877b728c9 100644 --- a/administrator/components/com_workflow/tmpl/stage/edit.php +++ b/administrator/components/com_workflow/tmpl/stage/edit.php @@ -52,7 +52,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php index 2bea6cd65ee..6cdd054e4c8 100644 --- a/administrator/components/com_workflow/tmpl/transition/edit.php +++ b/administrator/components/com_workflow/tmpl/transition/edit.php @@ -34,7 +34,7 @@
- 'details')); ?> + 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php index 5cabb23b064..5896186b804 100644 --- a/administrator/components/com_workflow/tmpl/workflow/edit.php +++ b/administrator/components/com_workflow/tmpl/workflow/edit.php @@ -51,7 +51,7 @@
- 'general')); ?> + 'general', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/administrator/language/en-GB/com_actionlogs.ini b/administrator/language/en-GB/com_actionlogs.ini index 2223a0ddd2e..0a88ccf7dd6 100644 --- a/administrator/language/en-GB/com_actionlogs.ini +++ b/administrator/language/en-GB/com_actionlogs.ini @@ -58,7 +58,7 @@ COM_ACTIONLOGS_OPTION_RANGE_PAST_YEAR="In the last year" COM_ACTIONLOGS_OPTION_RANGE_POST_YEAR="More than a year ago" COM_ACTIONLOGS_OPTION_RANGE_TODAY="Today" COM_ACTIONLOGS_OPTIONS="Options" -COM_ACTIONLOGS_POSTINSTALL_BODY="

With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.

The logs can be reviewed in Joomla or exported for external use.

For further information on this new feature read the User Action Logs documentation.

" +COM_ACTIONLOGS_POSTINSTALL_BODY="

With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.

The logs can be reviewed in Joomla or exported for external use.

For further information on this new feature read the User Action Logs documentation.

" COM_ACTIONLOGS_POSTINSTALL_TITLE="User Actions Can Now Be Logged" COM_ACTIONLOGS_PURGE_CONFIRM="Are you sure want to delete all User Action logs?" COM_ACTIONLOGS_PURGE_FAIL="Failed to delete all User Action logs." diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini index 385935007ae..82bfb6b1bea 100644 --- a/administrator/language/en-GB/com_admin.ini +++ b/administrator/language/en-GB/com_admin.ini @@ -139,7 +139,7 @@ COM_ADMIN_POST_MAX_SIZE="Post Max Size" COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_ACTION="Enable Behind Load Balancer Setting" COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_DESCRIPTION="

For Joomla sites hosted behind Load Balancers and Reverse Proxies a new Global Configuration setting has been introduced with Joomla 3.9.26

This setting, when enabled, will allow your Load Balancer/Reverse Proxy to provide the real IP address of your visitors. This IP will then be used in your Action Logs and used for tracking voting on articles (if these features are enabled).

Only sites behind a Load Balancer/Reverse Proxy will wish to enable this feature.

" COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_TITLE="New Server Setting \"Behind Load Balancer\"" -COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION="

A new technology is currently being rolled out to browsers to replace third party tracking cookies. This technology is named Federated Learning of Cohorts (FLoC) and you can read more about it here and here. Starting with Joomla! 3.9.27 your website blocks this technology, you can re-allow it from the Global Configuration. Additionally to disable this technology for all requests to your server, you have to update your .htaccess.

" +COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION="

A new technology is currently being rolled out to browsers to replace third party tracking cookies. This technology is named Federated Learning of Cohorts (FLoC) and you can read more about it at the Web Platform Incubator Community Group and at the Electronic Frontier Foundation. Starting with Joomla! 3.9.27 your website blocks this technology, you can re-allow it from the Global Configuration. Additionally to disable this technology for all requests to your server, you have to update your .htaccess.

" COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE="Block Federated Learning of Cohorts (FLoC)" COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_DESCRIPTION="

Before 3.9.22 the default htaccess.txt file contained erroneous code meant for disabling directory listings. The security team recommends to manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.

The old code:

<IfModule autoindex>\n  IndexIgnore *\n</IfModule>

The new code:

<IfModule mod_autoindex.c>\n  IndexIgnore *\n</IfModule>
" COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_TITLE=".htaccess Update Concerning Directory Listings" diff --git a/administrator/language/en-GB/com_banners.ini b/administrator/language/en-GB/com_banners.ini index 83dee761eef..f2c727a5a29 100644 --- a/administrator/language/en-GB/com_banners.ini +++ b/administrator/language/en-GB/com_banners.ini @@ -199,5 +199,4 @@ COM_BANNERS_UNLIMITED="Unlimited" COM_BANNERS_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank name" COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_BANNERS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_BANNERS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_cache.ini b/administrator/language/en-GB/com_cache.ini index a45c9203ab4..01effdc6234 100644 --- a/administrator/language/en-GB/com_cache.ini +++ b/administrator/language/en-GB/com_cache.ini @@ -37,5 +37,4 @@ COM_CACHE_SIZE="Size" COM_CACHE_TABLE_CAPTION="Table of Cached Files" COM_CACHE_XML_DESCRIPTION="Component for cache management." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_CACHE="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_CACHE="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_categories.ini b/administrator/language/en-GB/com_categories.ini index 2c6da7fa876..a7361a596ee 100644 --- a/administrator/language/en-GB/com_categories.ini +++ b/administrator/language/en-GB/com_categories.ini @@ -56,7 +56,7 @@ COM_CATEGORIES_N_ITEMS_UNPUBLISHED_1="Category unpublished." COM_CATEGORIES_N_QUICKICON="Article Categories" COM_CATEGORIES_N_QUICKICON_0="Article Categories" COM_CATEGORIES_N_QUICKICON_1="Article Category" -COM_CATEGORIES_N_QUICKICON_SRONLY="Categories: %s article categories are published." +COM_CATEGORIES_N_QUICKICON_SRONLY="Categories: %d article categories are published." COM_CATEGORIES_N_QUICKICON_SRONLY_0="Categories: No article category is published." COM_CATEGORIES_N_QUICKICON_SRONLY_1="Categories: One article category is published." COM_CATEGORIES_NEW_CATEGORY="New Category" diff --git a/administrator/language/en-GB/com_checkin.ini b/administrator/language/en-GB/com_checkin.ini index 1dc6516b43a..6a14709de00 100644 --- a/administrator/language/en-GB/com_checkin.ini +++ b/administrator/language/en-GB/com_checkin.ini @@ -25,5 +25,4 @@ COM_CHECKIN_TABLE="%s table" COM_CHECKIN_TABLE_CAPTION="Table of Checked Out Items" COM_CHECKIN_XML_DESCRIPTION="Check-in Component." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_CHECKIN="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_CHECKIN="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini index 1e6e9168301..0fd4e1ac6df 100644 --- a/administrator/language/en-GB/com_config.ini +++ b/administrator/language/en-GB/com_config.ini @@ -232,5 +232,4 @@ COM_CONFIG_TEXT_FILTERS_SUMMARY="Expand for notes about the text filters" COM_CONFIG_WEBSERVICES_SETTINGS="Web Services" COM_CONFIG_XML_DESCRIPTION="Configuration Manager" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_CONFIG="If you change the setting, it will apply to this and all child groups, components and content. Note that:
Inherited means that the permissions from the parent group will be used.
Denied means that no matter what the parent group's setting is, the group being edited can't take this action.
Allowed means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
Not Set is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items." +JLIB_RULES_SETTING_NOTES_COM_CONFIG="If you change the setting, it will apply to this and all child groups, components and content. Note that:
Inherited means that the permissions from the parent group will be used.
Denied means that no matter what the parent group's setting is, the group being edited can't take this action.
Allowed means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
Not Set is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_contact.ini b/administrator/language/en-GB/com_contact.ini index 1e5598c34bc..9655ff66d71 100644 --- a/administrator/language/en-GB/com_contact.ini +++ b/administrator/language/en-GB/com_contact.ini @@ -192,5 +192,4 @@ JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information" JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved." JLIB_HTML_BATCH_USER_LABEL="Set Linked User" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_CONTACT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_CONTACT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini index 716d1c01a88..e66a574bbe8 100644 --- a/administrator/language/en-GB/com_content.ini +++ b/administrator/language/en-GB/com_content.ini @@ -190,11 +190,9 @@ JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new ar JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles." JLIB_APPLICATION_ERROR_BATCH_CANNOT_EXECUTE_TRANSITION="You are not allowed to execute a transition for one or more of these articles." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_CONTENT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." -JLIB_RULES_SETTING_NOTES_ITEM_COM_CONTENT_ARTICLE="Changes apply to this article only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_CONTENT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field +JLIB_RULES_SETTING_NOTES_ITEM_COM_CONTENT_ARTICLE="Changes apply to this article only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field -; Fields overrides -COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups" -COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group" -COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group" +COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups" ; Fields overrides +COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group" ; Fields overrides +COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group" ; Fields overrides diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini index 9c4f8bfed75..ec0d0962319 100644 --- a/administrator/language/en-GB/com_cpanel.ini +++ b/administrator/language/en-GB/com_cpanel.ini @@ -15,8 +15,7 @@ COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE="This information area won't appear when you have hidden all the messages." COM_CPANEL_MESSAGES_REVIEW="Read Messages" COM_CPANEL_MESSAGES_TITLE="You have post-installation messages" -; Translators: Don't touch the code part in the following message, Starting with ## Mod_rewrite ... -COM_CPANEL_MSG_ADDNOSNIFF_BODY="

Joomla is now shipped with additional security hardenings in the default htaccess.txt and web.config.txt files. These hardenings disable the so called MIME-type sniffing feature in web browsers. The sniffing leads to specific attack vectors, where scripts in normally harmless file formats (eg images) will be executed, leading to Cross-Site-Scripting vulnerabilities.

The security team recommends to manually apply the necessary changes to existing .htaccess or web.config files, as those files can not be updated automatically.

Changes for .htaccess
Add the following lines before \"## Mod_rewrite in use.\":

<IfModule mod_headers.c>\nHeader always set X-Content-Type-Options \"nosniff\"\n</IfModule>

Changes for web.config
Add the following lines right after \"</rewrite>\":

<httpProtocol>\n  <customHeaders>\n    <add name=\"X-Content-Type-Options\" value=\"nosniff\" />\n  </customHeaders>\n</httpProtocol>
" +COM_CPANEL_MSG_ADDNOSNIFF_BODY="

Joomla is now shipped with additional security hardenings in the default htaccess.txt and web.config.txt files. These hardenings disable the so called MIME-type sniffing feature in web browsers. The sniffing leads to specific attack vectors, where scripts in normally harmless file formats (eg images) will be executed, leading to Cross-Site-Scripting vulnerabilities.

The security team recommends to manually apply the necessary changes to existing .htaccess or web.config files, as those files can not be updated automatically.

Changes for .htaccess
Add the following lines before \"## Mod_rewrite in use.\":

<IfModule mod_headers.c>\nHeader always set X-Content-Type-Options \"nosniff\"\n</IfModule>

Changes for web.config
Add the following lines right after \"</rewrite>\":

<httpProtocol>\n  <customHeaders>\n    <add name=\"X-Content-Type-Options\" value=\"nosniff\" />\n  </customHeaders>\n</httpProtocol>
" ; Translators: Don't touch the code part in the message, Starting with ## Mod_rewrite ... COM_CPANEL_MSG_ADDNOSNIFF_TITLE=".htaccess & web.config Security Update" COM_CPANEL_MSG_HTACCESSSVG_BODY="

Since 3.9.21 Joomla is shipped with an additional security rule in the default htaccess.txt. This rule will protect users of svg files from potential Cross-Site-Scripting (XSS) vulnerabilities.
The security team recommends to manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.

Changes for .htaccess

<FilesMatch \"\.svg$\">\n  <IfModule mod_headers.c>\n    Header always set Content-Security-Policy \"script-src 'none'\"\n  </IfModule>\n</FilesMatch>

Currently we are not aware of a method to conditionally configure this on IIS web servers, please contact your hosting provider for further assistance.

" COM_CPANEL_MSG_HTACCESSSVG_TITLE="Additional XSS protection for the usage of SVG files" @@ -24,13 +23,13 @@ COM_CPANEL_MSG_LANGUAGEACCESS340_BODY="Since Joomla! 3.4.0 you may have issues w COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE="You have possible issues with your multilingual settings" COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these changes in their own robots.txt file." COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update" -COM_CPANEL_MSG_STATS_COLLECTION_BODY="

Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.

This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.

In the interest of full transparency and to help developers this data is publicly available. An API and graphs will show the Joomla version, PHP versions and database engines in use.

If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.

" +COM_CPANEL_MSG_STATS_COLLECTION_BODY="

Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.

This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.

In the interest of full transparency and to help developers this data is publicly available. An API and graphs will show the Joomla version, PHP versions and database engines in use.

If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.

" COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla" COM_CPANEL_MSG_TEXTFILTER3919_BODY="

As part of our security team's review, we have made some changes to the default settings for the global text filters in a new Joomla installation. The default setting for the 'Public', 'Guest' and 'Registered' groups is now 'No HTML'. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site from: System → Global Configuration → Text Filters

" COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations" 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_MESSAGE="

Community resources are available for new users.

" COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!" COM_CPANEL_XML_DESCRIPTION="Home Dashboard component" diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini index eef36f7e361..6025be09089 100644 --- a/administrator/language/en-GB/com_installer.ini +++ b/administrator/language/en-GB/com_installer.ini @@ -175,17 +175,17 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt fr COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered." COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER="The update table is not up to date. Please rebuild your update server table" COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings" -COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the Joomla! Documentation Site." +COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the Joomla! Documentation Site." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions with the installer." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC="This folder is where Joomla copies an extension, extracts the extension and the files are then copied into the correct directories. If this location is not set in configuration.php ($tmp_path) then you won't be able to upload extensions. Create a folder to enable Joomla to write to the folder to fix the issue." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The Joomla temporary folder is not writable or does not exist." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC="This may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, make sure the folder defined in your configuration.php exists or check the '%s' and set it to be writeable and see if this fixes the issue." -COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC="Low PHP memory limit." -COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN="Your PHP memory limit is set below 8MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB." -COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC="Potentially low PHP memory limit." -COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN="Your PHP memory limit is set below 16MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB." +COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC="Your PHP memory limit is set below 16MB which may cause some issues when installing large extensions. Please set your memory limit to at least 32MB." +COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN="Low PHP memory limit." +COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC="Your PHP memory limit is set below 24MB which may cause some issues when installing large extensions. Please set your memory limit to at least 32MB." +COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN="Potentially low PHP memory limit." COM_INSTALLER_MSG_WARNINGS_NONE="No warnings detected." COM_INSTALLER_MSG_WARNINGS_NOTCOMPLETE="

Warning: Update Not Complete!

The update is only partially complete. Please do the second update to complete the process.

" COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET="The PHP temporary folder is not set." @@ -293,5 +293,4 @@ COM_INSTALLER_VALUE_SUPPORTED_SUPPORTED="Download Key supported" COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -" COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_INSTALLER="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_INSTALLER="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index ac4620cb471..cf3f93c0115 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -3,6 +3,7 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 +COM_JOOMLAUPDATE_CAPTIVE_HEADLINE="Confirm your credentials" COM_JOOMLAUPDATE_CHECKED_UPDATES="Checked for updates." COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL="Custom URL" COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where Joomla gets its update information from." @@ -15,8 +16,11 @@ COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next" COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing" COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options" COM_JOOMLAUPDATE_CONFIRM="Confirm" +COM_JOOMLAUPDATE_EMPTYSTATE_APPEND="Update your site by manually uploading the update package." +COM_JOOMLAUPDATE_EMPTYSTATE_BUTTON_ADD="Check for Updates" +COM_JOOMLAUPDATE_EMPTYSTATE_CONTENT="Select the button below to check for updates." +COM_JOOMLAUPDATE_EMPTYSTATE_TITLE="Check if an update is available." COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES="Failed to check for updates." -COM_JOOMLAUPDATE_LOGIN="Login" COM_JOOMLAUPDATE_MINIMUM_STABILITY_ALPHA="Alpha" COM_JOOMLAUPDATE_MINIMUM_STABILITY_BETA="Beta" COM_JOOMLAUPDATE_MINIMUM_STABILITY_DESC="The minimum stability of the Joomla updates you would like to see. Development is the least stable, Stable is production quality. If an update doesn't specify a level it is assumed to be Stable." @@ -24,17 +28,33 @@ COM_JOOMLAUPDATE_MINIMUM_STABILITY_DEV="Development" COM_JOOMLAUPDATE_MINIMUM_STABILITY_LABEL="Minimum Stability" COM_JOOMLAUPDATE_MINIMUM_STABILITY_RC="Release Candidate" COM_JOOMLAUPDATE_MINIMUM_STABILITY_STABLE="Stable" +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_APPEND="Update your site by manually uploading the update package." +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_BUTTON_ADD="Retry check for update" +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_CONTENT="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.
Please try to download the update package from the official Joomla download page and use the Upload and Update function." +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_TITLE="We can't find a download URL" COM_JOOMLAUPDATE_OVERVIEW="Joomla Update" COM_JOOMLAUPDATE_PREUPDATE_CHECK_CAPTION="Table of server settings to check before update." -COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS="There are plugins installed and enabled that could interfere with the Joomla upgrade and result in a failed upgrade that leaves the site inaccessible.

You are strongly advised to upgrade, disable or uninstall these plugins before upgrading." +COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS="There are plugins installed and enabled that could interfere with the Joomla update and result in a failed update that leaves the site inaccessible.

You are strongly advised to update, disable or uninstall these plugins before upgrading." COM_JOOMLAUPDATE_PREUPDATE_CHECK_EXTENSION_AUTHOR_URL="Extension Author URL" COM_JOOMLAUPDATE_PREUPDATE_CHECK_NOT_COMPLETE="Pre-Update checks have not been completed yet - please wait." +COM_JOOMLAUPDATE_PREUPDATE_EXTENSIONS="Extensions" COM_JOOMLAUPDATE_PREUPDATE_HEADING_CHECKED="Checked" COM_JOOMLAUPDATE_PREUPDATE_HEADING_REQUIREMENT="Requirement" +COM_JOOMLAUPDATE_PREUPDATE_REQUIRED_SETTINGS="Required Settings" +COM_JOOMLAUPDATE_PREUPDATE_RECOMMENDED_SETTINGS="Recommended Settings" COM_JOOMLAUPDATE_PREUPDATE_UNKNOWN_EXTENSION_MANIFESTCACHE_VERSION="Unknown Version" +COM_JOOMLAUPDATE_REINSTALL_EMPTYSTATE_BUTTON_ADD="Reinstall Joomla! core files" +COM_JOOMLAUPDATE_REINSTALL_EMPTYSTATE_CONTENT="You can reinstall all core files to repair broken or missing files." +COM_JOOMLAUPDATE_REINSTALL_EMPTYSTATE_TITLE="Currently no update available." +COM_JOOMLAUPDATE_SELF_EMPTYSTATE_BUTTON_ADD="Update component now" +COM_JOOMLAUPDATE_SELF_EMPTYSTATE_CONTENT="A new version of the Joomla Update Component is available. You must update this first before you can update Joomla!" +COM_JOOMLAUPDATE_SELF_EMPTYSTATE_TITLE="Live Update is not available" COM_JOOMLAUPDATE_SYSTEM_CHECK="System Check" COM_JOOMLAUPDATE_TOOLBAR_CHECK="Check for Updates" COM_JOOMLAUPDATE_UPDATE_CHECK="Update Check" +COM_JOOMLAUPDATE_UPDATE_CONFIRM_BACKUP="I've created a backup and my extensions are compatible." +COM_JOOMLAUPDATE_UPDATE_EMPTYSTATE_TITLE="Update your site to \"Joomla! %s\"" +COM_JOOMLAUPDATE_UPDATE_EMPTYSTATE_BUTTON_ADD="Start update" COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP="Cleaning up after installation." COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE="Update to version %s is complete." COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES="Deleting removed files and folders." @@ -57,9 +77,9 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with Please note that if you see a version highlighted as X.X.X then the extension developer is offering a newer version of the extension for your current version of Joomla than they do for the new version of Joomla. You should check with the extension developer if this is correct before you update Joomla.

" COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE="Update Required" -COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES="

Please update these extensions before updating Joomla.

" +COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPDATES_TO_BE_COMPATIBLE_NOTES="

Please update these extensions before updating Joomla.

Please be especially careful if the extension is also listed as incompatible with the current version of Joomla!

" COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS="Running Pre-Update Checks" -COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES="Please be patient whilst we run the pre-update checks on your extensions." -COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION="[ Less Detail %s ]" -COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION="[ More Detail %s ]" +COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES="

Please be patient whilst we run the pre-update checks on your extensions.

" +COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION="Less Details" +COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION="More Details" COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION="Update Information Unavailable" COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES="Extension does not offer a compatible version for the selected target version of Joomla. This could mean the extension does not use the Joomla update system or the developer has not provided compatibility information for this Joomla version yet." -COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP="More Information." +COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP="More Information" COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL="Additional Information" COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST="You must update to the latest version of the Joomla Update Component before you can update Joomla!" COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Reinstall Joomla core files" COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla version" -COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Install the Update" +COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Update" COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Latest Joomla version" COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL" COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.
Please try to download the update package from the official Joomla download page and use the Upload and Update tab." COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="Live Update is not available" COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="There is a new version of the Joomla Update Component that needs to be installed first. Click here to update the component." -COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED="The system is currently checking these plugins to see if they could cause problems during the upgrade.

Please be patient while the checks are completed." -COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION="Do you wish to ignore the warnings about potentially incompatible plugins and to proceed with the upgrade?" +COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED="The system is currently checking these plugins to see if they could cause problems during the update.

Please be patient while the checks are completed." +COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION="I accept the warnings about potentially incompatible extensions and wish to proceed with the update." COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available" COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla version, %s." COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL" +COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_INFO="You can also download the update package and install it manually." COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL" COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported" COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match the minimum requirements for Joomla %1$s." -COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN="Potentially Serious Problem." -COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to ignore the warnings about potentially incompatible plugins and proceed with the upgrade?" -COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC="This extension includes a plugin that could cause the upgrade to fail.

To perform the Joomla upgrade safely you should either upgrade this extension to a version compatible with your target version of Joomla or disable the relevant plugin(s) and check again.

For more information about the relevant plugins please check the 'Live Update' tab." -COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST="The following plugins could cause problems during the upgrade" +COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN="Potential Upgrade Issue." +COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to ignore the warnings about potentially incompatible extensions and proceed with the update?" +COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC="This extension includes a plugin that could cause the update to fail.

To perform the Joomla update safely you should either update this extension to a version compatible with your target version of Joomla or disable the relevant plugin(s) and check again.

For more information about the relevant plugins please check the 'Live Update' tab." +COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST="The following plugins could cause problems during the update" COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK="Pre-Update Check for Joomla %s" COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED="Recommended" COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla. However, Joomla! will still operate if your settings do not quite match the recommended configuration." @@ -121,7 +142,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="You are on the "%s" COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the "%s" update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (4.x)" COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the "%s" update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (4.x) and you will also be notified when the future major release (5.x) will be available. Before upgrading to 5.x you'll need to assess its compatibility with your environment." COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="You are on the "%s" update channel. This channel is designed for testing new releases and fixes in Joomla.
It is only intended for JBS (Joomla Bug Squad™) members and others within the Joomla community who are testing. Do not use this setting on a production site." -COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla Upgrade Package in ZIP format from the official Joomla download page. Then use the fields below to upload and install it." +COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla Update Package in ZIP format from the official Joomla download page. Then use the fields below to upload and install it." COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted" COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read" COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG="File Checksum Failed" diff --git a/administrator/language/en-GB/com_languages.ini b/administrator/language/en-GB/com_languages.ini index 4cb4a7e9824..c4f41e1b8a4 100644 --- a/administrator/language/en-GB/com_languages.ini +++ b/administrator/language/en-GB/com_languages.ini @@ -150,5 +150,4 @@ COM_LANGUAGES_VIEW_OVERRIDES_TEXT_DESC="Text descending" COM_LANGUAGES_VIEW_OVERRIDES_TITLE="Languages: Overrides" COM_LANGUAGES_XML_DESCRIPTION="Component for language management" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_LANGUAGES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_LANGUAGES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini index 7dc1d88c9d6..8335ec01db8 100644 --- a/administrator/language/en-GB/com_menus.ini +++ b/administrator/language/en-GB/com_menus.ini @@ -141,9 +141,7 @@ COM_MENUS_MENUS="Menu Items" COM_MENUS_MENUS_FILTER_SEARCH_DESC="Search in title and menu type." COM_MENUS_MENUS_FILTER_SEARCH_LABEL="Search Menus" COM_MENUS_MENUS_TABLE_CAPTION="Table of Menus" -; in the following string -; %1$s is for module title, %2$s is for access-title, %3$s is for position -COM_MENUS_MODULE_ACCESS_POSITION="%1$s (%2$s in %3$s)" +COM_MENUS_MODULE_ACCESS_POSITION="%1$s (%2$s in %3$s)" ; %1$s is for module title, %2$s is for access-title, %3$s is for position COM_MENUS_MODULES="Modules" COM_MENUS_MODULES_TABLE_CAPTION="Table of Module Assignments" COM_MENUS_N_ITEMS_CHECKED_IN_1="Menu item checked in." @@ -205,9 +203,8 @@ COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Item" COM_MENUS_VIEW_NEW_MENU_TITLE="Menus: Add" COM_MENUS_XML_DESCRIPTION="Component for creating menus." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_MENUS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_MENUS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field -; Alternate language strings for the default menu item -JDEFAULT="Home" -JLIB_HTML_SETDEFAULT_ITEM="Set as Home" +JDEFAULT="Home" ; Alternate language strings for the default menu item +JLIB_HTML_SETDEFAULT_ITEM="Set as Home" ; Alternate language strings for the default menu item +JTOOLBAR_DEFAULT="Home" ; Alternate language strings for the default menu item diff --git a/administrator/language/en-GB/com_messages.ini b/administrator/language/en-GB/com_messages.ini index fe28ca83639..43363d1e951 100644 --- a/administrator/language/en-GB/com_messages.ini +++ b/administrator/language/en-GB/com_messages.ini @@ -77,5 +77,4 @@ COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages: View" COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Private Messages: Write" COM_MESSAGES_XML_DESCRIPTION="Component for private messaging support in Backend." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_MESSAGES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_MESSAGES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini index cfb0cc3c87b..f0add7dbba4 100644 --- a/administrator/language/en-GB/com_modules.ini +++ b/administrator/language/en-GB/com_modules.ini @@ -192,5 +192,4 @@ COM_MODULES_TYPE_CHOOSE="Select a Module Type" COM_MODULES_TYPE_OR_SELECT_POSITION="Type or Select a Position" COM_MODULES_XML_DESCRIPTION="Component for module management in the Administrator Backend." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_MODULES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_MODULES="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_newsfeeds.ini b/administrator/language/en-GB/com_newsfeeds.ini index c03180139d1..77d88995838 100644 --- a/administrator/language/en-GB/com_newsfeeds.ini +++ b/administrator/language/en-GB/com_newsfeeds.ini @@ -95,5 +95,4 @@ COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME="Please provide a valid name." COM_NEWSFEEDS_XML_DESCRIPTION="This component manages RSS and Atom news feeds." JGLOBAL_NEWITEMSLAST_DESC="New news feeds default to the last position. The ordering can be changed after this news feed has been saved." -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_NEWSFEEDS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_NEWSFEEDS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_plugins.ini b/administrator/language/en-GB/com_plugins.ini index 1b72b3f93cf..40d7f3662d9 100644 --- a/administrator/language/en-GB/com_plugins.ini +++ b/administrator/language/en-GB/com_plugins.ini @@ -42,5 +42,4 @@ COM_PLUGINS_XML_ERR="Plugins XML data not available." JLIB_HTML_PUBLISH_ITEM="Enable plugin" JLIB_HTML_UNPUBLISH_ITEM="Disable plugin" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_PLUGINS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_PLUGINS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_privacy.ini b/administrator/language/en-GB/com_privacy.ini index a718daade7c..fd026db6a44 100644 --- a/administrator/language/en-GB/com_privacy.ini +++ b/administrator/language/en-GB/com_privacy.ini @@ -131,7 +131,7 @@ COM_PRIVACY_NOTIFY_LABEL="Days To Consider Request Urgent" COM_PRIVACY_N_CONSENTS_INVALIDATED="%s consents were invalidated." COM_PRIVACY_N_CONSENTS_INVALIDATED_1="The consent was invalidated." COM_PRIVACY_OPTION_LABEL="Options" -COM_PRIVACY_POSTINSTALL_BODY="

With the introduction of GDPR for EU citizens and similar regulations elsewhere in the world it may be necessary for you to request consent before storing any Personal Information of a user.

Joomla 3.9 introduces new capabilities to assist you in creating site privacy policies and collecting user consent. In addition a workflow is available to help you manage user information requests such as requests for removing their personal data from your site.

For further information on this new feature read the Privacy documentation.

" +COM_PRIVACY_POSTINSTALL_BODY="

With the introduction of GDPR for EU citizens and similar regulations elsewhere in the world it may be necessary for you to request consent before storing any Personal Information of a user.

Joomla 3.9 introduces new capabilities to assist you in creating site privacy policies and collecting user consent. In addition a workflow is available to help you manage user information requests such as requests for removing their personal data from your site.

For further information on this new feature read the Privacy documentation.

" COM_PRIVACY_POSTINSTALL_TITLE="Increased Management Of Users Privacy" COM_PRIVACY_REQUESTS_EMPTYSTATE_BUTTON_ADD="Add your first request" COM_PRIVACY_REQUESTS_EMPTYSTATE_CONTENT="This screen displays all Privacy: Information Requests that have been received and their status. You can also create a new request here." diff --git a/administrator/language/en-GB/com_redirect.ini b/administrator/language/en-GB/com_redirect.ini index dc121a38caf..9b17e3fe345 100644 --- a/administrator/language/en-GB/com_redirect.ini +++ b/administrator/language/en-GB/com_redirect.ini @@ -95,5 +95,4 @@ COM_REDIRECT_TOOLBAR_PURGE="Purge Disabled" COM_REDIRECT_XML_DESCRIPTION="This component implements link redirection." COM_REDIRECTS_TABLE_CAPTION="Table of redirect Links" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_REDIRECT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_REDIRECT="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini index a37c800ae3f..336fbae3fc1 100644 --- a/administrator/language/en-GB/com_users.ini +++ b/administrator/language/en-GB/com_users.ini @@ -380,9 +380,7 @@ COM_USERS_VIEW_NOTES_TITLE="User Notes" COM_USERS_VIEW_USERS_TITLE="Users" COM_USERS_XML_DESCRIPTION="Component for managing users" -; Alternate language strings for the rules form field -JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." +JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field -; Categories overrides -COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category" -COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category" +COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category" ; Categories overrides +COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category" ; Categories overrides diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 1c302077505..ac647490080 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 4.0.0 - June 2021 + August 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index cf24fcb031a..838e727b2d5 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -1010,8 +1010,6 @@ JTOOLBAR_OPTIONS="Options" JTOOLBAR_PUBLISH="Publish" JTOOLBAR_PURGE_CACHE="Clear Cache" JTOOLBAR_REBUILD="Rebuild" -JTOOLBAR_REBUILD_FAILED="Rebuild failed: %s" -JTOOLBAR_REBUILD_SUCCESS="Toolbar rebuilt." JTOOLBAR_REFRESH_CACHE="Refresh Cache" JTOOLBAR_REMOVE="Remove" JTOOLBAR_SAVE="Save & Close" diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 1cbdb407c26..63b1757be53 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - June 2021 + August 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini index 8315d62b27c..b763fd9d3ee 100644 --- a/administrator/language/en-GB/lib_joomla.ini +++ b/administrator/language/en-GB/lib_joomla.ini @@ -382,6 +382,7 @@ JLIB_HTML_BATCH_USER_NOUSER="No User." JLIB_HTML_BATCH_WORKFLOW_STAGE_LABEL="Change Stage" JLIB_HTML_BATCH_WORKFLOW_STAGE_NOCHANGE="- Keep original Workflow Stage -" JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar" +JLIB_HTML_BEHAVIOR_AM="am" JLIB_HTML_BEHAVIOR_CLOSE="Close" JLIB_HTML_BEHAVIOR_DATE_SELECTION="Date selection:\n" JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST="Display %s first" @@ -393,6 +394,7 @@ JLIB_HTML_BEHAVIOR_MONTH_SELECT="- Use the < and > buttons to select month\n" JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU="Select to move to the next month. Select and hold for a list of the months." JLIB_HTML_BEHAVIOR_NEXT_YEAR_HOLD_FOR_MENU="Select to move to the next year. Select and hold for a list of years." JLIB_HTML_BEHAVIOR_OPEN_CALENDAR="Open the calendar" +JLIB_HTML_BEHAVIOR_PM="pm" JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU="Select to move to the previous month. Select and hold for a list of the months." JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU="Select to move to the previous year. Select and hold for a list of years." JLIB_HTML_BEHAVIOR_SELECT_DATE="Select a date." @@ -705,7 +707,6 @@ JLIB_RULES_NOTICE_RECALCULATE_GROUP_CHILDS_PERMISSIONS="Permissions changed in a JLIB_RULES_NOTICE_RECALCULATE_GROUP_PERMISSIONS="Super User permissions changed. Save or reload to recalculate this group permissions." JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server." JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions." -JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group." JLIB_RULES_SELECT_SETTING="Select New Setting" JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that Denied will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, Deny will take precedence. Not Set is equivalent to Denied but can be changed in child groups, components and content." JLIB_RULES_SETTING_NOTES_ITEM="If you change the setting, it will apply to this item. Note that:
Inherited means that the permissions from global configuration, parent group and category will be used.
Denied means that no matter what the global configuration, parent group or category settings are, the group being edited can't take this action on this item.
Allowed means that the group being edited will be able to take this action for this item (but if this is in conflict with the global configuration, parent group or category it will have no impact; a conflict will be indicated by Not Allowed (Inherited) under Calculated Settings)." diff --git a/administrator/language/en-GB/mod_menu.ini b/administrator/language/en-GB/mod_menu.ini index b13e0265005..33fd0dc9c21 100644 --- a/administrator/language/en-GB/mod_menu.ini +++ b/administrator/language/en-GB/mod_menu.ini @@ -70,14 +70,10 @@ MOD_MENU_HELP_PARENT_START_HERE="Start Here" MOD_MENU_HELP_RESOURCES="Joomla! Resources" MOD_MENU_HELP_SECURITY="Security Centre" MOD_MENU_HELP_SHOP="Joomla! Shop" -; The string below will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL -MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" +MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" ; Will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum" -; If you have chosen to display in the string above the section for all languages, translate the string below. -; If you have displayed the specific language forum, use something like "Official French Forum" in your language. -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" -; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums. -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511" +MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" ; If you have displayed the specific language forum, use something like "Official French Forum" in your language. +MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511" ; The # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums. MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations" MOD_MENU_HELP_USER_GROUPS="Joomla User Groups" MOD_MENU_HELP_XCHANGE="Stack Exchange" diff --git a/administrator/language/en-GB/plg_fields_imagelist.ini b/administrator/language/en-GB/plg_fields_imagelist.ini index 1fe6b5905a1..650be93932c 100644 --- a/administrator/language/en-GB/plg_fields_imagelist.ini +++ b/administrator/language/en-GB/plg_fields_imagelist.ini @@ -5,8 +5,7 @@ PLG_FIELDS_IMAGELIST="Fields - Imagelist" PLG_FIELDS_IMAGELIST_LABEL="List of Images (%s)" -; Don't translate "images" in the string below. -PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root." +PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root." ; Don't translate "images" PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL="Directory" PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL="Image Class" PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL="Multiple" diff --git a/administrator/language/en-GB/plg_fields_sql.ini b/administrator/language/en-GB/plg_fields_sql.ini index 4717eabf9e6..5744e7f5411 100644 --- a/administrator/language/en-GB/plg_fields_sql.ini +++ b/administrator/language/en-GB/plg_fields_sql.ini @@ -7,7 +7,6 @@ PLG_FIELDS_SQL="Fields - SQL" PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create or edit an SQL field!" PLG_FIELDS_SQL_LABEL="SQL (%s)" PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple" -; In the string below the terms 'value' and 'text' should not be translated -PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list." +PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list." ; The terms 'value' and 'text' should not be translated PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query" PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/plg_installer_webinstaller.ini b/administrator/language/en-GB/plg_installer_webinstaller.ini index d6e63f9e8ca..e3ebf2fa391 100644 --- a/administrator/language/en-GB/plg_installer_webinstaller.ini +++ b/administrator/language/en-GB/plg_installer_webinstaller.ini @@ -10,7 +10,6 @@ PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name" PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from" PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..." PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later." -; The [SITEURL] placeholder should not be translated as it is used in the JavaScript API to insert the correct URL -PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL="You will be redirected to the following link to complete the registration/purchase: [SITEURL]" +PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL="You will be redirected to the following link to complete the registration/purchase: [SITEURL]" ; The [SITEURL] placeholder should not be translated as it is used in the JavaScript API to insert the correct URL PLG_INSTALLER_WEBINSTALLER_TAB_LABEL="Install from Web" PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin allows you to install directly from the Joomla! Extension Directory." diff --git a/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini b/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini index 256cd3954e8..c03c665c668 100644 --- a/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini +++ b/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini @@ -4,10 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 PLG_QUICKICON_PHPVERSIONCHECK="Quick Icon - PHP Version Check" -; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version -PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes from the PHP project at this time. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version. Please contact your host for upgrade instructions." -; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version -PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s.

Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure." -; Key 1 is the server's current PHP version -PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. Furthermore, we cannot recommend a newer PHP version because you are using an outdated Joomla! version. We recommend updating Joomla! and then following further PHP upgrade instructions." +PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes from the PHP project at this time. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version. Please contact your host for upgrade instructions." ; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version +PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s.

Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure." ; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version +PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. Furthermore, we cannot recommend a newer PHP version because you are using an outdated Joomla! version. We recommend updating Joomla! and then following further PHP upgrade instructions." ; Key 1 is the server's current PHP version PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION="Checks the support status of your installation's PHP version and raises a warning if not fully supported." diff --git a/administrator/language/en-GB/plg_system_httpheaders.ini b/administrator/language/en-GB/plg_system_httpheaders.ini index dd306e08609..ee90100271b 100644 --- a/administrator/language/en-GB/plg_system_httpheaders.ini +++ b/administrator/language/en-GB/plg_system_httpheaders.ini @@ -3,61 +3,43 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 -; Please do not translate the word 'HTTP Headers' in the following two language strings -PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" -PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER="Force HTTP Headers" -; Please do not translate the word 'HTTP Header' in the following two language strings -PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_KEY="HTTP Header" -PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_VALUE="HTTP Header Value" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY="Content Security Policy (CSP)" +PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" ; Do not translate 'HTTP Headers' +PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER="Force HTTP Headers" ; Do not translate 'HTTP Headers' +PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_KEY="HTTP Header" ; Do not translate 'HTTP Header' +PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_VALUE="HTTP Header Value" ; Do not translate 'HTTP Header' +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY="Content Security Policy (CSP)" ; Do not translate PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_CLIENT="Client" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED="frame-ancestors 'self'" +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED="frame-ancestors 'self'" ; Do not translate PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED_DESC="Enable the CSP clickjacking protection frame-ancestors and only allow the origin 'self'. Please use the form below to allow origins other than 'self'." -; Please only change the URL in the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="Nonce" +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="Nonce" ; Please only change the URL PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED_DESC="Enable the whitelist for specific inline scripts using a cryptographic nonce (number used once) for all scripts and styles using the Joomla API. Specifying a nonce makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without nonce support." -; Please do not translate 'Content-Security-Policy' & 'Content-Security-Policy-Report-Only' in the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY_DESC="Use the header 'Content-Security-Policy-Report-Only' instead of 'Content-Security-Policy'." -; Please do not translate the following two language strings -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY="Report-Only" -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED="strict-dynamic" -; Please do not translate 'strict-dynamic', 'self' and 'unsafe-inline' in the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED_DESC="The strict-dynamic source expression specifies that the trust explicitly given to a script present in the markup, by accompanying it with a nonce or a hash, shall be propagated to all the scripts loaded by that root script. At the same time, any allowed or source expressions such as 'self' or 'unsafe-inline' will be ignored." -; Please only change the URL in the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED="Script hashes" +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY_DESC="Use the header 'Content-Security-Policy-Report-Only' instead of 'Content-Security-Policy'." ; Do not translate 'Content-Security-Policy' & 'Content-Security-Policy-Report-Only' +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY="Report-Only" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED="strict-dynamic" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED_DESC="The strict-dynamic source expression specifies that the trust explicitly given to a script present in the markup, by accompanying it with a nonce or a hash, shall be propagated to all the scripts loaded by that root script. At the same time, any allowed or source expressions such as 'self' or 'unsafe-inline' will be ignored." ; Do not translate 'strict-dynamic', 'self' and 'unsafe-inline' +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED="Script hashes" ; Please only change the URL PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline scripts using a cryptographic hash for all scripts using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support." -; Please only change the URL in the following language string -PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="Style hashes" +PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="Style hashes" ; Please only change the URL PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline styles using a cryptographic hash for all styles using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support." PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES="Add Directive" PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_DIRECTIVE="Policy Directive" PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_VALUE="Value" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_COOP="Cross-Origin-Opener-Policy" +PLG_SYSTEM_HTTPHEADERS_COOP="Cross-Origin-Opener-Policy" ; Do not translate PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT="Client" PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT_BOTH="Both" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_HSTS="HTTP Strict Transport Security (HSTS)" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE="max-age" -; Please do not translate 'max-age' in the following language string -PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE_DESC="This option sets the time for 'max-age', it is specified in seconds. The default value is 31536000, which corresponds to one year" -; Please do not translate the following language string -PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="Preload" +PLG_SYSTEM_HTTPHEADERS_HSTS="HTTP Strict Transport Security (HSTS)" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE="max-age" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE_DESC="This option sets the time for 'max-age', it is specified in seconds. The default value is 31536000, which corresponds to one year" ; Please do not translate 'max-age' +PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="Preload" ; Do not translate PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_DESC="This option activates the opt-in for inclusion in so-called browser preload lists." PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE="Important" -; Please do not translate 'max-age' in the following language string -PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can no longer be called without HTTPS. Once added to the preload list, this is not easy to undo. Domains can be removed, but it takes months for users to make a change with a browser update.
This option is very important to prevent 'man-in-the-middle attacks', so it should be activated in any case, but only if you are sure that HTTPS is supported for domain and all subdomains in the long run! The value for 'max-age' must be set to 63072000 (2 years) for recording." +PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can no longer be called without HTTPS. Once added to the preload list, this is not easy to undo. Domains can be removed, but it takes months for users to make a change with a browser update.
This option is very important to prevent 'man-in-the-middle attacks', so it should be activated in any case, but only if you are sure that HTTPS is supported for domain and all subdomains in the long run! The value for 'max-age' must be set to 63072000 (2 years) for recording." ; Please do not translate 'max-age' PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS="Also for subdomains" PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS_DESC="HSTS should also be enabled for subdomains usually the subdomain 'www' is taken into account when creating the SSL certificate. If further subdomains are used, please note that they are also provided with a valid SSL certificate." PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION="Enable default security headers" PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY="

Joomla! comes with a built-in set of tools that help you to handle http security headers. These headers help your browser for example to protect your website from XSS and Clickjacking attacks.

You can find more details in the HTTP Header Management Tutorial in the Joomla! Documentation.

" PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE="HTTP Security Headers" -; Please do not translate the following two language strings -PLG_SYSTEM_HTTPHEADERS_REFERRERPOLICY="Referrer-Policy" -PLG_SYSTEM_HTTPHEADERS_XFRAMEOPTIONS="X-Frame-Options" -; Please do not translate 'HTTP Security Headers' in the following language string -PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin helps you to set the HTTP Security Headers" +PLG_SYSTEM_HTTPHEADERS_REFERRERPOLICY="Referrer-Policy" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_XFRAMEOPTIONS="X-Frame-Options" ; Do not translate +PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin helps you to set the HTTP Security Headers" ; Please do not translate 'HTTP Security Headers' diff --git a/administrator/language/en-GB/plg_system_httpheaders.sys.ini b/administrator/language/en-GB/plg_system_httpheaders.sys.ini index 67ab816418e..bce0c3f2c3d 100644 --- a/administrator/language/en-GB/plg_system_httpheaders.sys.ini +++ b/administrator/language/en-GB/plg_system_httpheaders.sys.ini @@ -3,6 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 -; Please do not translate the word 'HTTP Headers' in the following two language strings -PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" -PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin can set some Security HTTP Headers" +PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" ; Do not translate the word 'HTTP Headers' +PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin can set some Security HTTP Headers" ; Do not translate the word 'HTTP Headers' diff --git a/administrator/language/en-GB/plg_system_skipto.ini b/administrator/language/en-GB/plg_system_skipto.ini index a94b17f78cf..a3270dc65a9 100644 --- a/administrator/language/en-GB/plg_system_skipto.ini +++ b/administrator/language/en-GB/plg_system_skipto.ini @@ -4,12 +4,10 @@ ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_SKIPTO="System - Skip-To Navigation" -; do not translate $key -PLG_SYSTEM_SKIPTO_ACCESS_KEY="Access key is $key" +PLG_SYSTEM_SKIPTO_ACCESS_KEY="Access key is $key" ; do not translate $key PLG_SYSTEM_SKIPTO_HEADING="Page Outline" PLG_SYSTEM_SKIPTO_HEADING_LEVEL="Heading level" -; next line begins with a space. $m is count, %n is total -PLG_SYSTEM_SKIPTO_HEADING_MOFN=" ($m of $n)" +PLG_SYSTEM_SKIPTO_HEADING_MOFN=" ($m of $n)" ; Begins with a space. $m is count, %n is total PLG_SYSTEM_SKIPTO_HEADING_NONE="No headings to skip to" PLG_SYSTEM_SKIPTO_LANDMARK_ASIDE="Aside" PLG_SYSTEM_SKIPTO_LANDMARK_FOOTER="Footer" diff --git a/administrator/language/en-GB/plg_twofactorauth_totp.ini b/administrator/language/en-GB/plg_twofactorauth_totp.ini index f589af584d8..cee182dd5a8 100644 --- a/administrator/language/en-GB/plg_twofactorauth_totp.ini +++ b/administrator/language/en-GB/plg_twofactorauth_totp.ini @@ -8,7 +8,7 @@ PLG_TWOFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid security PLG_TWOFACTORAUTH_TOTP_INTRO="This feature allows you to use Google Authenticator, or a compatible application such as FreeOTP, for two factor authentication. In addition to your username and password you will also need to provide a six digit security code to be able to login to this site. The security code is rotated every 30 seconds. This provides extra protection against hackers logging in to your account even if they were able to get hold of your password." PLG_TWOFACTORAUTH_TOTP_METHOD_TITLE="Google Authenticator" PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION="Enable two factor authentication" -PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY="

Joomla! comes with a built-in two factor authentication system. It secures your site login with a secondary secret code that's changing every 30 seconds. You can use your mobile device and the Google Authenticator app to produce that code.

By selecting the button below:

  • Joomla! will enable the two factor authentication plugins
  • Two Factor Authentication is going to be available for all users.
  • Each user can configure Two Factor Authentication in User Details.
  • You can always disable Two Factor Authentication plugin, or configure it for Backend usage only.
  • You will be taken to your user profile page where you can find more information on two factor authentication and enable it for your user account.
" +PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY="

Joomla! comes with a built-in two factor authentication system. It secures your site login with a secondary secret code that's changing every 30 seconds. You can use your mobile device and the Google Authenticator app to produce that code.

By selecting the button below:

  • Joomla! will enable the two factor authentication plugins
  • Two Factor Authentication is going to be available for all users.
  • Each user can configure Two Factor Authentication in User Details.
  • You can always disable Two Factor Authentication plugin, or configure it for Backend usage only.
  • You will be taken to your user profile page where you can find more information on two factor authentication and enable it for your user account.
" PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE="Two Factor Authentication is Available" PLG_TWOFACTORAUTH_TOTP_SECTION_ADMIN="Administrator (Backend)" PLG_TWOFACTORAUTH_TOTP_SECTION_BOTH="Both" @@ -16,12 +16,10 @@ PLG_TWOFACTORAUTH_TOTP_SECTION_LABEL="Site Section" PLG_TWOFACTORAUTH_TOTP_SECTION_SITE="Site (Frontend)" PLG_TWOFACTORAUTH_TOTP_STEP1_HEAD="Step 1 - Get Google Authenticator" PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1="Official Google Authenticator app for Android, iOS and BlackBerry" -; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw) -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" +PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" ; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw) PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2="Compatible clients for other devices and operating system (listed in Wikipedia)." -; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish) -PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation" -PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install Google Authenticator, or a compatible application such as FreeOTP, on your smartphone or desktop. Use one of the following:" +PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation" ; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish) +PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install Google Authenticator, or a compatible application such as FreeOTP, on your smartphone or desktop. Use one of the following:" PLG_TWOFACTORAUTH_TOTP_STEP1_WARN="Please remember to sync your device's clock with a time-server. Time drift in your device may cause an inability to log in to your site." PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT="Account" PLG_TWOFACTORAUTH_TOTP_STEP2_ALTTEXT="Alternatively, you can scan the following QR code in Google Authenticator." @@ -32,4 +30,4 @@ PLG_TWOFACTORAUTH_TOTP_STEP2_TEXT="You will need to enter the following informat PLG_TWOFACTORAUTH_TOTP_STEP3_HEAD="Step 3 - Activate Two Factor Authentication" PLG_TWOFACTORAUTH_TOTP_STEP3_SECURITYCODE="Security Code" PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT="To verify that everything is set up properly, please enter the security code displayed in Google Authenticator in the field below. Afterwards, please save your user profile. If the code is correct, the Two Factor Authentication feature will be enabled." -PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using Google Authenticator or other compatible time-based One Time Password generators such as FreeOTP. To use two factor authentication please edit the user profile and enable two factor authentication." +PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using Google Authenticator or other compatible time-based One Time Password generators such as FreeOTP. To use two factor authentication please edit the user profile and enable two factor authentication." diff --git a/administrator/language/en-GB/plg_user_profile.ini b/administrator/language/en-GB/plg_user_profile.ini index 78be52f03ef..0b3e2ed7cb4 100644 --- a/administrator/language/en-GB/plg_user_profile.ini +++ b/administrator/language/en-GB/plg_user_profile.ini @@ -26,6 +26,5 @@ PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL="Website" 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, eg 2019-01-27." +PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE' PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin" diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 56bea1f3337..4ee889b8551 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,8 +6,8 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.0.0-rc4-dev - June 2021 + 4.0.0-rc7-dev + August 2021 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 0da59c726b8..adb25019e04 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 4.0.0.1 - June 2021 + August 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml index 0ce6a78436b..be68ee23936 100644 --- a/administrator/modules/mod_custom/mod_custom.xml +++ b/administrator/modules/mod_custom/mod_custom.xml @@ -17,8 +17,8 @@ tmpl - en-GB.mod_custom.ini - en-GB.mod_custom.sys.ini + language/en-GB/mod_custom.ini + language/en-GB/mod_custom.sys.ini diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml index 34eb537adce..612cd20b9c9 100644 --- a/administrator/modules/mod_feed/mod_feed.xml +++ b/administrator/modules/mod_feed/mod_feed.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_feed.ini - en-GB.mod_feed.sys.ini + language/en-GB/mod_feed.ini + language/en-GB/mod_feed.sys.ini diff --git a/administrator/modules/mod_frontend/mod_frontend.xml b/administrator/modules/mod_frontend/mod_frontend.xml index 9efcb19210c..1bcb3571d54 100644 --- a/administrator/modules/mod_frontend/mod_frontend.xml +++ b/administrator/modules/mod_frontend/mod_frontend.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_frontend.ini - en-GB.mod_frontend.sys.ini + language/en-GB/mod_frontend.ini + language/en-GB/mod_frontend.sys.ini diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml index 9d57085ef68..f2cb71e3c4f 100644 --- a/administrator/modules/mod_latest/mod_latest.xml +++ b/administrator/modules/mod_latest/mod_latest.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_latest.ini - en-GB.mod_latest.sys.ini + language/en-GB/mod_latest.ini + language/en-GB/mod_latest.sys.ini diff --git a/administrator/modules/mod_latestactions/mod_latestactions.xml b/administrator/modules/mod_latestactions/mod_latestactions.xml index e6b8e1c069f..f369e4d6171 100644 --- a/administrator/modules/mod_latestactions/mod_latestactions.xml +++ b/administrator/modules/mod_latestactions/mod_latestactions.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_latestactions.ini - en-GB.mod_latestactions.sys.ini + language/en-GB/mod_latestactions.ini + language/en-GB/mod_latestactions.sys.ini diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml index e9b63cdfe69..60dee8b2e70 100644 --- a/administrator/modules/mod_logged/mod_logged.xml +++ b/administrator/modules/mod_logged/mod_logged.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_logged.ini - en-GB.mod_logged.sys.ini + language/en-GB/mod_logged.ini + language/en-GB/mod_logged.sys.ini diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml index 746a8065adf..7327e2b4dcb 100644 --- a/administrator/modules/mod_login/mod_login.xml +++ b/administrator/modules/mod_login/mod_login.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_login.ini - en-GB.mod_login.sys.ini + language/en-GB/mod_login.ini + language/en-GB/mod_login.sys.ini diff --git a/administrator/modules/mod_loginsupport/mod_loginsupport.xml b/administrator/modules/mod_loginsupport/mod_loginsupport.xml index 4cffdac1a3d..92db7a1e93a 100644 --- a/administrator/modules/mod_loginsupport/mod_loginsupport.xml +++ b/administrator/modules/mod_loginsupport/mod_loginsupport.xml @@ -15,8 +15,8 @@ tmpl - en-GB.mod_loginsupport.ini - en-GB.mod_loginsupport.sys.ini + language/en-GB/mod_loginsupport.ini + language/en-GB/mod_loginsupport.sys.ini diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml index 25ce5af4c2e..65662980f7f 100644 --- a/administrator/modules/mod_menu/mod_menu.xml +++ b/administrator/modules/mod_menu/mod_menu.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_menu.ini - en-GB.mod_menu.sys.ini + language/en-GB/mod_menu.ini + language/en-GB/mod_menu.sys.ini diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php index c29d35faf8e..766cb7e1d3a 100644 --- a/administrator/modules/mod_menu/src/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php @@ -310,6 +310,19 @@ protected function preprocess($parent) } } + $uri = new Uri($item->link); + $query = $uri->getQuery(true); + + /** + * If component is passed in the link via option variable, we set $item->element to this value for further + * processing. It is needed for links from menu items of third party extensions link to Joomla! core + * components like com_categories, com_fields... + */ + if ($option = $uri->getVar('option')) + { + $item->element = $option; + } + // Exclude item if is not enabled if ($item->element && !ComponentHelper::isEnabled($item->element)) { @@ -340,13 +353,10 @@ protected function preprocess($parent) if ($item->element === 'com_categories') { - parse_str($item->link, $query); $assetName = $query['extension'] ?? 'com_content'; } elseif ($item->element === 'com_fields') { - parse_str($item->link, $query); - // Only display Fields menus when enabled in the component $createFields = null; @@ -381,8 +391,6 @@ protected function preprocess($parent) } elseif ($item->element === 'com_workflow') { - parse_str($item->link, $query); - // Only display Workflow menus when enabled in the component $workflow = null; @@ -412,10 +420,13 @@ protected function preprocess($parent) $parent->removeChild($item); continue; } + elseif (($item->link === 'index.php?option=com_installer&view=install' || $item->link === 'index.php?option=com_installer&view=languages') + && !$user->authorise('core.admin')) + { + continue; + } elseif ($item->element === 'com_admin') { - parse_str($item->link, $query); - if (isset($query['view']) && $query['view'] === 'sysinfo' && !$user->authorise('core.admin')) { $parent->removeChild($item); diff --git a/administrator/modules/mod_messages/mod_messages.xml b/administrator/modules/mod_messages/mod_messages.xml index 72cfbe4ed5e..73f89b991ae 100644 --- a/administrator/modules/mod_messages/mod_messages.xml +++ b/administrator/modules/mod_messages/mod_messages.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_messages.ini - en-GB.mod_messages.sys.ini + language/en-GB/mod_messages.ini + language/en-GB/mod_messages.sys.ini diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml index 26c9606fdaa..ed5636a33b4 100644 --- a/administrator/modules/mod_popular/mod_popular.xml +++ b/administrator/modules/mod_popular/mod_popular.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_popular.ini - en-GB.mod_popular.sys.ini + language/en-GB/mod_popular.ini + language/en-GB/mod_popular.sys.ini diff --git a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php index bf371892e03..1812161ddf7 100644 --- a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php +++ b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php @@ -31,6 +31,6 @@ $joomlaFilesExtensionId = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id; // Load the com_postinstall language file -$app->getLanguage()->load('com_postinstall', JPATH_ADMINISTRATOR, 'en-GB', true); +$app->getLanguage()->load('com_postinstall', JPATH_ADMINISTRATOR); require ModuleHelper::getLayoutPath('mod_post_installation_messages', $params->get('layout', 'default')); diff --git a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml index beafdee62dc..bd80169e81c 100644 --- a/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml +++ b/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_post_installation_messages.ini - en-GB.mod_post_installation_messages.sys.ini + language/en-GB/mod_post_installation_messages.ini + language/en-GB/mod_post_installation_messages.sys.ini diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml index b892f40c126..4c25675ec83 100644 --- a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml +++ b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_privacy_dashboard.ini - en-GB.mod_privacy_dashboard.sys.ini + language/en-GB/mod_privacy_dashboard.ini + language/en-GB/mod_privacy_dashboard.sys.ini diff --git a/administrator/modules/mod_privacy_status/mod_privacy_status.xml b/administrator/modules/mod_privacy_status/mod_privacy_status.xml index 7197106d04d..bffd960ec31 100644 --- a/administrator/modules/mod_privacy_status/mod_privacy_status.xml +++ b/administrator/modules/mod_privacy_status/mod_privacy_status.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_privacy_status.ini - en-GB.mod_privacy_status.sys.ini + language/en-GB/mod_privacy_status.ini + language/en-GB/mod_privacy_status.sys.ini diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml index 4ff0b8f8dee..98722a9d5ce 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.xml +++ b/administrator/modules/mod_quickicon/mod_quickicon.xml @@ -17,8 +17,8 @@ tmpl - en-GB.mod_quickicon.ini - en-GB.mod_quickicon.sys.ini + language/en-GB/mod_quickicon.ini + language/en-GB/mod_quickicon.sys.ini diff --git a/administrator/modules/mod_sampledata/mod_sampledata.xml b/administrator/modules/mod_sampledata/mod_sampledata.xml index 0e4f52bf9ee..f87b2520e54 100644 --- a/administrator/modules/mod_sampledata/mod_sampledata.xml +++ b/administrator/modules/mod_sampledata/mod_sampledata.xml @@ -19,8 +19,8 @@ js - en-GB.mod_sampledata.ini - en-GB.mod_sampledata.sys.ini + language/en-GB/mod_sampledata.ini + language/en-GB/mod_sampledata.sys.ini diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml index 6d84220b3e5..4fcf451ef6a 100644 --- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml +++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_stats.ini - en-GB.mod_stats.sys.ini + language/en-GB/mod_stats.ini + language/en-GB/mod_stats.sys.ini diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml index 9ebe95ee1e8..c7025c5dab0 100644 --- a/administrator/modules/mod_submenu/mod_submenu.xml +++ b/administrator/modules/mod_submenu/mod_submenu.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_submenu.ini - en-GB.mod_submenu.sys.ini + language/en-GB/mod_submenu.ini + language/en-GB/mod_submenu.sys.ini diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index e2b26fc9cff..87c0a9e8779 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -171,6 +171,11 @@ public static function preprocess($parent) $parent->removeChild($item); continue; } + elseif (($item->link === 'index.php?option=com_installer&view=install' || $item->link === 'index.php?option=com_installer&view=languages') + && !$user->authorise('core.admin')) + { + continue; + } elseif ($item->element === 'com_admin') { parse_str($item->link, $query); diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml index e5411b86487..4b930eb58db 100644 --- a/administrator/modules/mod_title/mod_title.xml +++ b/administrator/modules/mod_title/mod_title.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_title.ini - en-GB.mod_title.sys.ini + language/en-GB/mod_title.ini + language/en-GB/mod_title.sys.ini diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml index 213412c5206..6e3886b05c4 100644 --- a/administrator/modules/mod_toolbar/mod_toolbar.xml +++ b/administrator/modules/mod_toolbar/mod_toolbar.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_toolbar.ini - en-GB.mod_toolbar.sys.ini + language/en-GB/mod_toolbar.ini + language/en-GB/mod_toolbar.sys.ini diff --git a/administrator/modules/mod_user/mod_user.xml b/administrator/modules/mod_user/mod_user.xml index a27ee4eab0e..777adce619e 100644 --- a/administrator/modules/mod_user/mod_user.xml +++ b/administrator/modules/mod_user/mod_user.xml @@ -14,8 +14,8 @@ tmpl - en-GB.mod_user.ini - en-GB.mod_user.sys.ini + language/en-GB/mod_user.ini + language/en-GB/mod_user.sys.ini diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php index 2cc1300590d..2913982b05b 100644 --- a/administrator/templates/atum/component.php +++ b/administrator/templates/atum/component.php @@ -24,11 +24,11 @@ ->useStyle('template.user') ->addInlineStyle(':root { --hue: ' . $matches[1] . '; - --atum-bg-light: ' . $this->params->get('bg-light', '--atum-bg-light') . '; - --atum-text-dark: ' . $this->params->get('text-dark', '--atum-text-dark') . '; - --atum-text-light: ' . $this->params->get('text-light', '--atum-text-light') . '; - --atum-link-color: ' . $this->params->get('link-color', '--atum-link-color') . '; - --atum-special-color: ' . $this->params->get('special-color', '--atum-special-color') . '; + --template-bg-light: ' . $this->params->get('bg-light', '--template-bg-light') . '; + --template-text-dark: ' . $this->params->get('text-dark', '--template-text-dark') . '; + --template-text-light: ' . $this->params->get('text-light', '--template-text-light') . '; + --template-link-color: ' . $this->params->get('link-color', '--template-link-color') . '; + --template-special-color: ' . $this->params->get('special-color', '--template-special-color') . '; }'); // No template.js for modals diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index 5d431f988b6..2c2ec0ebcbf 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -58,11 +58,11 @@ ->useStyle('template.user') ->addInlineStyle(':root { --hue: ' . $matches[1] . '; - --atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; - --atum-text-dark: ' . $this->params->get('text-dark', '#495057') . '; - --atum-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; - --atum-special-color: ' . $this->params->get('special-color', '#001B4C') . '; + --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; + --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; + --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; + --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); // Override 'template.active' asset to set correct ltr/rtl dependency diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index 1a24a0d1cf8..7bec7f8c3b7 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -62,11 +62,11 @@ ->useStyle('template.user') ->addInlineStyle(':root { --hue: ' . $matches[1] . '; - --atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; - --atum-text-dark: ' . $this->params->get('text-dark', '#495057') . '; - --atum-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; - --atum-special-color: ' . $this->params->get('special-color', '#001B4C') . '; + --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; + --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; + --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; + --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); // Override 'template.active' asset to set correct ltr/rtl dependency diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php index 99f2f9c4f95..b73e693fe63 100644 --- a/administrator/templates/atum/html/layouts/chromes/body.php +++ b/administrator/templates/atum/html/layouts/chromes/body.php @@ -46,7 +46,7 @@ isRtl() ? 'start' : 'end'; ?>
diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php index c51dad472bf..4967bb99564 100644 --- a/administrator/templates/atum/html/layouts/chromes/well.php +++ b/administrator/templates/atum/html/layouts/chromes/well.php @@ -51,7 +51,7 @@ isRtl() ? 'start' : 'end'; ?>
diff --git a/administrator/templates/atum/html/layouts/status.php b/administrator/templates/atum/html/layouts/status.php index aa0bffc9cfc..41a28e95310 100644 --- a/administrator/templates/atum/html/layouts/status.php +++ b/administrator/templates/atum/html/layouts/status.php @@ -52,7 +52,7 @@ echo '
' . $mod . '
'; } ?> - diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index a66a274e16a..fdf0cd1fd6a 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -62,11 +62,11 @@ ->useStyle('template.user') ->addInlineStyle(':root { --hue: ' . $matches[1] . '; - --atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; - --atum-text-dark: ' . $this->params->get('text-dark', '#495057') . '; - --atum-text-light: ' . $this->params->get('text-light', '#ffffff') . '; - --atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; - --atum-special-color: ' . $this->params->get('special-color', '#001B4C') . '; + --template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . '; + --template-text-dark: ' . $this->params->get('text-dark', '#495057') . '; + --template-text-light: ' . $this->params->get('text-light', '#ffffff') . '; + --template-link-color: ' . $this->params->get('link-color', '#2a69b8') . '; + --template-special-color: ' . $this->params->get('special-color', '#001B4C') . '; }'); // Override 'template.active' asset to set correct ltr/rtl dependency diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index a8d6ff1e49c..290a3c94c62 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -73,31 +73,31 @@ $colors: ( focus: $focuscolor, focus-shadow: $focusshadow, toggle-color: $white, //used in sidebar - atum-sidebar-bg: var(--atum-bg-dark-80), - atum-sidebar-font-color: $white, - atum-sidebar-link-color: $white, - atum-bg-light: #f0f4fb, //light background color, frontend dashboard background - atum-text-light: $white, - atum-special-color: $dark-blue, - atum-link-color: $light-blue, - atum-link-hover-color: darken($light-blue, 20%), - atum-contrast: $light-blue, - atum-bg-dark: hsl(var(--hue), 40%, 20%), - atum-bg-dark-3: hsl(var(--hue), 40%, 97%), - atum-bg-dark-5: hsl(var(--hue), 40%, 95%), - atum-bg-dark-7: hsl(var(--hue), 40%, 93%), - atum-bg-dark-10: hsl(var(--hue), 40%, 90%), - atum-bg-dark-15: hsl(var(--hue), 40%, 85%), - atum-bg-dark-20: hsl(var(--hue), 40%, 80%), - atum-bg-dark-30: hsl(var(--hue), 40%, 70%), - atum-bg-dark-40: hsl(var(--hue), 40%, 60%), - atum-bg-dark-50: hsl(var(--hue), 40%, 50%), - atum-bg-dark-60: hsl(var(--hue), 40%, 40%), - atum-bg-dark-65: hsl(var(--hue), 40%, 35%), - atum-bg-dark-70: hsl(var(--hue), 40%, 30%), - atum-bg-dark-75: hsl(var(--hue), 40%, 25%), - atum-bg-dark-80: hsl(var(--hue), 40%, 20%), - atum-bg-dark-90: hsl(var(--hue), 40%, 10%) + template-sidebar-bg: var(--template-bg-dark-80), + template-sidebar-font-color: $white, + template-sidebar-link-color: $white, + template-bg-light: #f0f4fb, //light background color, frontend dashboard background + template-text-light: $white, + template-special-color: $dark-blue, + template-link-color: $light-blue, + template-link-hover-color: darken($light-blue, 20%), + template-contrast: $light-blue, + template-bg-dark: hsl(var(--hue), 40%, 20%), + template-bg-dark-3: hsl(var(--hue), 40%, 97%), + template-bg-dark-5: hsl(var(--hue), 40%, 95%), + template-bg-dark-7: hsl(var(--hue), 40%, 93%), + template-bg-dark-10: hsl(var(--hue), 40%, 90%), + template-bg-dark-15: hsl(var(--hue), 40%, 85%), + template-bg-dark-20: hsl(var(--hue), 40%, 80%), + template-bg-dark-30: hsl(var(--hue), 40%, 70%), + template-bg-dark-40: hsl(var(--hue), 40%, 60%), + template-bg-dark-50: hsl(var(--hue), 40%, 50%), + template-bg-dark-60: hsl(var(--hue), 40%, 40%), + template-bg-dark-65: hsl(var(--hue), 40%, 35%), + template-bg-dark-70: hsl(var(--hue), 40%, 30%), + template-bg-dark-75: hsl(var(--hue), 40%, 25%), + template-bg-dark-80: hsl(var(--hue), 40%, 20%), + template-bg-dark-90: hsl(var(--hue), 40%, 10%) ); // Alerts @@ -105,7 +105,7 @@ $alert-border-level: 0; $alert-color-level: 0; // Global -$atum-box-shadow: 0 2px 10px -8px var(--atum-bg-dark-50); +$atum-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); $enable-rounded: true; $input-box-shadow: inset 0 0 0 .1rem #e9e9e9; $input-btn-padding-y: .5rem; @@ -133,7 +133,7 @@ $h3-font-size: 1.25rem; $h4-font-size: 1rem; $h5-font-size: .9286rem; $h6-font-size: .8571rem; -$headings-color: var(--atum-bg-dark); +$headings-color: var(--template-bg-dark); $font-size-sm: .8rem; $font-size-vsm: .6rem; $display1-size: 1rem; @@ -159,7 +159,7 @@ $extrabold-weight: 800; $black-weight: 900; // Text -$body-color: var(--atum-text-dark); //only used in bootstrap, please use --atum-color-dark +$body-color: var(--template-text-dark); //only used in bootstrap, please use --template-color-dark // Tables $table-bg: var(--white); @@ -172,7 +172,7 @@ $table-group-separator-color: $gray-300; // Dropdowns $dropdown-padding-y: 0; $dropdown-box-shadow: 0 1px 1px rgba($black, .15); -$dropdown-link-hover-color: var(--atum-text-dark); +$dropdown-link-hover-color: var(--template-text-dark); $dropdown-border-width: 1px; $dropdown-item-padding-y: .5rem; $dropdown-item-padding-x: .75rem; @@ -187,9 +187,9 @@ $state-success-text: $success; $state-success-bg: lighten($success, 58%); $state-success-border: hsl(var(--hue),50%,93%); -$state-info-text: var(--atum-bg-dark-70); +$state-info-text: var(--template-bg-dark-70); $state-info-bg: var(--white); -$state-info-border: var(--atum-bg-dark-70); +$state-info-border: var(--template-bg-dark-70); $state-warning-text: darken($warning, 24%); $state-warning-bg: lighten($warning, 44%); @@ -223,7 +223,7 @@ $info-txt: $white; // Input Group $input-group-addon-color: var(--white); $input-group-addon-bg: $base-color; -$input-group-addon-border-color: var(--atum-bg-dark); +$input-group-addon-border-color: var(--template-bg-dark); // Treeselect $treeselect-line-height: 2.2rem; @@ -241,7 +241,7 @@ $input-btn-submenu-icon-distance: 1rem; // Custom form $form-select-indicator-padding: 3rem; -$form-select-bg: var(--atum-bg-light); +$form-select-bg: var(--template-bg-light); $form-select-bg-size: 116rem; $form-select-indicator: url("../images/select-bg.svg"); $form-select-indicator-rtl: url("../images/select-bg-rtl.svg"); @@ -256,7 +256,7 @@ $form-file-button-color: var(--white); //input $input-padding: .5rem 1rem; -$input-border: solid 1px var(--atum-bg-dark-20); +$input-border: solid 1px var(--template-bg-dark-20); // Modals $modal-header-height: 2.875rem; @@ -277,8 +277,8 @@ $grid-gutter-width-s: 15px; $breadcrumb-bg: var(--white); // Links -$link-color: var(--atum-link-color); -$link-hover-color: var(--atum-link-hover-color); +$link-color: var(--template-link-color); +$link-hover-color: var(--template-link-hover-color); $link-decoration: none; // Z-Index list diff --git a/administrator/templates/atum/scss/blocks/_alerts.scss b/administrator/templates/atum/scss/blocks/_alerts.scss index 2b3e95b3dd6..6ca0e02265b 100644 --- a/administrator/templates/atum/scss/blocks/_alerts.scss +++ b/administrator/templates/atum/scss/blocks/_alerts.scss @@ -7,9 +7,9 @@ border-radius: $border-radius-sm; &.alert-info { - color: var(--atum-bg-dark); - background-color: var(--atum-bg-dark-10); - border: 1px solid var(--atum-bg-dark-20); + color: var(--template-bg-dark); + background-color: var(--template-bg-dark-10); + border: 1px solid var(--template-bg-dark-20); } &.alert-warning { diff --git a/administrator/templates/atum/scss/blocks/_form.scss b/administrator/templates/atum/scss/blocks/_form.scss index 4e0f3e37cf0..a84955713db 100644 --- a/administrator/templates/atum/scss/blocks/_form.scss +++ b/administrator/templates/atum/scss/blocks/_form.scss @@ -133,21 +133,6 @@ td .form-control { bottom: auto; } -.input-group-append { - overflow: hidden; - transform: translate3d(0, 0, 0); - - [dir=ltr] & { - border-top-right-radius: $border-radius; - border-bottom-right-radius: $border-radius; - } - - [dir=rtl] & { - border-top-left-radius: $border-radius; - border-bottom-left-radius: $border-radius; - } -} - .input-group > .form-control[readonly] { margin-right: 1px; } diff --git a/administrator/templates/atum/scss/blocks/_global.scss b/administrator/templates/atum/scss/blocks/_global.scss index 4f2e6f81c81..62cc4d3e089 100644 --- a/administrator/templates/atum/scss/blocks/_global.scss +++ b/administrator/templates/atum/scss/blocks/_global.scss @@ -17,7 +17,7 @@ body { text-align: start; &.admin { - background-color: var(--atum-bg-dark-5); + background-color: var(--template-bg-dark-5); } &.monochrome { @@ -30,7 +30,7 @@ body { width: 100%; height: 100%; content: ""; - background: var(--atum-bg-dark-5); + background: var(--template-bg-dark-5); } } @@ -110,19 +110,19 @@ textarea { label, caption { font-size: $label-font-size; + text-align: start; } .logo { img path { - fill: var(--atum-text-dark); + fill: var(--template-text-dark); } } .container-main, .system-debug { padding-bottom: 50px; - overflow: auto; } body .container-main { @@ -147,7 +147,7 @@ body .container-main { body:not(.contentpane) .main-card { background: $white; border-radius: $border-radius; - box-shadow: 0 2px 10px -8px var(--atum-bg-dark-50); + box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); } .row-selected { @@ -198,7 +198,7 @@ a[target="_blank"]::before { } .text-muted { - color: var(--atum-text-dark) !important; + color: var(--template-text-dark) !important; opacity: .7; } @@ -232,12 +232,12 @@ a[target="_blank"]::before { details { padding: .5rem 1rem; margin: 0 0 2rem; - background: var(--atum-bg-dark-3); - border: 1px solid var(--atum-bg-dark-10); + background: var(--template-bg-dark-3); + border: 1px solid var(--template-bg-dark-10); border-radius: $border-radius; summary { - color: var(--atum-link-color); + color: var(--template-link-color); ~ * { margin-top: 1rem; @@ -262,7 +262,7 @@ meter { --gutter-x: 4rem; > * + * { - border-left: 1px solid var(--atum-bg-dark-10); + border-inline-start: 1px solid var(--template-bg-dark-10); } } } diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index 434ca1dc059..ba75e3414ea 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -2,7 +2,7 @@ .header { z-index: $zindex-header; color: $white; - background: var(--atum-bg-dark); + background: var(--template-bg-dark); &-inside { display: flex; @@ -24,7 +24,7 @@ width: $sidebar-width; height: 100%; padding: 12px 5px; - background-color: var(--atum-bg-dark-70); + background-color: var(--template-bg-dark-70); transition: all .3s ease-in-out; &.small { @@ -42,6 +42,8 @@ display: inline-block; width: 20px; height: 20px; + object-fit: contain; + object-position: center center; } } } @@ -51,6 +53,12 @@ width: 150px; height: 30px; margin: 0 .35rem; + object-fit: contain; + object-position: left center; + + [dir=rtl] & { + object-position: right center; + } &.logo-collapsed { display: none; @@ -80,21 +88,21 @@ .dropdown-item { padding: .82rem .75rem; color: $white; - background-color: var(--atum-bg-dark-70); + background-color: var(--template-bg-dark-70); > span { margin-inline-end: .5rem; } &:hover { - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); } } .dropdown-header { padding: .75rem; font-size: inherit; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); } } @@ -125,7 +133,7 @@ align-items: center; line-height: 1rem; color: $white; - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); border-radius: 22px; padding-inline-end: 4px; @@ -140,7 +148,7 @@ } &:not(.no-link):not(.joomlaversion):hover { - background-color: var(--atum-bg-dark-50); + background-color: var(--template-bg-dark-50); } &.joomlaversion { @@ -163,7 +171,7 @@ height: 28px; margin: 4px; color: $white; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); border-radius: 16px; } @@ -213,7 +221,7 @@ width: 100%; padding: 10px 0; margin: 0; - background: var(--atum-bg-dark); + background: var(--template-bg-dark); .#{$jicon-css-prefix}-angle-down, .#{$fa-css-prefix}-angle-down { diff --git a/administrator/templates/atum/scss/blocks/_icons.scss b/administrator/templates/atum/scss/blocks/_icons.scss index df39bf53390..671ac513c78 100644 --- a/administrator/templates/atum/scss/blocks/_icons.scss +++ b/administrator/templates/atum/scss/blocks/_icons.scss @@ -41,7 +41,7 @@ .#{$jicon-css-prefix}-archive, .#{$jicon-css-prefix}-folder, .#{$fa-css-prefix}-folder { - color: var(--atum-text-dark); + color: var(--template-text-dark); border-color: $gray-700; } @@ -52,7 +52,7 @@ height: auto; font-size: 1.2rem; line-height: 1rem; - color: var(--atum-text-dark); + color: var(--template-text-dark); border: 0; } @@ -74,15 +74,13 @@ // WebAuthn .plg_system_webauthn_login_button svg { - [dir=ltr] & { - margin-right: 2px; - } - - [dir=rtl] & { - margin-left: 2px; - } + margin-inline-end: 2px; } .plg_system_webauthn_login_button svg path { fill: var(--white); } + +.badge > span { + margin-inline-end: .5rem; +} diff --git a/administrator/templates/atum/scss/blocks/_layout.scss b/administrator/templates/atum/scss/blocks/_layout.scss index 70ba25bbd68..fc3319a7a0e 100644 --- a/administrator/templates/atum/scss/blocks/_layout.scss +++ b/administrator/templates/atum/scss/blocks/_layout.scss @@ -2,15 +2,15 @@ width: 100%; padding: 1vw 2vw; margin-bottom: 1rem; - color: var(--atum-text-dark); - border: 1px solid var(--atum-bg-dark-20); + color: var(--template-text-dark); + border: 1px solid var(--template-bg-dark-20); > legend { float: none; width: auto; padding: 0 1rem; font-weight: $font-weight-bold; - color: var(--atum-text-dark); + color: var(--template-text-dark); background-color: $white; } } diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss index a11f580af8f..08a068b3077 100644 --- a/administrator/templates/atum/scss/blocks/_login.scss +++ b/administrator/templates/atum/scss/blocks/_login.scss @@ -27,10 +27,10 @@ max-width: 25rem; padding: 30px; margin: 1rem; - color: var(--atum-text-dark); + color: var(--template-text-dark); background: var(--white); border-radius: 10px; - box-shadow: 0 4px 20px -10px var(--atum-bg-dark-50); + box-shadow: 0 4px 20px -10px var(--template-bg-dark-50); @include media-breakpoint-down(lg) { margin-bottom: 3rem; @@ -50,7 +50,7 @@ background-size: 4.4rem 2.4rem; path { - fill: var(--atum-bg-dark); + fill: var(--template-bg-dark); } } @@ -77,7 +77,7 @@ &.text-end { font-size: ($font-size-base * .75); - color: var(--atum-special-color); + color: var(--template-special-color); } } } @@ -114,7 +114,7 @@ input:focus, select:focus { background: $white; - box-shadow: inset 0 0 1px 1px var(--atum-contrast); + box-shadow: inset 0 0 1px 1px var(--template-contrast); } h1 { @@ -125,7 +125,7 @@ h2 { font-weight: $font-weight-normal; - color: var(--atum-bg-dark-10); + color: var(--template-bg-dark-10); } .btn { @@ -149,7 +149,7 @@ display: flex; flex-direction: column; max-width: none; - background-color: var(--atum-sidebar-bg); + background-color: var(--template-sidebar-bg); @include media-breakpoint-down(md) { order: 2; @@ -174,7 +174,7 @@ align-self: flex-end; width: 100%; font-size: ($font-size-base * .875); - color: var(--atum-text-light); + color: var(--template-text-light); text-align: center; .card { @@ -220,7 +220,7 @@ } @include media-breakpoint-down(md) { - background: var(--atum-bg-dark-70); + background: var(--template-bg-dark-70); } } } @@ -247,7 +247,7 @@ label { .com_login .sidebar-wrapper .main-brand a, .com_login .sidebar-wrapper #sidebar, .com_login .sidebar-wrapper #sidebar a { - color: var(--atum-text-light); + color: var(--template-text-light); } .view-login { diff --git a/administrator/templates/atum/scss/blocks/_modals.scss b/administrator/templates/atum/scss/blocks/_modals.scss index 2eb9c42fde1..adb0a07067a 100755 --- a/administrator/templates/atum/scss/blocks/_modals.scss +++ b/administrator/templates/atum/scss/blocks/_modals.scss @@ -4,10 +4,10 @@ .btn { padding: 0 22px; - margin-right: .5rem; + margin-inline-end: .5rem; font-size: 1rem; line-height: 2.3rem; - color: var(--atum-text-dark); + color: var(--template-text-dark); background: var(--white); border-color: var(--whiteoffset); box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, .25); @@ -17,9 +17,9 @@ .btn-success:not([href]), .btn-danger:not([href]), .btn-secondary:not([href]) { - color: var(--atum-text-dark); + color: var(--template-text-dark); background: var(--white); - border: 1px solid var(--atum-text-dark); + border: 1px solid var(--template-text-dark); } .btn-primary:not([href]) { diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss index c63a759ddc7..2b34f021ca9 100644 --- a/administrator/templates/atum/scss/blocks/_quickicons.scss +++ b/administrator/templates/atum/scss/blocks/_quickicons.scss @@ -21,7 +21,7 @@ --text-color: hsl(var(--hue), 30%, 40%); --bg-color: hsl(var(--hue), 60%, 97%); --icon-color: hsl(var(--hue), 30%, 40%); - --bg-color-hvr: var(--atum-bg-dark); + --bg-color-hvr: var(--template-bg-dark); display: flex; flex-grow: 1; @@ -121,7 +121,7 @@ &:hover, &:focus, &:active { - background: var(--atum-bg-dark); + background: var(--template-bg-dark); * { color: $white; @@ -142,7 +142,10 @@ #content .menu-quicktask { position: absolute; - right: 1.25rem; + + [dir=ltr] & { + right: 1.25rem; + } [dir=rtl] & { left: 1.25rem; diff --git a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss index aad1b2790b7..e161f24c46b 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar-nav.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar-nav.scss @@ -15,26 +15,36 @@ display: block; padding: .25rem; font-weight: $font-weight-normal; - color: var(--atum-text-dark); + color: var(--template-text-dark); text-decoration: none; &::before { - margin-inline-end: .5rem; + margin-right: .5rem; font-family: "Font Awesome 5 Free"; font-weight: 900; content: "\f054"; [dir="rtl"] & { + margin-right: 0; + content: none; + } + } + + &::after { + [dir="rtl"] & { + margin-inline-end: .5rem; + font-family: "Font Awesome 5 Free"; + font-weight: 900; content: "\f053"; } } } &.item:hover, &.active { - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); a { - color: var(--atum-text-light); + color: var(--template-text-light); } } } diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss index 3be392e3994..01e92951dd6 100644 --- a/administrator/templates/atum/scss/blocks/_sidebar.scss +++ b/administrator/templates/atum/scss/blocks/_sidebar.scss @@ -4,8 +4,8 @@ z-index: $zindex-sidebar; min-height: calc(100vh - 69px); overflow: hidden; - background-color: var(--atum-sidebar-bg); - box-shadow: 0 0 20px -10px var(--atum-bg-dark-50); + background-color: var(--template-sidebar-bg); + box-shadow: 0 0 20px -10px var(--template-bg-dark-50); .sidebar-sticky { position: sticky; @@ -25,9 +25,9 @@ text-decoration: none; &:hover { - color: var(--atum-text-light); + color: var(--template-text-light); text-decoration: none; - background-color: var(--atum-bg-dark-65); + background-color: var(--template-bg-dark-65); } } @@ -69,7 +69,7 @@ } .sidebar-toggle { - background: var(--atum-bg-dark-60); + background: var(--template-bg-dark-60); a { color: $white; @@ -110,14 +110,14 @@ ul { width: 100%; padding: 0; - background-color: var(--atum-bg-dark-75); + background-color: var(--template-bg-dark-75); } .divider { height: 1px; margin: 0 0 0 48px; list-style: none; - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); } .menuitem-group { @@ -126,7 +126,7 @@ padding-inline-start: 3rem; .sidebar-item-title { - color: var(--atum-bg-dark-30); + color: var(--template-bg-dark-30); } } @@ -155,11 +155,11 @@ } a.mm-active { - background-color: var(--atum-bg-dark-70); + background-color: var(--template-bg-dark-70); } a.mm-active + .menu-quicktask { - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); } .mm-active > .has-arrow::after { @@ -185,7 +185,7 @@ .badge { align-self: center; margin: 0 .3rem .25rem; - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); } } @@ -222,8 +222,13 @@ padding: 0 1rem; white-space: nowrap; pointer-events: none; - background-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); border-radius: 0 $border-radius $border-radius 0; + [dir=rtl] & { + right: 100%; + left: unset; + border-radius: $border-radius 0 0 $border-radius; + } } .main-nav > li > ul { @@ -243,7 +248,7 @@ @include media-breakpoint-down(sm) { #menu-collapse { display: none; - background: var(--atum-bg-dark-50); + background: var(--template-bg-dark-50); } .toggler-burger { @@ -254,6 +259,7 @@ padding: 10px 15px; [dir="rtl"] & { + right: auto; left: 0; } diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss index 2e52a086b38..f176b259e05 100644 --- a/administrator/templates/atum/scss/blocks/_toolbar.scss +++ b/administrator/templates/atum/scss/blocks/_toolbar.scss @@ -7,10 +7,10 @@ width: auto; min-height: 43px; padding: 8px 1rem; - color: var(--atum-text-dark); //#0c192e; + color: var(--template-text-dark); //#0c192e; background: $white; - background-image: linear-gradient(var(--toolbar-bg), var(--atum-bg-dark-3)); - box-shadow: 0 2px 10px -8px var(--atum-bg-dark-50); + background-image: linear-gradient(var(--toolbar-bg), var(--template-bg-dark-3)); + box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); .row { margin-right: 0; @@ -40,12 +40,12 @@ } .btn { - --subhead-btn-accent: var(--atum-text-dark); + --subhead-btn-accent: var(--template-text-dark); padding: 0 1rem; margin: 5px 0; font-size: 1rem; line-height: $atum-toolbar-line-height; - color: var(--atum-text-dark); + color: var(--template-text-dark); background: $white; border-color: hsl(var(--hue),20%,80%); @@ -75,19 +75,19 @@ } &.btn-primary { - --subhead-btn-accent: var(--atum-link-color); + --subhead-btn-accent: var(--template-link-color); } &.btn-secondary { - --subhead-btn-accent: var(--atum-special-color); + --subhead-btn-accent: var(--template-special-color); } &.btn-info { - --subhead-btn-accent: var(--atum-bg-dark); + --subhead-btn-accent: var(--template-bg-dark); } &.btn-action { - --subhead-btn-accent: var(--atum-bg-dark); + --subhead-btn-accent: var(--template-bg-dark); display: flex; align-items: center; @@ -102,7 +102,7 @@ &[disabled], &.dropdown-toggle[disabled] { - --subhead-btn-accent: var(--atum-bg-dark); + --subhead-btn-accent: var(--template-bg-dark); background: rgba($gray-300, .8); opacity: .5; @@ -141,7 +141,7 @@ .contentpane & { margin: -15px -15px 0; background-image: none; - border-bottom: 1px solid var(--atum-bg-dark-7); + border-bottom: 1px solid var(--template-bg-dark-7); } } @@ -166,7 +166,7 @@ z-index: $zindex-alerts; padding: 7px 10px; margin: 5px; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); border-radius: 30px; .toggler-toolbar-icon::before { @@ -207,10 +207,3 @@ } } } - -// In Microsoft Edge, sticky positioning doesn't work when combined with dir "rtl" attribute -@supports (-ms-ime-align: auto) { - [dir=rtl] .subhead { - position: relative; - } -} diff --git a/administrator/templates/atum/scss/blocks/_treeselect.scss b/administrator/templates/atum/scss/blocks/_treeselect.scss index 68b4356c8b6..5022638cc2e 100644 --- a/administrator/templates/atum/scss/blocks/_treeselect.scss +++ b/administrator/templates/atum/scss/blocks/_treeselect.scss @@ -104,7 +104,7 @@ &::after { margin-left: 0; font-size: 1rem; - color: var(--atum-text-dark); + color: var(--template-text-dark); } } } diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss index 2b55f3e30c0..717e7648bb1 100644 --- a/administrator/templates/atum/scss/pages/_com_cpanel.scss +++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss @@ -18,11 +18,11 @@ &-help { &__header { - color: var(--atum-special-color); + color: var(--template-special-color); } a { - color: var(--atum-link-color); + color: var(--template-link-color); } h2 { @@ -41,7 +41,7 @@ } &__header { - color: var(--atum-special-color); + color: var(--template-special-color); span { margin-right: 5px; @@ -49,7 +49,7 @@ } a { - color: var(--atum-link-color); + color: var(--template-link-color); } h2 { @@ -82,16 +82,6 @@ .table { padding: 0; margin-bottom: unset; - - > .published { - padding-left: .9rem; - border-left: 5px solid var(--success); - } - - > .unpublished { - padding-left: .9rem; - border-left: 5px solid var(--danger); - } } } @@ -100,10 +90,11 @@ display: flex; padding: 1rem 1rem .75rem; font-weight: $font-weight-bold; - color: var(--atum-bg-dark); + color: var(--template-bg-dark); background: var(--card-bg); - > [class^="icon-"] { + > [class^="icon-"], + > img { margin-inline-end: .5rem; } } @@ -122,7 +113,7 @@ > * { padding: 0; margin-top: -10px; - color: var(--atum-bg-dark-70); + color: var(--template-bg-dark-70); } } @@ -148,7 +139,7 @@ &:active { color: #fff; text-decoration: none; - background: var(--atum-bg-dark); + background: var(--template-bg-dark); } > span { @@ -190,11 +181,11 @@ display: block; padding: .5rem; color: rgba(255, 255, 255, .9); - background: var(--atum-link-color); + background: var(--template-link-color); box-shadow: $atum-box-shadow; &:hover { - background: var(--atum-link-hover-color); + background: var(--template-link-hover-color); } } } diff --git a/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss b/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss new file mode 100644 index 00000000000..b6cbeff7d04 --- /dev/null +++ b/administrator/templates/atum/scss/pages/_com_joomlaupdate.scss @@ -0,0 +1,7 @@ +// com_joomlaupdate + +.com_joomlaupdate { + caption { + caption-side: top; + } +} diff --git a/administrator/templates/atum/scss/pages/_com_modules.scss b/administrator/templates/atum/scss/pages/_com_modules.scss index bf420368c8e..6336224871c 100644 --- a/administrator/templates/atum/scss/pages/_com_modules.scss +++ b/administrator/templates/atum/scss/pages/_com_modules.scss @@ -51,7 +51,7 @@ } .new-module:hover & { - background: var(--atum-bg-dark); + background: var(--template-bg-dark); span { color: $white; diff --git a/administrator/templates/atum/scss/pages/_com_tags.scss b/administrator/templates/atum/scss/pages/_com_tags.scss index da6a8fabb34..e4c0e26e441 100644 --- a/administrator/templates/atum/scss/pages/_com_tags.scss +++ b/administrator/templates/atum/scss/pages/_com_tags.scss @@ -13,10 +13,10 @@ } #fieldset-image-intro { - margin-right: 15px; + margin-inline-end: 15px; } #fieldset-image-fulltext { - margin-left: 15px; + margin-inline-start: 15px; } } diff --git a/administrator/templates/atum/scss/pages/_com_users.scss b/administrator/templates/atum/scss/pages/_com_users.scss index eacbc7744d4..644be4fbdb7 100644 --- a/administrator/templates/atum/scss/pages/_com_users.scss +++ b/administrator/templates/atum/scss/pages/_com_users.scss @@ -23,7 +23,7 @@ #fieldset-groups { .controls { - margin-left: 2rem; + margin-inline-start: 2rem; } } } diff --git a/administrator/templates/atum/scss/system/searchtools/searchtools.scss b/administrator/templates/atum/scss/system/searchtools/searchtools.scss index 3bd87b19d82..234646a15c2 100644 --- a/administrator/templates/atum/scss/system/searchtools/searchtools.scss +++ b/administrator/templates/atum/scss/system/searchtools/searchtools.scss @@ -27,7 +27,7 @@ } .js-stools-btn-clear { - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); border: 0; } } diff --git a/administrator/templates/atum/scss/template-rtl.scss b/administrator/templates/atum/scss/template-rtl.scss index 54d763927c0..4640c3c310d 100644 --- a/administrator/templates/atum/scss/template-rtl.scss +++ b/administrator/templates/atum/scss/template-rtl.scss @@ -21,19 +21,6 @@ ul { left: auto; } -.switcher { - float: right; -} - -// Header -.header { - .logo svg, - .logo img { - margin-right: .8rem; - margin-left: auto; - } -} - .menu-collapse { right: 0; left: auto; @@ -41,50 +28,6 @@ ul { margin-left: 0; } -// Status -.status { - margin-right: 250px; - margin-left: 0; - - .closed & { - margin-right: 50px; - margin-left: 0; - } -} - -.sidebar-wrapper[data-hidden="1"] ~ .status { - margin-right: 0; -} - -// com_cpanel -.com_cpanel { - .card { - .list-group { - > .published { - border-right: 5px solid var(--success); - border-left: 0; - } - - > .unpublished { - border-right: 5px solid var(--danger); - border-left: 0; - } - } - - .module-dropdown { - right: auto; - left: 0; - - > a { - border-right: 1px solid var(--border); - border-left: 0; - border-top-left-radius: $border-radius; - border-top-right-radius: 0; - } - } - } -} - .field-calendar { float: none; } @@ -123,27 +66,6 @@ ul { } } -// SearchTools rounded corners -.input-group > .input-group-prepend > .btn, -.input-group > .input-group-prepend > .input-group-text, -.input-group > .input-group-append:not(:last-child) > .btn, -.input-group > .input-group-append:not(:last-child) > .input-group-text, -.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { - @include border-start-radius($border-radius); - @include border-end-radius(0); -} - -.input-group > .input-group-append > .btn, -.input-group > .input-group-append > .input-group-text, -.input-group > .input-group-prepend:not(:first-child) > .btn, -.input-group > .input-group-prepend:not(:first-child) > .input-group-text, -.input-group > .input-group-prepend:first-child > .btn:not(:first-child), -.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) { - @include border-start-radius($border-radius); - @include border-end-radius(0); -} - .input-group > .form-control:not(:last-child), .input-group > .form-select:not(:last-child) { @include border-start-radius(0); diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss index 0d70e14a1ac..16a04939325 100644 --- a/administrator/templates/atum/scss/template.scss +++ b/administrator/templates/atum/scss/template.scss @@ -61,6 +61,7 @@ @import "pages/com_config"; @import "pages/com_content"; @import "pages/com_cpanel"; +@import "pages/com_joomlaupdate"; @import "pages/com_modules"; @import "pages/com_tags"; @import "pages/com_privacy"; diff --git a/administrator/templates/atum/scss/vendor/_tinymce.scss b/administrator/templates/atum/scss/vendor/_tinymce.scss index 72f042db558..12ecba08ed3 100644 --- a/administrator/templates/atum/scss/vendor/_tinymce.scss +++ b/administrator/templates/atum/scss/vendor/_tinymce.scss @@ -7,7 +7,7 @@ } .mce-tinymce { - border: 1px solid var(--atum-bg-dark); + border: 1px solid var(--template-bg-dark); } .mce-btn, @@ -55,6 +55,6 @@ .mce-statusbar .mce-container-body { background-color: $white; - border-top: var(--atum-bg-light) 1px solid; + border-top: var(--template-bg-light) 1px solid; } } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_buttons.scss b/administrator/templates/atum/scss/vendor/bootstrap/_buttons.scss index 42db79d8009..879115bbd03 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_buttons.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_buttons.scss @@ -14,31 +14,31 @@ } .btn-primary { - color: var(--atum-text-light); - background-color: var(--atum-bg-dark-60); - border-color: var(--atum-bg-dark-60); + color: var(--template-text-light); + background-color: var(--template-bg-dark-60); + border-color: var(--template-bg-dark-60); &:hover, &:focus, &:active { - background-color: var(--atum-bg-dark-70); - border-color: var(--atum-bg-dark-90); + background-color: var(--template-bg-dark-70); + border-color: var(--template-bg-dark-90); } &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active, .show > &.dropdown-toggle { - background-color: var(--atum-bg-dark); - border-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); + border-color: var(--template-bg-dark); } } .btn-secondary { - background-color: var(--atum-bg-dark-60); - border-color: var(--atum-bg-dark-60); + background-color: var(--template-bg-dark-60); + border-color: var(--template-bg-dark-60); } .input-group-text { - background-color: var(--atum-bg-dark); - border-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); + border-color: var(--template-bg-dark); } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_card.scss b/administrator/templates/atum/scss/vendor/bootstrap/_card.scss index 9877df6ed63..bc221074164 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_card.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_card.scss @@ -28,10 +28,11 @@ display: flex; padding: 1rem 1rem .75rem; font-weight: $font-weight-bold; - color: var(--atum-bg-dark); + color: var(--template-bg-dark); background: var(--card-bg); - > [class^="icon-"] { + > [class^="icon-"], + > img { margin-inline-end: .5rem; } } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss index d299bfab864..85b6bb2bf25 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_custom-forms.scss @@ -26,8 +26,8 @@ background-color: var(--white-offset); &:checked { - color: var(--atum-text-light); - background-color: var(--atum-bg-dark) !important; + color: var(--template-text-light); + background-color: var(--template-bg-dark) !important; } } } @@ -70,7 +70,7 @@ optgroup, option { - color: var(--atum-text-dark); + color: var(--template-text-dark); background-color: $white; } } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss index fbf40c5779a..ec397a86ee3 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss @@ -16,16 +16,17 @@ } .dropdown-item { + text-align: start; border-bottom: 1px solid rgba(0, 0, 0, .1); &:hover, &:focus { .btn-primary + .dropdown-menu & { - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); } .btn-secondary + .dropdown-menu & { - color: var(--atum-text-light); + color: var(--template-text-light); background-color: var(--secondary); } @@ -38,12 +39,12 @@ } .dropdown-status-group .dropdown-menu &:not(.disabled) { - color: var(--atum-text-light); - background-color: var(--atum-bg-dark); + color: var(--template-text-light); + background-color: var(--template-bg-dark); } .dropdown-save-group .dropdown-menu &:not(.disabled) { - color: var(--atum-text-light); + color: var(--template-text-light); background-color: var(--success); } } diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_form.scss b/administrator/templates/atum/scss/vendor/bootstrap/_form.scss index 57366a835cc..e97bf8715c5 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_form.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_form.scss @@ -48,7 +48,7 @@ legend { } [aria-grabbed="true"] { - box-shadow: 0 0 2px 1px var(--atum-bg-dark); + box-shadow: 0 0 2px 1px var(--template-bg-dark); } select.form-control { @@ -94,4 +94,3 @@ select.form-control { width: 100%; } } - diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss index fc17d10d3b4..7630646f7d7 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss @@ -17,7 +17,7 @@ } a { - color: var(--atum-link-color); + color: var(--template-link-color); &#sorted { font-weight: $medium-weight; @@ -79,6 +79,6 @@ } .j-main-container > & { - box-shadow: 0 2px 10px -8px var(--atum-bg-dark-50); + box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); } } diff --git a/administrator/templates/atum/scss/vendor/choicesjs/choices.scss b/administrator/templates/atum/scss/vendor/choicesjs/choices.scss index 26ba5ddf45a..f37e6df2e58 100644 --- a/administrator/templates/atum/scss/vendor/choicesjs/choices.scss +++ b/administrator/templates/atum/scss/vendor/choicesjs/choices.scss @@ -66,13 +66,13 @@ .choices__list--multiple .choices__item { position: relative; margin: 2px; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); margin-inline-end: 2px; border: 0; border-radius: $border-radius; &.is-highlighted { - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); opacity: .9; } } diff --git a/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index bd2679d6227..d04a43fb4ef 100644 --- a/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -10,9 +10,9 @@ min-width: 16rem; padding: 0; margin-bottom: 1rem; - color: var(--alert-accent-color, var(--atum-bg-dark)); + color: var(--alert-accent-color, var(--template-bg-dark)); background-color: var(--alert-bg-color, var(--white)); - border: 1px solid var(--alert-accent-color, var(--atum-bg-dark)); + border: 1px solid var(--alert-accent-color, var(--template-bg-dark)); border-radius: .25rem; transition: opacity .15s linear; @@ -22,7 +22,7 @@ justify-content: center; padding: .8rem; color: var(--white); - background: var(--alert-accent-color, var(--atum-bg-dark)); + background: var(--alert-accent-color, var(--template-bg-dark)); align-content: center; .message::before, @@ -70,7 +70,7 @@ } .alert-link { - color: var(--atum-link-color); + color: var(--template-link-color); text-decoration: underline; } @@ -125,7 +125,6 @@ [dir=rtl] & { right: auto; left: 0; - padding: .2rem .6rem; } } diff --git a/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss index a52725a8a47..c33f17cdb1a 100644 --- a/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss +++ b/administrator/templates/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss @@ -24,37 +24,39 @@ joomla-tab { margin-bottom: 0; } - &[orientation=horizontal]:not([view=accordion]) > ul { + &[orientation=horizontal]:not([view=accordion]) div[role=tablist] { width: 100%; margin-bottom: 0; } - > ul { + > div[role=tablist] { display: flex; flex-flow: wrap; padding: 0; white-space: nowrap; list-style: outside none none; - border-bottom: 1px solid var(--atum-bg-dark-10); + border-bottom: 1px solid var(--template-bg-dark-10); - li + li { - margin-left: 1px; - } - - a[role=tab] { + button[role=tab] { position: relative; box-sizing: border-box; display: block; padding: .6rem 1rem; color: var(--primary); text-decoration: none; + background-color: var(--white); border: 0; border-top: 0; border-right: 0; border-bottom: 0; box-shadow: none; - &[active], + &:focus-visible { + z-index: 1; + } + + &[aria-expanded=true], + &:focus, &:hover { border: 0; border-radius: 0; @@ -63,23 +65,52 @@ joomla-tab { &::after { position: absolute; right: 0; - bottom: -1px; + bottom: 0; left: 0; height: 3px; content: ""; - background-color: var(--atum-link-color); + background-color: var(--template-link-color); opacity: .8; } + + .text-muted { + color: var(--template-text-light) !important; + } } - &[active] { + &[aria-expanded=true] { font-weight: $font-weight-bold; - background: var(--atum-bg-dark-3); + background: var(--template-bg-dark-3); } + + .text-muted { + color: var(--template-text-dark) !important; + } + } + } + + > button[role=region] { + width: 100%; + padding: .7rem; + color: var(--template-text-light); + text-align: start; + background-color: var(--template-link-color); + border: 1px solid var(--template-text-light); + border-top: 0; + + &[aria-expanded=true], + &:hover, + &:focus { + color: var(--template-text-light); + background-color: var(--template-bg-dark); + } + + .text-muted { + color: var(--template-text-light) !important; } } - > section { + > joomla-tab-element { --gutter-x: 2rem; display: none; padding: 30px 2vw; @@ -98,7 +129,7 @@ joomla-tab { align-items: flex-start; width: 100%; - > ul { + > div[role=tablist] { flex: 0 0 25%; flex-direction: column; width: 100%; @@ -115,27 +146,36 @@ joomla-tab { flex: 0 0 100%; max-width: 100%; } + + button[role=tab] { + text-align: start; + &[aria-expanded=true] { + color: var(--template-text-light); + background-color: var(--template-bg-dark-60); + } + } } - li:last-of-type a[role=tab] { + button[role=tab]:last-of-type { border-bottom: 0; } - a[role=tab] { + button[role=tab] { position: relative; display: block; padding: .75em 1em; margin: -1px 0; - color: var(--atum-special-color); + color: var(--template-special-color); text-decoration: none; border-top: 1px solid transparent; border-bottom: 1px solid $gray-300; box-shadow: none; - &[active], + &[aria-expanded=true], + &:focus, &:hover { - color: var(--atum-text-light); - background-color: var(--atum-bg-dark-60); + color: var(--template-text-light); + background-color: var(--template-bg-dark-60); background-image: none; border-right: 0; box-shadow: none; @@ -146,16 +186,19 @@ joomla-tab { left: -1px; width: 5px; height: auto; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); } .text-muted { - color: var(--atum-text-light) !important; + color: var(--template-text-light) !important; } } + .text-muted { + color: var(--template-text-dark) !important; + } } - > section { + > joomla-tab-element { width: 100%; padding: $grid-gutter-width-s 0 $grid-gutter-width-s $grid-gutter-width-s; border: 0 none; @@ -164,49 +207,28 @@ joomla-tab { } &[view=accordion] { - > ul { - flex-direction: column; - white-space: normal; - background-color: var(--atum-bg-dark-60); - border-radius: 0; - box-shadow: 0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04); - } + flex-direction: column; + white-space: normal; + border-radius: 0; + box-shadow: 0 1px $white inset, 0 0 3px rgba(0, 0, 0, .04); - section { + joomla-tab-element { display: none; padding: 15px; &[active] { display: block; - flex: 0 0 100%; width: 100%; max-width: 100%; border-bottom: 1px solid $gray-300; } } - [active] { + [active], + [aria-expanded=true] { background-color: $white; } - a[role=tab] { - color: var(--atum-text-light); - background-color: var(--atum-link-color); - border: 1px solid var(--atum-text-light); - border-top: 0; - - &[active], - &:hover, - &:focus { - color: var(--atum-text-light); - background-color: var(--atum-bg-dark); - } - - .text-muted { - color: var(--atum-text-light) !important; - } - } - .col-md-6, .col-md-9, .col-md-3 { @@ -214,21 +236,22 @@ joomla-tab { } joomla-tab[view=accordion] { - > ul { + > div[role=tablist] { background-color: $white; } - a[role=tab] { + button[role=tab] { position: relative; display: block; padding: .75em 1em; - color: var(--atum-text-light); + color: var(--template-text-light); + text-align: start; text-decoration: none; border: 0; border-bottom: 1px solid $gray-300; box-shadow: none; - &[active]::after, + &[aria-expanded=true]::after, &:hover::after { position: absolute; top: auto; @@ -239,13 +262,13 @@ joomla-tab { width: calc(100% + 2px); height: 5px; content: ""; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); opacity: .8; } } } - #permissions-sliders section[active] { + #permissions-sliders > joomla-tab-element[active] { padding: 0 !important; @include media-breakpoint-down(lg) { @@ -289,18 +312,17 @@ joomla-tab { } .respTable td:last-child { - border-bottom: 1em var(--atum-bg-dark-80) solid; + border-bottom: 1em var(--template-bg-dark-80) solid; } .oddCol { - background: var(--atum-bg-light); + background: var(--template-bg-light); } } } } - .main-card-columns > * > & { height: 100%; - border-left: 1px solid var(--atum-bg-dark-10); + border-left: 1px solid var(--template-bg-dark-10); } } diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index 1af09a28933..d2177a6c8fb 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -255,10 +255,8 @@ JFIELD_MEDIA_LAZY_LABEL="Image will be lazyloaded" JFIELD_MEDIA_SUMMARY_LABEL="Additional Data" JFIELD_MEDIA_WIDTH_LABEL="Width" JFIELD_MEDIA_TITLE_LABEL="Title" -; Do not translate the text between the {} -JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file." -; Do not translate the text between the {} -JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters." +JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file." ; Do not translate the text between the {} +JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters." ; Do not translate the text between the {} JFIELD_META_DESCRIPTION_DESC="An optional paragraph to be used as the description of the page in the HTML output. This will generally display in the results of search engines." JFIELD_META_DESCRIPTION_LABEL="Meta Description" JFIELD_META_KEYWORDS_DESC="An optional comma-separated list of keywords and/or phrases to be used in the HTML output." @@ -1006,8 +1004,6 @@ JTOOLBAR_OPTIONS="Options" JTOOLBAR_PUBLISH="Publish" JTOOLBAR_PURGE_CACHE="Clear Cache" JTOOLBAR_REBUILD="Rebuild" -JTOOLBAR_REBUILD_FAILED="Rebuild failed: %s" -JTOOLBAR_REBUILD_SUCCESS="Toolbar rebuilt." JTOOLBAR_REFRESH_CACHE="Refresh Cache" JTOOLBAR_REMOVE="Remove" JTOOLBAR_SAVE="Save & Close" diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index d443e7ccd59..5ef78177d9e 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 4.0.0 - June 2021 + August 2021 Joomla! Project admin@joomla.org www.joomla.org diff --git a/build/.eslintrc b/build/.eslintrc index 175a32adb30..2d032f4222e 100644 --- a/build/.eslintrc +++ b/build/.eslintrc @@ -1,13 +1,13 @@ { "extends": [ - // Extend the airbnb eslint config - "airbnb-base", - // Vue - "plugin:vue/vue3-recommended" + // Extend the airbnb eslint config + "airbnb-base", + // Vue + "plugin:vue/vue3-recommended" ], "parser": "vue-eslint-parser", "parserOptions": { - "sourceType": "module" + "sourceType": "module" }, // ESLint will not look in parent folders for eslint configs "root": true, @@ -20,8 +20,8 @@ // Additional global variables your script accesses during execution "globals": { "Joomla": true, - "MediaManager" : true, - "bootstrap": true + "MediaManager" : true, + "bootstrap": true }, // Rule overrides "rules": { @@ -33,7 +33,19 @@ "strict": [0], // Disable alert rule till we have a CE in place "no-alert": 0, - // Allow extensions on imports - "import/extensions": 0 + // Max length to match the .php files + "max-len": ["error", + 150, + 2, + { + "ignoreUrls": true, + "ignoreComments": false, + "ignoreRegExpLiterals": true, + "ignoreStrings": true, + "ignoreTemplateLiterals": true + } + ], + // Allow extensions on imports + "import/extensions": 0 } } diff --git a/build/.gitignore b/build/.gitignore index c8470ef2dca..754e0038fd3 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -11,3 +11,5 @@ # Ignore the deleted file script output /deleted_files.txt +/deleted_folders.txt +/renamed_files.txt diff --git a/build/README.md b/build/README.md index 0b84ef06923..3466b0952ae 100644 --- a/build/README.md +++ b/build/README.md @@ -55,7 +55,7 @@ There are three options here: ## Working efficiently with the Joomla build tools -Usually when cotributing to the project the scope of the contribution should be limited, eg fixing some css bug, a javascript bug or some markup or a bug that involves changes in all these areas. The build tools were created so that you spent less time on compiling assets rather than testing a possible solution. *Embrace the watchers* and let the computer help you succeed faster and safer. There are 2 watcher at the moment: one for the Media Manager (client app based on VueJS) and another one that handles templates and the source (build) folder. +Usually when contributing to the project the scope of the contribution should be limited, eg fixing some css bug, a javascript bug or some markup or a bug that involves changes in all these areas. The build tools were created so that you spent less time on compiling assets rather than testing a possible solution. *Embrace the watchers* and let the computer help you succeed faster and safer. There are 2 watcher at the moment: one for the Media Manager (client app based on VueJS) and another one that handles templates and the source (build) folder. Assuming that you are working on the Media Manager you can run in your terminal (already in the root folder of the Joomla repo) `npm run watch:com_media`. This watcher will automatically recomile the app on every save (there is a debounce of 0.3s so if you have autosave will be clever to reduce the tasks). diff --git a/build/build-modules-js/init/minify-vendor.es6.js b/build/build-modules-js/init/minify-vendor.es6.js index 9b23c5329b1..6e487722cf5 100644 --- a/build/build-modules-js/init/minify-vendor.es6.js +++ b/build/build-modules-js/init/minify-vendor.es6.js @@ -1,5 +1,5 @@ const { lstat, readFile, writeFile } = require('fs-extra'); -const { sep } = require('path'); +const { sep, basename } = require('path'); const recursive = require('recursive-readdir'); const { minify } = require('terser'); @@ -18,8 +18,8 @@ const folders = [ let allFiles = []; const noMinified = [ - 'media/vendor/accessibility/js/accessibility.min.js', - 'media/vendor/short-and-sweet/js/short-and-sweet.min.js', + 'accessibility.min.js', + 'short-and-sweet.min.js', ]; const alreadyMinified = [ @@ -47,7 +47,7 @@ const minifiedExists = async (file) => { * @returns {Promise} */ const minifyJS = async (file) => { - const needsDotJS = noMinified.includes(file.replace(`${RootPath}${sep}`, '')); + const needsDotJS = noMinified.includes(basename(file)); if (file.endsWith('.min.js') && !needsDotJS) { return; } diff --git a/build/build-modules-js/init/patches.es6.js b/build/build-modules-js/init/patches.es6.js index 4845f42185f..7118b6a9420 100644 --- a/build/build-modules-js/init/patches.es6.js +++ b/build/build-modules-js/init/patches.es6.js @@ -27,7 +27,6 @@ module.exports.patchPackages = async (options) => { dest = join(mediaVendorPath, 'short-and-sweet'); const shortandsweetPath = `${dest}/${options.settings.vendors['short-and-sweet'].js['dist/short-and-sweet.min.js']}`; let ShortandsweetJs = await readFile(shortandsweetPath, { encoding: 'utf8' }); - ShortandsweetJs = ShortandsweetJs.concat('document.addEventListener(\'DOMContentLoaded\', function()' - + '{shortAndSweet(\'textarea.charcount\', {counterClassName: \'small text-muted\'}); });'); + ShortandsweetJs = ShortandsweetJs.concat('shortAndSweet(\'textarea.charcount\', {counterClassName: \'small text-muted\'});'); await writeFile(shortandsweetPath, ShortandsweetJs, { encoding: 'utf8' }); }; diff --git a/build/build-modules-js/init/recreate-media.es6.js b/build/build-modules-js/init/recreate-media.es6.js index 2460b0dd94d..721766cc515 100644 --- a/build/build-modules-js/init/recreate-media.es6.js +++ b/build/build-modules-js/init/recreate-media.es6.js @@ -16,10 +16,6 @@ module.exports.recreateMediaFolder = async () => { const filterFunc = async (src) => { const fileStat = await stat(src); - if (fileStat.isDirectory() && src.endsWith('core.es6')) { - return false; - } - if (fileStat.isFile() && (extname(src) === '.js' || extname(src) === '.css')) { return false; } diff --git a/build/build-modules-js/utils/debounce.es6.js b/build/build-modules-js/utils/debounce.es6.js index 7137ca6b6fb..96f95c192e6 100644 --- a/build/build-modules-js/utils/debounce.es6.js +++ b/build/build-modules-js/utils/debounce.es6.js @@ -6,5 +6,5 @@ * @param { int } time The time to wait before firing the callback * @param { int } interval The interval */ -// eslint-disable-next-line max-len, no-param-reassign, no-return-assign +// eslint-disable-next-line no-param-reassign, no-return-assign module.exports.debounce = (callback, time = 250, interval) => (...args) => clearTimeout(interval, interval = setTimeout(callback, time, ...args)); diff --git a/build/build.php b/build/build.php index 1fb5494b404..bf6560df35e 100644 --- a/build/build.php +++ b/build/build.php @@ -110,9 +110,15 @@ function clean_checkout(string $dir) system('find libraries/vendor -name _config.yml | xargs rm -rf -'); system('rm -rf libraries/vendor/bin'); + // aldo26-matthias/idna-convert + system('rm -rf libraries/vendor/algo26-matthias/idna-convert/tests'); + // defuse/php-encryption system('rm -rf libraries/vendor/defuse/php-encryption/docs'); + // doctrine/inflector + system('rm -rf libraries/vendor/doctrine/inflector/docs'); + // fig/link-util system('rm -rf libraries/vendor/fig/link-util/test'); @@ -120,6 +126,9 @@ function clean_checkout(string $dir) system('rm -rf libraries/vendor/google/recaptcha/examples'); system('rm -rf libraries/vendor/google/recaptcha/tests'); + // jakeasmith/http_build_url + system ('rm -rf libraries/vendor/jakeasmith/http_build_url/tests'); + // joomla/* system('rm -rf libraries/vendor/joomla/*/docs'); system('rm -rf libraries/vendor/joomla/*/tests'); @@ -149,6 +158,9 @@ function clean_checkout(string $dir) // wamania/php-stemmer system('rm -rf libraries/vendor/wamania/php-stemmer/test'); + // willdurand/negotiation + system('rm -rf libraries/vendor/willdurand/negotiation/tests'); + echo "Cleanup complete.\n"; chdir($cwd); diff --git a/build/bump.php b/build/bump.php index c09c7c669cd..cd7c869e1c8 100644 --- a/build/bump.php +++ b/build/bump.php @@ -47,7 +47,7 @@ function usage($command) '/language/en-GB/install.xml', '/administrator/language/en-GB/langmetadata.xml', '/administrator/language/en-GB/install.xml', - '/installation/language/en-GB/en-GB.xml', + '/installation/language/en-GB/langmetadata.xml', '/api/language/en-GB/langmetadata.xml' ); diff --git a/build/deleted_file_check.php b/build/deleted_file_check.php index 542857d7b69..494961eec49 100644 --- a/build/deleted_file_check.php +++ b/build/deleted_file_check.php @@ -18,59 +18,11 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Detect the native operating system type. -$os = strtoupper(substr(PHP_OS, 0, 3)); - -if ($os === 'WIN') -{ - echo 'Sorry, this script is not supported on Windows.' . PHP_EOL; - - exit(1); -} - /* * Constants */ - const PHP_TAB = "\t"; -/* - * Globals - */ - -global $currentDir; -$currentDir = getcwd(); - -global $changedFiles; -$changedFiles = array(); - -global $deletedFiles; -$deletedFiles = array(); - -global $gitBinary; -ob_start(); -passthru('which git', $gitBinary); -$gitBinary = trim(ob_get_clean()); - -/* - * Functions - */ - -function run_git_command($command) -{ - global $currentDir; - - chdir(dirname(__DIR__)); - - ob_start(); - passthru($command); - $return = trim(ob_get_clean()); - - chdir($currentDir); - - return $return; -} - function usage($command) { echo PHP_EOL; @@ -90,7 +42,7 @@ function usage($command) if (empty($options['from'])) { echo PHP_EOL; - echo 'Missing starting commit reference' . PHP_EOL; + echo 'Missing starting directory' . PHP_EOL; usage($argv[0]); @@ -100,46 +52,189 @@ function usage($command) // Missing the to reference? No problem, grab the current HEAD if (empty($options['to'])) { - $options['to'] = run_git_command("$gitBinary rev-parse HEAD"); + echo PHP_EOL; + echo 'Missing ending directory' . PHP_EOL; + + usage($argv[0]); + + exit(1); } -// Parse the git diff to know what files have been added, removed, or renamed -$fileDiff = explode("\n", run_git_command("$gitBinary diff --name-status {$options['from']} {$options['to']}")); +// Directories to skip for the check (needs to include anything from J3 we want to keep) +$previousReleaseExclude = [ + $options['from'] . '/administrator/components/com_search', + $options['from'] . '/components/com_search', + $options['from'] . '/images/sampledata', + $options['from'] . '/installation', + $options['from'] . '/media/plg_quickicon_eos310', + $options['from'] . '/media/system/images', + $options['from'] . '/modules/mod_search', + $options['from'] . '/plugins/fields/repeatable', + $options['from'] . '/plugins/quickicon/eos310', + $options['from'] . '/plugins/search', +]; -$deletedFiles = array(); +/** + * @param SplFileInfo $file The file being checked + * @param mixed $key ? + * @param RecursiveCallbackFilterIterator $iterator The iterator being processed + * + * @return bool True if you need to recurse or if the item is acceptable + */ +$previousReleaseFilter = function ($file, $key, $iterator) use ($previousReleaseExclude) { + if ($iterator->hasChildren() && !in_array($file->getPathname(), $previousReleaseExclude)) + { + return true; + } -foreach ($fileDiff as $file) -{ - $fileName = substr($file, 2); + return $file->isFile(); +}; + +// Directories to skip for the check +$newReleaseExclude = [ + $options['to'] . '/installation' +]; - // Act on the file based on the action - switch (substr($file, 0, 1)) +/** + * @param SplFileInfo $file The file being checked + * @param mixed $key ? + * @param RecursiveCallbackFilterIterator $iterator The iterator being processed + * + * @return bool True if you need to recurse or if the item is acceptable + */ +$newReleaseFilter = function ($file, $key, $iterator) use ($newReleaseExclude) { + if ($iterator->hasChildren() && !in_array($file->getPathname(), $newReleaseExclude)) { - // This is a new case with git 2.9 to handle renamed files - case 'R': - // Explode the file on the tab character; key 0 is the action (rename), key 1 is the old filename, and key 2 is the new filename - $renamedFileData = explode("\t", $file); + return true; + } - // And flag the old file as deleted - $deletedFiles[] = "'/{$renamedFileData[1]}',"; + return $file->isFile(); +}; - break; +$previousReleaseDirIterator = new RecursiveDirectoryIterator($options['from'], RecursiveDirectoryIterator::SKIP_DOTS); +$previousReleaseIterator = new RecursiveIteratorIterator( + new RecursiveCallbackFilterIterator($previousReleaseDirIterator, $previousReleaseFilter), + RecursiveIteratorIterator::SELF_FIRST +); +$previousReleaseFiles = []; +$previousReleaseFolders = []; - case 'D': - $deletedFiles[] = "'/$fileName',"; +foreach ($previousReleaseIterator as $info) +{ + if ($info->isDir()) + { + $previousReleaseFolders[] = "'" . str_replace($options['from'], '', $info->getPathname()) . "',"; + continue; + } + + $previousReleaseFiles[] = "'" . str_replace($options['from'], '', $info->getPathname()) . "',"; +} - break; +$newReleaseDirIterator = new RecursiveDirectoryIterator($options['to'], RecursiveDirectoryIterator::SKIP_DOTS); +$newReleaseIterator = new RecursiveIteratorIterator( + new RecursiveCallbackFilterIterator($newReleaseDirIterator, $newReleaseFilter), + RecursiveIteratorIterator::SELF_FIRST +); +$newReleaseFiles = []; +$newReleaseFolders = []; - default: - // Ignore file additions and modifications - break; +foreach ($newReleaseIterator as $info) +{ + if ($info->isDir()) + { + $newReleaseFolders[] = "'" . str_replace($options['to'], '', $info->getPathname()) . "',"; + continue; } + + $newReleaseFiles[] = "'" . str_replace($options['to'], '', $info->getPathname()) . "',"; } -asort($deletedFiles); +$filesDifference = array_diff($previousReleaseFiles, $newReleaseFiles); + +$foldersDifference = array_diff($previousReleaseFolders, $newReleaseFolders); + +// Specific files (e.g. language files) that we want to keep on upgrade +$filesToKeep = [ + "'/administrator/language/en-GB/en-GB.com_search.ini',", + "'/administrator/language/en-GB/en-GB.com_search.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_editors-xtd_weblink.ini',", + "'/administrator/language/en-GB/en-GB.plg_editors-xtd_weblink.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini',", + "'/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_quickicon_eos310.ini',", + "'/administrator/language/en-GB/en-GB.plg_quickicon_eos310.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_categories.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_contacts.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_content.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_content.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_tags.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_weblinks.ini',", + "'/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini',", + "'/administrator/language/en-GB/en-GB.plg_system_weblinks.ini',", + "'/administrator/language/en-GB/en-GB.plg_system_weblinks.sys.ini',", + "'/language/en-GB/en-GB.com_search.ini',", + "'/language/en-GB/en-GB.mod_search.ini',", + "'/language/en-GB/en-GB.mod_search.sys.ini',", +]; + +// Specific folders that we want to keep on upgrade +$foldersToKeep = [ + "'/bin',", +]; + +// Remove folders from the results which we want to keep on upgrade +foreach ($foldersToKeep as $folder) +{ + if (($key = array_search($folder, $foldersDifference)) !== false) { + unset($foldersDifference[$key]); + } +} + +asort($filesDifference); +rsort($foldersDifference); + +$deletedFiles = []; +$renamedFiles = []; + +foreach ($filesDifference as $file) +{ + // Don't remove any specific files (e.g. language files) that we want to keep on upgrade + if (array_search($file, $filesToKeep) !== false) + { + continue; + } + + // Check for files which might have been renamed only + $matches = preg_grep('/^' . preg_quote($file, '/') . '$/i', $newReleaseFiles); + + if ($matches !== false) + { + foreach ($matches as $match) + { + if (dirname($match) === dirname($file) && strtolower(basename($match)) === strtolower(basename($file))) + { + // File has been renamed only: Add to renamed files list + $renamedFiles[] = substr($file, 0, -1) . ' => ' . $match; + + // Go on with the next file in $filesDifference + continue 2; + } + } + } + + // File has been really deleted and not just renamed + $deletedFiles[] = $file; +} -// Write the deleted files list to a file for later reference +// Write the lists to files for later reference file_put_contents(__DIR__ . '/deleted_files.txt', implode("\n", $deletedFiles)); +file_put_contents(__DIR__ . '/deleted_folders.txt', implode("\n", $foldersDifference)); +file_put_contents(__DIR__ . '/renamed_files.txt', implode("\n", $renamedFiles)); echo PHP_EOL; -echo 'There are ' . count($deletedFiles) . ' deleted files in comparison to "' . $options['from'] . '"' . PHP_EOL; +echo 'There are ' . count($deletedFiles) . ' deleted files, ' . count($foldersDifference) . ' deleted folders and ' . count($renamedFiles) . ' renamed files in comparison to "' . $options['from'] . '"' . PHP_EOL; diff --git a/build/media_source/com_associations/css/sidebyside.css b/build/media_source/com_associations/css/sidebyside.css index a99a99c5131..13415cb93ac 100644 --- a/build/media_source/com_associations/css/sidebyside.css +++ b/build/media_source/com_associations/css/sidebyside.css @@ -4,128 +4,128 @@ */ .sidebyside .outer-panel { - float: left; - width: 50%; + float: left; + width: 50%; } .sidebyside #left-panel .inner-panel { - padding: 0 10px 0 0; + padding: 0 10px 0 0; } .sidebyside #right-panel .inner-panel { - padding: 0 0 0 10px; + padding: 0 0 0 10px; } .sidebyside .full-width { - float: none !important; - width: 100% !important; + float: none !important; + width: 100% !important; } .sidebyside .full-width .inner-panel { - padding: 0 !important; + padding: 0 !important; } #reference-association, #target-association { - width: 100%; - height: 1500px; - overflow-y: auto; - border: 0 !important; + width: 100%; + height: 1500px; + overflow-y: auto; + border: 0 !important; } .sidebyside .langtarget { - float: left; + float: left; } .sidebyside .modaltarget { - float: left; - margin-left: .5rem; + float: left; + margin-left: .5rem; } .sidebyside #target-association { - margin-top: .5rem; + margin-top: .5rem; } .sidebyside #reference-association { - margin-top: 3.35rem; + margin-top: 3.35rem; } .target-text { - float: left; - width: auto; + float: left; + width: auto; } /* RTL overrides */ html[dir=rtl] .sidebyside .outer-panel { - float: right; + float: right; } html[dir=rtl] .sidebyside #left-panel .inner-panel { - padding: 0 0 0 10px; + padding: 0 0 0 10px; } html[dir=rtl] .sidebyside #right-panel .inner-panel { - padding: 0 10px 0 0; + padding: 0 10px 0 0; } html[dir=rtl] .sidebyside .full-width .inner-panel { - padding: 0 !important; + padding: 0 !important; } html[dir=rtl] .sidebyside .langtarget { - float: right; + float: right; } html[dir=rtl] .sidebyside .modaltarget { - float: right; - margin-left: 0; - margin-right: .5rem; + float: right; + margin-left: 0; + margin-right: .5rem; } html[dir=rtl] .target-text { - float: right; + float: right; } /* Responsive layout */ @media (max-width: 1140px) { - .sidebyside #reference-association { - margin-top: 6.2rem; - } + .sidebyside #reference-association { + margin-top: 6.2rem; + } - .sidebyside .langtarget { - float: none; - } + .sidebyside .langtarget { + float: none; + } - .sidebyside .modaltarget { - float: left; - margin-left: 0; - } + .sidebyside .modaltarget { + float: left; + margin-left: 0; + } - html[dir=rtl] .sidebyside .langtarget { - float: none; - } + html[dir=rtl] .sidebyside .langtarget { + float: none; + } - html[dir=rtl] .sidebyside .modaltarget { - float: right; - margin-left: 0; - margin-right: 0; - } + html[dir=rtl] .sidebyside .modaltarget { + float: right; + margin-left: 0; + margin-right: 0; + } } @media (max-width: 767.98px) { - .sidebyside .outer-panel { - float: none; - width: 100%; - } - - .sidebyside #reference-association { - margin-top: 0; - } - - .sidebyside #left-panel .inner-panel { - padding: 0; - } - - .sidebyside #right-panel .inner-panel { - padding: 0; - } + .sidebyside .outer-panel { + float: none; + width: 100%; + } + + .sidebyside #reference-association { + margin-top: 0; + } + + .sidebyside #left-panel .inner-panel { + padding: 0; + } + + .sidebyside #right-panel .inner-panel { + padding: 0; + } } diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/build/media_source/com_associations/js/associations-edit.es6.js index c1e8cb8d7cc..710e7a4f74f 100644 --- a/build/media_source/com_associations/js/associations-edit.es6.js +++ b/build/media_source/com_associations/js/associations-edit.es6.js @@ -69,7 +69,6 @@ Joomla = window.Joomla || {}; if (result.data.length !== 0) { [].slice.call(Object.keys(result.data)).forEach((lang) => { functionName = callbackFunctionPrefix + lang.replace('-', '_'); - // eslint-disable-next-line max-len window[functionName](result.data[lang].id, result.data[lang].title, result.data[lang].catid, null, null, lang); }); } diff --git a/build/media_source/com_categories/css/shared-categories-accordion.css b/build/media_source/com_categories/css/shared-categories-accordion.css new file mode 100644 index 00000000000..05feaf02730 --- /dev/null +++ b/build/media_source/com_categories/css/shared-categories-accordion.css @@ -0,0 +1,14 @@ +.com-content-categories__item { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + padding: .5rem 0; + border-bottom: 1px solid #dfe3e7; +} +.com-content-categories__children { + flex-basis: 100%; + padding-inline-start: 1.5rem; +} +.com-content-categories__children .com-content-categories__item:last-child { + border-bottom: none; +} diff --git a/build/media_source/com_categories/joomla.asset.json b/build/media_source/com_categories/joomla.asset.json index 03543f5bef1..41e1542d8d3 100644 --- a/build/media_source/com_categories/joomla.asset.json +++ b/build/media_source/com_categories/joomla.asset.json @@ -5,6 +5,14 @@ "description": "Joomla CMS", "license": "GPL-2.0-or-later", "assets": [ + { + "name": "com_categories.shared-categories-accordion", + "type": "preset", + "dependencies": [ + "com_categories.shared-categories-accordion#style", + "com_categories.shared-categories-accordion#script" + ] + }, { "name": "com_categories.shared-categories-accordion.es5", "type": "script", @@ -27,6 +35,11 @@ "attributes": { "type": "module" } + }, + { + "name": "com_categories.shared-categories-accordion", + "type": "style", + "uri": "com_categories/shared-categories-accordion.min.css" } ] } diff --git a/build/media_source/com_categories/js/shared-categories-accordion.es6.js b/build/media_source/com_categories/js/shared-categories-accordion.es6.js index e0527f6b4d2..4c4b6cbe778 100644 --- a/build/media_source/com_categories/js/shared-categories-accordion.es6.js +++ b/build/media_source/com_categories/js/shared-categories-accordion.es6.js @@ -2,50 +2,47 @@ * @copyright (C) 2018 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -((Joomla) => { - 'use strict'; - if (!Joomla || !Joomla.Text) { - throw new Error('core.js was not properly initialised'); - } +if (!Joomla || !Joomla.Text) { + throw new Error('core.js was not properly initialised'); +} - // Selectors used by this script - const buttonsSelector = '[id^=category-btn-]'; +// Selectors used by this script +const buttonsSelector = '[id^=category-btn-]'; - /** - * Handle the category toggle button click event - * @param event - */ - const handleCategoryToggleButtonClick = ({ currentTarget }) => { - const button = currentTarget; - const icon = button.querySelector('span'); - - // Toggle icon class - icon.classList.toggle('icon-plus'); - icon.classList.toggle('icon-minus'); - - // Toggle aria label - const ariaLabel = button.getAttribute('aria-label'); - button.setAttribute( - 'aria-label', - ( - ariaLabel === Joomla.Text._('JGLOBAL_EXPAND_CATEGORIES') ? Joomla.Text._('JGLOBAL_COLLAPSE_CATEGORIES') : Joomla.Text._('JGLOBAL_EXPAND_CATEGORIES') - ), - ); - }; - - /** - * Script boot - */ - const onBoot = () => { - const buttons = [].slice.call(document.querySelectorAll(buttonsSelector)); - buttons.forEach((button) => { - button.addEventListener('click', handleCategoryToggleButtonClick); - }); - - // Cleanup - document.removeEventListener('DOMContentLoaded', onBoot); - }; - - document.addEventListener('DOMContentLoaded', onBoot); -})(Joomla); +/** + * Handle the category toggle button click event + * @param event + */ +const handleCategoryToggleButtonClick = ({ currentTarget }) => { + const button = currentTarget; + const icon = button.querySelector('span'); + + // Toggle icon class + icon.classList.toggle('icon-plus'); + icon.classList.toggle('icon-minus'); + + // Toggle aria label, aria-expanded + const ariaLabel = button.getAttribute('aria-label'); + const ariaExpanded = button.getAttribute('aria-expanded'); + button.setAttribute( + 'aria-label', + ( + ariaLabel === Joomla.Text._('JGLOBAL_EXPAND_CATEGORIES') ? Joomla.Text._('JGLOBAL_COLLAPSE_CATEGORIES') : Joomla.Text._('JGLOBAL_EXPAND_CATEGORIES') + ), + ); + button.setAttribute( + 'aria-expanded', + ( + ariaExpanded === 'false' ? 'true' : 'false' + ), + ); + + const { categoryId } = button.dataset; + const target = document.getElementById(`category-${categoryId}`); + target.toggleAttribute('hidden'); +}; + +Array.from(document.querySelectorAll(buttonsSelector)).forEach((button) => { + button.addEventListener('click', handleCategoryToggleButtonClick); +}); 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 index c94adcde642..266e22b4ee2 100644 --- a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js +++ b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js @@ -11,7 +11,7 @@ * @param { int } time The time to wait before firing the callback * @param { int } interval The interval */ -// eslint-disable-next-line max-len, no-param-reassign, no-return-assign +// eslint-disable-next-line no-param-reassign, no-return-assign const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(interval, interval = setTimeout(callback, time, ...args)); ((window, document, Joomla) => { @@ -61,6 +61,8 @@ const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(i // Masonry layout for cpanel cards const MasonryLayout = { $gridBox: null, + gridAutoRows: 0, + gridRowGap: 10, // Calculate "grid-row-end" property resizeGridItem($cell, rowHeight, rowGap) { @@ -75,26 +77,37 @@ const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(i // Check a size of every cell in the grid resizeAllGridItems() { - const $gridCells = [].slice.call(MasonryLayout.$gridBox.children); - const gridStyle = window.getComputedStyle(MasonryLayout.$gridBox); - const gridAutoRows = parseInt(gridStyle.getPropertyValue('grid-auto-rows'), 10) || 0; - const gridRowGap = parseInt(gridStyle.getPropertyValue('grid-row-gap'), 10) || 10; + const $gridCells = [].slice.call(this.$gridBox.children); $gridCells.forEach(($cell) => { - MasonryLayout.resizeGridItem($cell, gridAutoRows, gridRowGap); + this.resizeGridItem($cell, this.gridAutoRows, this.gridRowGap); }); }, initialise() { - MasonryLayout.$gridBox = document.querySelector('#cpanel-modules .card-columns'); - MasonryLayout.resizeAllGridItems(); + this.$gridBox = document.querySelector('#cpanel-modules .card-columns'); + + const gridStyle = window.getComputedStyle(this.$gridBox); + this.gridAutoRows = parseInt(gridStyle.getPropertyValue('grid-auto-rows'), 10) || this.gridAutoRows; + this.gridRowGap = parseInt(gridStyle.getPropertyValue('grid-row-gap'), 10) || this.gridRowGap; + + this.resizeAllGridItems(); + + // Recheck the layout after all content (fonts and images) is loaded. + window.addEventListener('load', () => this.resizeAllGridItems()); + + // Recheck the layout when the menu is toggled + window.addEventListener('joomla:menu-toggle', () => { + // 300ms is animation time, need to wait for the animation to end + setTimeout(() => this.resizeAllGridItems(), 330); + }); // Watch on window resize - window.addEventListener('resize', debounce(MasonryLayout.resizeAllGridItems, 50)); + window.addEventListener('resize', debounce(() => this.resizeAllGridItems(), 50)); }, }; - // Initialise Masonry layout on full load, - // to be sure all images/fonts are loaded, and so cards have a "final" size - window.addEventListener('load', MasonryLayout.initialise); + // Initialise Masonry layout at the very beginning, to avoid jumping. + // We can do this because the script is deferred. + MasonryLayout.initialise(); })(window, document, window.Joomla); diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.es6.js index 40d0d2ace16..27bea3975c2 100644 --- a/build/media_source/com_cpanel/js/admin-system-loader.es6.js +++ b/build/media_source/com_cpanel/js/admin-system-loader.es6.js @@ -7,7 +7,7 @@ const init = () => { // Cleanup - document.removeEventListener('DOMContentLoaded', init); + window.removeEventListener('load', init); // Get the elements const elements = [].slice.call(document.querySelectorAll('.system-counter')); @@ -61,5 +61,8 @@ } }; - document.addEventListener('DOMContentLoaded', init); + // Give some times to the layout and other scripts to settle their stuff + window.addEventListener('load', () => { + setTimeout(init, 300); + }); })(document, Joomla); diff --git a/build/media_source/com_finder/css/dates.css b/build/media_source/com_finder/css/dates.css index 82efa20a84f..a16665309be 100644 --- a/build/media_source/com_finder/css/dates.css +++ b/build/media_source/com_finder/css/dates.css @@ -1,26 +1,26 @@ #finder-filter-window { - margin: 10px 0 10px; - overflow: auto; - padding: 0; - width: 100%; + margin: 10px 0 10px; + overflow: auto; + padding: 0; + width: 100%; } ul#finder-filter-select-dates { - list-style: none; - margin: 0; - padding: 0; + list-style: none; + margin: 0; + padding: 0; } ul#finder-filter-select-dates li.filter-date { - background: none; - float: left; - list-style: none; - margin: 0; - padding: 5px 0; - text-align: left; - width: 49%; + background: none; + float: left; + list-style: none; + margin: 0; + padding: 5px 0; + text-align: left; + width: 49%; } ul#finder-filter-select-dates li.filter-date select.filter-date-operator { - margin-right: 10px; + margin-right: 10px; } diff --git a/build/media_source/com_finder/css/indexer.css b/build/media_source/com_finder/css/indexer.css index 63159d054a3..a3634b3deb3 100644 --- a/build/media_source/com_finder/css/indexer.css +++ b/build/media_source/com_finder/css/indexer.css @@ -1,13 +1,13 @@ #finder-progress-container { - width: 350px; - margin: 0 auto; + width: 350px; + margin: 0 auto; } h1.finder-error { - color: #FF0000; + color: #FF0000; } p.finder-error { - color: #FF0000; - font-weight: bold; + color: #FF0000; + font-weight: bold; } diff --git a/build/media_source/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.es6.js index 11ade16b274..65ceab92a7e 100644 --- a/build/media_source/com_finder/js/indexer.es6.js +++ b/build/media_source/com_finder/js/indexer.es6.js @@ -82,7 +82,7 @@ Object.entries(json.pluginState).forEach((context) => { let item = `
${context[0]}
`; item += `
`; - debuglist.insertAdjacentHTML('beforeend', Joomla.sanitizeHtml(item)); + debuglist.insertAdjacentHTML('beforeend', Joomla.sanitizeHtml(item, { dd: ['class', 'id'], dt: ['class'] })); }); } } diff --git a/build/media_source/com_installer/css/installer.css b/build/media_source/com_installer/css/installer.css index 94d1f1b3fac..39b41b32687 100644 --- a/build/media_source/com_installer/css/installer.css +++ b/build/media_source/com_installer/css/installer.css @@ -4,81 +4,81 @@ */ #loading { - position: fixed; - background-image: url(../../system/images/ajax-loader.gif); - background-color: rgba(255,255,255,.8); - background-repeat: no-repeat; - background-position: center center; - opacity: .8; - overflow: hidden; + position: fixed; + background-image: url(../../system/images/ajax-loader.gif); + background-color: rgba(255,255,255,.8); + background-repeat: no-repeat; + background-position: center center; + opacity: .8; + overflow: hidden; } #dragarea { - background-color: #fafbfc; - border: 1px dashed #999; - box-sizing: border-box; - padding: 5% 0; - transition: all 0.2s ease 0s; - width: 100%; + background-color: #fafbfc; + border: 1px dashed #999; + box-sizing: border-box; + padding: 5% 0; + transition: all 0.2s ease 0s; + width: 100%; } #dragarea p.lead { - color: #999; + color: #999; } #upload-icon { - font-size: 48px; - width: auto; - height: auto; - margin: 0; - line-height: 175%; - color: #999; - transition: all .2s; + font-size: 48px; + width: auto; + height: auto; + margin: 0; + line-height: 175%; + color: #999; + transition: all .2s; } #dragarea.hover { - border-color: #666; - background-color: #eee; + border-color: #666; + background-color: #eee; } #dragarea.hover #upload-icon, #dragarea p.lead { - color: #666; + color: #666; } .upload-progress, .install-progress { - width: 50%; - margin: 5px auto; + width: 50%; + margin: 5px auto; } /* Default transition (.3s) is too slow, progress will not run to 100% */ .upload-progress .progress .bar { - -webkit-transition: width .1s; - -moz-transition: width .1s; - -o-transition: width .1s; - transition: width .1s; + -webkit-transition: width .1s; + -moz-transition: width .1s; + -o-transition: width .1s; + transition: width .1s; } #dragarea[data-state=pending] .upload-progress { - display: none; + display: none; } #dragarea[data-state=pending] .install-progress { - display: none; + display: none; } #dragarea[data-state=uploading] .install-progress { - display: none; + display: none; } #dragarea[data-state=uploading] .upload-actions { - display: none; + display: none; } #dragarea[data-state=installing] .upload-progress { - display: none; + display: none; } #dragarea[data-state=installing] .upload-actions { - display: none; + display: none; } diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/build/media_source/com_joomlaupdate/js/default.es6.js index 6c6a75a6aba..af81c9d7ae4 100644 --- a/build/media_source/com_joomlaupdate/js/default.es6.js +++ b/build/media_source/com_joomlaupdate/js/default.es6.js @@ -16,7 +16,7 @@ Joomla = window.Joomla || {}; alert(Joomla.Text._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'), true); } else if (form.install_package.files[0].size > form.max_upload_size.value) { alert(Joomla.Text._('COM_INSTALLER_MSG_WARNINGS_UPLOADFILETOOBIG'), true); - } else { + } else if (document.getElementById('joomlaupdate-confirm-backup').checked) { form.submit(); } }; @@ -45,13 +45,26 @@ Joomla = window.Joomla || {}; document.addEventListener('DOMContentLoaded', () => { const uploadButton = document.getElementById('uploadButton'); - const downloadMsg = document.getElementById('downloadMessage'); - + const uploadField = document.getElementById('install_package'); + const installButton = document.querySelector('.emptystate-btnadd', document.getElementById('joomlaupdate-wrapper')); + const updateCheck = document.getElementById('joomlaupdate-confirm-backup'); + const form = installButton ? installButton.closest('form') : null; + const task = form ? form.querySelector('[name=task]', form) : null; if (uploadButton) { - uploadButton.addEventListener('click', () => { - if (downloadMsg) { - downloadMsg.classList.remove('hidden'); + uploadButton.addEventListener('click', Joomla.submitbuttonUpload); + } + if (uploadField) { + uploadField.addEventListener('change', Joomla.installpackageChange); + } + // Trigger (re-) install (including checkbox confirm if we update) + if (installButton && installButton.getAttribute('href') === '#' && task) { + installButton.addEventListener('click', (e) => { + e.preventDefault(); + if (updateCheck && !updateCheck.checked) { + return; } + task.value = 'update.download'; + form.submit(); }); } }); @@ -91,82 +104,87 @@ Joomla = window.Joomla || {}; SERVER_ERROR: 3, }; + PreUpdateChecker.cleanup = (status) => { + // Set the icon in the nav-tab + const infoIcon = document.querySelector('#joomlaupdate-precheck-extensions-tab .fa-spinner'); + + let iconColor = 'success'; + let iconClass = 'check'; + + switch (status) { + case 'danger': + iconColor = 'danger'; + iconClass = 'times'; + break; + case 'warning': + iconColor = 'warning'; + iconClass = 'exclamation-triangle'; + break; + default: + } + if (infoIcon) { + infoIcon.classList.remove('fa-spinner', 'fa-spin', 'text-info'); + infoIcon.classList.add(`fa-${iconClass}`, `text-${iconColor}`); + } + // Hide table of addons to load + const checkedExtensions = document.querySelector('#compatibilityTable0'); + const preupdateCheckWarning = document.querySelector('#preupdateCheckWarning'); + if (checkedExtensions) { + checkedExtensions.classList.add('hidden'); + } + if (preupdateCheckWarning) { + preupdateCheckWarning.classList.add('hidden'); + } + }; + /** * Run the PreUpdateChecker. * Called by document ready, setup below. */ PreUpdateChecker.run = () => { - [].slice.call(document.querySelectorAll('.settingstoggle')).forEach((el) => { - el.style.float = 'right'; - el.style.cursor = 'pointer'; - el.addEventListener('click', () => { - const settingsfieldset = el.closest('fieldset'); - if (el.dataset.state === 'closed') { - el.dataset.state = 'open'; - el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION')); - settingsfieldset.querySelectorAll('.settingsInfo').forEach((fieldset) => { - fieldset.classList.remove('hidden'); - }); - } else { - el.dataset.state = 'closed'; - el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION')); - settingsfieldset.querySelectorAll('.settingsInfo').forEach((fieldset) => { - fieldset.classList.add('hidden'); - }); - } - }); - }); - // eslint-disable-next-line no-undef PreUpdateChecker.nonCoreCriticalPlugins = Joomla.getOptions('nonCoreCriticalPlugins', []); - // If there are no non Core Critical Plugins installed, and we are in the update view, then - // disable the warnings upfront - if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && document.getElementById('updateView') !== null) { - document.getElementById('preupdateCheckWarning').style.display = 'none'; - document.getElementById('preupdateconfirmation').style.display = 'none'; - document.getElementById('preupdatecheckbox').style.display = 'none'; - document.getElementById('preupdatecheckheadings').style.display = 'none'; - document.getElementById('preupdatecheckbox').checked = true; - document.getElementById('noncoreplugins').checked = true; - - [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => { - el.classList.remove('disabled'); - el.removeAttribute('disabled'); - }); - } - // Grab all extensions based on the selector set in the config object const extensions = document.querySelectorAll(PreUpdateChecker.config.selector); // If there are no extensions to be checked we can exit here if (extensions.length === 0) { + if (document.getElementById('preupdatecheckbox') !== null) { + document.getElementById('preupdatecheckbox').style.display = 'none'; + } + if (document.getElementById('noncoreplugins') !== null) { + document.getElementById('noncoreplugins').checked = true; + } + [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => { + el.classList.remove('disabled'); + el.removeAttribute('disabled'); + }); + PreUpdateChecker.cleanup(); return; } + // Let the user make an update although there *could* be dangerous plugins in the wild const onChangeEvent = () => { - const preUpdateCheckbox = document.getElementById('preupdatecheckbox').checked; - const nonCorePluginCheckbox = document.getElementById('noncoreplugins').checked; - if (preUpdateCheckbox && nonCorePluginCheckbox) { + const nonCorePluginCheckbox = document.getElementById('noncoreplugins'); + if (nonCorePluginCheckbox.checked) { if (window.confirm(Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE'))) { [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => { el.classList.remove('disabled'); el.removeAttribute('disabled'); }); } else { - document.getElementById('preupdatecheckbox').checked = true; - document.getElementById('noncoreplugins').checked = true; + nonCorePluginCheckbox.checked = false; } } else { [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => { - el.classList.remove('disabled'); - el.removeAttribute('disabled'); + el.classList.add('disabled'); + el.setAttribute('disabled', ''); }); } }; - if (document.getElementById('updateView') !== null) { - document.getElementById('preupdatecheckbox').addEventListener('change', onChangeEvent); + if (document.getElementById('noncoreplugins') !== null) { document.getElementById('noncoreplugins').addEventListener('change', onChangeEvent); } @@ -175,99 +193,24 @@ Joomla = window.Joomla || {}; PreUpdateChecker.joomlaTargetVersion = joomlaUpdateWrapper.getAttribute('data-joomla-target-version'); PreUpdateChecker.joomlaCurrentVersion = joomlaUpdateWrapper.getAttribute('data-joomla-current-version'); - // No point creating and loading a component stylesheet for 4 settings - [].slice.call(document.querySelectorAll('.compatibilitytypes img')).forEach((el) => { - el.style.height = '20px'; - }); - [].slice.call(document.querySelectorAll('.compatibilitytypes')).forEach((el) => { - el.style.display = 'none'; - el.style.marginLeft = 0; - }); - // The currently processing line should show until it’s finished - const compatibilityType0 = document.getElementById('compatibilitytype0'); - - if (compatibilityType0) { - compatibilityType0.style.display = 'block'; - } - [].slice.call(document.querySelectorAll('.compatibilitytoggle')).forEach((el) => { - el.style.float = 'right'; - el.style.cursor = 'pointer'; el.addEventListener('click', () => { - const compatibilitytypes = el.closest('fieldset.compatibilitytypes'); + const compatibilityTable = el.closest('.compatibilityTable'); if (el.dataset.state === 'closed') { el.dataset.state = 'open'; - el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION')); - - [].slice.call(compatibilitytypes.querySelectorAll('.exname')).forEach((extension) => { - extension.classList.remove('col-md-8'); - extension.classList.add('col-md-4'); - }); - - [].slice.call(compatibilitytypes.querySelectorAll('.extype')).forEach((extension) => { - extension.classList.remove('col-md-4'); - extension.classList.add('col-md-1'); - }); - - [].slice.call(compatibilitytypes.querySelectorAll('.upcomp')).forEach((extension) => { - extension.classList.remove('hidden'); - extension.classList.add('col-md-3'); - }); + el.innerHTML = Joomla.sanitizeHtml(Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION')); - [].slice.call(compatibilitytypes.querySelectorAll('.currcomp')).forEach((extension) => { - extension.classList.remove('hidden'); - extension.classList.add('col-md-3'); + [].slice.call(compatibilityTable.querySelectorAll('table .hidden')).forEach((elem) => { + elem.classList.remove('hidden'); }); - - [].slice.call(compatibilitytypes.querySelectorAll('.instver')).forEach((extension) => { - extension.classList.remove('hidden'); - extension.classList.add('col-md-1'); - }); - - if (PreUpdateChecker.showyellowwarning && compatibilitytypes.querySelector('#updateyellowwarning')) { - compatibilitytypes.querySelector('#updateyellowwarning').classList.remove('hidden'); - } - - if (PreUpdateChecker.showorangewarning && compatibilitytypes.querySelector('#updateorangewarning')) { - compatibilitytypes.querySelector('#updateorangewarning').classList.remove('hidden'); - } } else { el.dataset.state = 'closed'; - el.innerHTML = Joomla.sanitizeHtml(Joomla.getOptions('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION')); - - [].slice.call(compatibilitytypes.querySelectorAll('.exname')).forEach((extension) => { - extension.classList.add('col-md-8'); - extension.classList.remove('col-md-4'); - }); - - [].slice.call(compatibilitytypes.querySelectorAll('.extype')).forEach((extension) => { - extension.classList.add('col-md-4'); - extension.classList.remove('col-md-1'); - }); + el.innerHTML = Joomla.sanitizeHtml(Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION')); - [].slice.call(compatibilitytypes.querySelectorAll('.upcomp')).forEach((extension) => { - extension.classList.add('hidden'); - extension.classList.remove('col-md-3'); + [].slice.call(compatibilityTable.querySelectorAll('table .instver, table .upcomp, table .currcomp')).forEach((elem) => { + elem.classList.add('hidden'); }); - - [].slice.call(compatibilitytypes.querySelectorAll('.currcomp')).forEach((extension) => { - extension.classList.add('hidden'); - extension.classList.remove('col-md-3'); - }); - - [].slice.call(compatibilitytypes.querySelectorAll('.instver')).forEach((extension) => { - extension.classList.add('hidden'); - extension.classList.remove('col-md-1'); - }); - - if (PreUpdateChecker.showyellowwarning && compatibilitytypes.querySelector('#updateyellowwarning')) { - compatibilitytypes.querySelector('#updateyellowwarning').classList.add('hidden'); - } - - if (PreUpdateChecker.showorangewarning && compatibilitytypes.querySelector('#updateorangewarning')) { - compatibilitytypes.querySelector('#updateorangewarning').classList.add('hidden'); - } } }); }); @@ -314,6 +257,7 @@ Joomla = window.Joomla || {}; callback(extension); }, onError() { + extension.serverError = 1; // Pass the retrieved data to the callback callback(extension); }, @@ -327,7 +271,6 @@ Joomla = window.Joomla || {}; */ PreUpdateChecker.setResultView = (extensionData) => { let html = ''; - // eslint-disable-next-line max-len // const direction = (document.dir !== undefined) ? document.dir : document.getElementsByTagName('html')[0].getAttribute('dir'); // Process Target Version Extension Compatibility @@ -343,25 +286,33 @@ Joomla = window.Joomla || {}; switch (extensionData.compatibilityData.upgradeCompatibilityStatus.state) { case PreUpdateChecker.STATE.COMPATIBLE: if (extensionData.compatibilityData.upgradeWarning) { - // eslint-disable-next-line max-len - html = `${extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion}`; - PreUpdateChecker.showyellowwarning = true; + const compatibleVersion = Joomla.sanitizeHtml(extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion); + html = `${compatibleVersion}`; + // @TODO activate when language strings are correct + /* if (compatibilitytypes.querySelector('#updateorangewarning')) { + compatibilitytypes.querySelector('#updateorangewarning').classList.remove('hidden'); + } */ } else { - // eslint-disable-next-line max-len html = extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion === false ? Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION') - : extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion; + : Joomla.sanitizeHtml(extensionData.compatibilityData.upgradeCompatibilityStatus.compatibleVersion); } break; case PreUpdateChecker.STATE.INCOMPATIBLE: // No compatible version found -> display error label html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION'); - PreUpdateChecker.showorangewarning = true; + // @TODO activate when language strings are correct + /* if (document.querySelector('#updateyellowwarning')) { + document.querySelector('#updateyellowwarning').classList.remove('hidden'); + } */ break; case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG: // Could not check compatibility state -> display warning html = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION'); - PreUpdateChecker.showorangewarning = true; + // @TODO activate when language strings are correct + /* if (document.querySelector('#updateyellowwarning')) { + document.querySelector('#updateyellowwarning').classList.remove('hidden'); + } */ break; default: // An error occurred -> show unknown error note @@ -370,7 +321,7 @@ Joomla = window.Joomla || {}; } // Insert the generated html - extensionData.element.innerHTML = Joomla.sanitizeHtml(html); + extensionData.element.innerHTML = html; // Process Current Version Extension Compatibility html = ''; @@ -381,7 +332,6 @@ Joomla = window.Joomla || {}; // Switch the compatibility state switch (extensionData.compatibilityData.currentCompatibilityStatus.state) { case PreUpdateChecker.STATE.COMPATIBLE: - // eslint-disable-next-line max-len html = extensionData.compatibilityData.currentCompatibilityStatus.compatibleVersion === false ? Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NO_COMPATIBILITY_INFORMATION') : extensionData.compatibilityData.currentCompatibilityStatus.compatibleVersion; @@ -403,36 +353,26 @@ Joomla = window.Joomla || {}; const extensionId = extensionData.element.getAttribute('data-extension-id'); document.getElementById(`available-version-${extensionId}`).innerText = html; - const compatType = document.querySelector(`#compatibilitytype${extensionData.compatibilityData.resultGroup} tbody`); + const compatType = document.querySelector(`#compatibilityTable${extensionData.compatibilityData.resultGroup} tbody`); if (compatType) { compatType.appendChild(extensionData.element.closest('tr')); } - document.getElementById(`compatibilitytype${extensionData.compatibilityData.resultGroup}`).style.display = 'block'; - document.getElementById('compatibilitytype0').style.display = 'block'; + // Show the table + document.getElementById(`compatibilityTable${extensionData.compatibilityData.resultGroup}`).classList.remove('hidden'); // Process the nonCoreCriticalPlugin list if (extensionData.compatibilityData.resultGroup === 3) { - PreUpdateChecker.nonCoreCriticalPlugins.forEach((plugin, cpi) => { - if (plugin.package_id.toString() === extensionId - || plugin.extension_id.toString() === extensionId) { - document.getElementById(`#plg_${plugin.extension_id}`).remove(); - PreUpdateChecker.nonCoreCriticalPlugins.splice(cpi, 1); - } - }); - } - - // Have we finished running through the potentially critical plugins - if so we can hide the - // warning before all the checks are completed - const headingsElement = document.getElementById('preupdatecheckheadings'); - if (headingsElement && headingsElement.querySelectorAll('table td').length === 0) { - headingsElement.style.display = 'none'; + PreUpdateChecker.nonCoreCriticalPlugins = PreUpdateChecker.nonCoreCriticalPlugins + // eslint-disable-next-line max-len + .filter((ext) => !(ext.package_id.toString() === extensionId || ext.extension_id.toString() === extensionId)); } // Have we finished? - if (!document.querySelector('#compatibilitytype0 tbody td')) { - document.getElementById('compatibilitytype0').style.display = 'none'; + if (!document.querySelector('#compatibilityTable0 tbody td')) { + document.getElementById('compatibilityTable0').classList.add('hidden'); + let status = 'success'; PreUpdateChecker.nonCoreCriticalPlugins.forEach((plugin) => { let problemPluginRow = document.querySelector(`td[data-extension-id="${plugin.extension_id}"]`); if (!problemPluginRow) { @@ -441,61 +381,54 @@ Joomla = window.Joomla || {}; if (problemPluginRow) { const tableRow = problemPluginRow.closest('tr'); tableRow.classList.add('error'); - const pluginTitleTableCell = tableRow.querySelector('td:first-child'); - pluginTitleTableCell.innerHTML = Joomla.sanitizeHtml(`${pluginTitleTableCell.innerHTML} - + const pluginTitleTableCell = tableRow.querySelector('.exname'); + pluginTitleTableCell.innerHTML = `${Joomla.sanitizeHtml(pluginTitleTableCell.innerHTML)} +
+ ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')} - - ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_HELP')} - `); + +
`; const popoverElement = pluginTitleTableCell.querySelector('.hasPopover'); if (popoverElement) { popoverElement.style.cursor = 'pointer'; // eslint-disable-next-line no-new - new bootstrap.Popover(popoverElement, { placement: 'top', html: true, trigger: 'focus click' }); + new bootstrap.Popover(popoverElement, { placement: 'top', html: true, trigger: 'focus' }); } + status = 'danger'; } }); - - // If we aren't in the update view now - bail early. - if (document.getElementById('updateView') === null) { - return; + // Updates required + if (document.querySelector('#compatibilityTable2 tbody td')) { + status = 'danger'; + } else if (status !== 'danger' && document.querySelector('#compatibilityTable1 tbody td')) { + status = 'warning'; } - if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0) { - document.getElementById('preupdateCheckWarning').style.display = 'none'; - document.getElementById('preupdateconfirmation').style.display = 'none'; + if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && status === 'success') { document.getElementById('preupdatecheckbox').style.display = 'none'; - document.getElementById('preupdatecheckheadings').style.display = 'none'; - document.getElementById('preupdatecheckbox').checked = true; document.getElementById('noncoreplugins').checked = true; [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => { el.classList.remove('disabled'); el.removeAttribute('disabled'); }); - } else { - document.getElementById('preupdateCheckWarning').classList.add('hidden'); + } else if (PreUpdateChecker.nonCoreCriticalPlugins.length > 0) { document.getElementById('preupdateCheckCompleteProblems').classList.remove('hidden'); - - [].slice.call(document.querySelectorAll('#preupdateconfirmation .preupdateconfirmation_label h3')).forEach((el) => { - el.innerText = Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST'); - }); - - [].slice.call(document.querySelectorAll('#preupdateconfirmation .preupdateconfirmation_label')).forEach((el) => { - el.classList.add('label-important'); - el.classList.remove('label-warning'); - }); } + + PreUpdateChecker.cleanup(status); } }; - // Run PreUpdateChecker on document ready - document.addEventListener('DOMContentLoaded', PreUpdateChecker.run, false); + if (document.getElementById('preupdatecheck') !== null) { + // Run PreUpdateChecker on document ready + document.addEventListener('DOMContentLoaded', PreUpdateChecker.run, false); + } })(Joomla, document); diff --git a/build/media_source/com_languages/css/overrider.css b/build/media_source/com_languages/css/overrider.css index 5eaa42eacfd..0653e02c4e4 100644 --- a/build/media_source/com_languages/css/overrider.css +++ b/build/media_source/com_languages/css/overrider.css @@ -1,8 +1,8 @@ /** - * @package Joomla.Administrator - * @subpackage com_languages - * @copyright (C) 2011 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @package Joomla.Administrator + * @subpackage com_languages + * @copyright (C) 2011 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ #overrider-spinner, @@ -11,30 +11,30 @@ #more-results, #language-results, #results-container { - display: none; + display: none; } #overrider-spinner.show, #more-results.show, #results-container.show, #language-results.show { - display: grid; + display: grid; } #refresh-status.show { - display: block; + display: block; } #overrider-spinner-btn.show { - display: inline-block; + display: inline-block; } #refresh-status { - flex-basis: 100%; + flex-basis: 100%; } .result-key { - color:#666; + color:#666; } .result-string { - padding-left: 20px; + padding-left: 20px; } diff --git a/build/media_source/com_media/joomla.asset.json b/build/media_source/com_media/joomla.asset.json index 525e415cae3..01250542846 100644 --- a/build/media_source/com_media/joomla.asset.json +++ b/build/media_source/com_media/joomla.asset.json @@ -13,7 +13,7 @@ "core" ], "attributes": { - "nomodules": true, + "nomodule": true, "defer": true } }, diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js index 82bda83a268..ae5cbfefe0f 100644 --- a/build/media_source/com_media/js/edit-images.es6.js +++ b/build/media_source/com_media/js/edit-images.es6.js @@ -2,304 +2,329 @@ * @copyright (C) 2018 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -Joomla = window.Joomla || {}; +if (!Joomla) { + throw new Error('Joomla API is not properly initialized'); +} Joomla.MediaManager = Joomla.MediaManager || {}; +class Edit { + constructor() { + // Get the options from Joomla.optionStorage + this.options = Joomla.getOptions('com_media', {}); -(() => { - 'use strict'; + if (!this.options) { + throw new Error('Initialization error "edit-images.js"'); + } - // Get the options from Joomla.optionStorage - const options = Joomla.getOptions('com_media', {}); + this.extension = this.options.uploadPath.split('.').pop(); + this.fileType = ['jpeg', 'jpg'].includes(this.extension) ? 'jpeg' : this.extension; + this.options.currentUrl = new URL(window.location.href); - if (!options) { - throw new Error('Initialization error "edit-images.js"'); - } + // Initiate the registry + this.original = { + filename: this.options.uploadPath.split('/').pop(), + extension: this.extension, + contents: `data:image/${this.fileType};base64,${this.options.contents}`, + }; + this.previousPluginDeactivated = new Promise((resolve) => resolve); + this.history = {}; + this.current = this.original; + this.plugins = {}; + this.baseContainer = document.getElementById('media-manager-edit-container'); + + if (!this.baseContainer) { + throw new Error('The image preview container is missing'); + } - // Initiate the registry - Joomla.MediaManager.Edit.original = { - filename: options.uploadPath.split('/').pop(), - extension: options.uploadPath.split('.').pop(), - contents: `data:image/${options.uploadPath.split('.').pop()};base64,${options.contents}`, - }; - Joomla.MediaManager.Edit.history = {}; - Joomla.MediaManager.Edit.current = {}; + this.createImageContainer(this.original); - const activate = (name, data) => { - if (!data.contents) { - return; - } - // Create the images for edit and preview - const baseContainer = document.getElementById('media-manager-edit-container'); - const editContainer = document.createElement('div'); - const previewContainer = document.createElement('div'); - const imageSrc = document.createElement('img'); - const imagePreview = document.createElement('img'); - - baseContainer.innerHTML = ''; - imageSrc.src = data.contents; - imageSrc.id = 'image-source'; - imageSrc.style.maxWidth = '100%'; - imagePreview.src = data.contents; - imagePreview.id = 'image-preview'; - imagePreview.style.maxWidth = '100%'; - editContainer.classList.add('hidden'); - - editContainer.appendChild(imageSrc); - baseContainer.appendChild(editContainer); - - previewContainer.appendChild(imagePreview); - baseContainer.appendChild(previewContainer); - - // Activate the first plugin - Joomla.MediaManager.Edit[name.toLowerCase()].Activate(data); - }; + Joomla.MediaManager.Edit = this; + window.dispatchEvent(new CustomEvent('media-manager-edit-init')); - // Reset the image to the initial state - Joomla.MediaManager.Edit.Reset = (current) => { - if (!current || (current && current === 'initial')) { - Joomla.MediaManager.Edit.current.contents = Joomla.MediaManager.Edit.original.contents; - } + // Once the DOM is ready, initialize everything + customElements.whenDefined('joomla-tab').then(async () => { + const tabContainer = document.getElementById('myTab'); + const tabsUlElement = tabContainer.firstElementChild; + const links = [].slice.call(tabsUlElement.querySelectorAll('button[aria-controls]')); - // Clear the DOM - const container = document.getElementById('media-manager-edit-container'); - container.innerHTML = ''; + // Couple the tabs with the plugin objects + links.forEach((link, index) => { + const tab = document.getElementById(link.getAttribute('aria-controls')); + if (index === 0) { + tab.insertAdjacentElement('beforeend', this.baseContainer); + } - // Reactivate the current plugin - const tabsUlElement = document.getElementById('myTab').firstElementChild; + link.addEventListener('joomla.tab.hidden', ({ target }) => { + if (!target) { + this.previousPluginDeactivated = new Promise((resolve) => resolve); + return; + } - if (tabsUlElement.tagName !== 'UL') { - return; - } + this.previousPluginDeactivated = new Promise((resolve, reject) => { + this.plugins[target.getAttribute('aria-controls').replace('attrib-', '')] + .Deactivate(this.imagePreview) + .then(resolve) + .catch((e) => { + // eslint-disable-next-line no-console + console.log(e); + reject(); + }); + }); + }); - const links = [].slice.call(tabsUlElement.querySelectorAll('a')); + link.addEventListener('joomla.tab.shown', ({ target }) => { + // Move the image container to the correct tab + tab.insertAdjacentElement('beforeend', this.baseContainer); + this.previousPluginDeactivated + .then(() => this.plugins[target.getAttribute('aria-controls').replace('attrib-', '')].Activate(this.imagePreview)) + .catch((e) => { + // eslint-disable-next-line no-console + console.log(e); + }); + }); + }); - links.forEach((link) => { - if (!link.hasAttribute('active')) { - return; - } + tabContainer.activateTab(0, false); + }); - Joomla.MediaManager.Edit[link.id.replace('tab-attrib-', '').toLowerCase()].Deactivate(); + this.addHistoryPoint = this.addHistoryPoint.bind(this); + this.createImageContainer = this.createImageContainer.bind(this); + this.Reset = this.Reset.bind(this); + this.Undo = this.Undo.bind(this); + this.Redo = this.Redo.bind(this); + this.createProgressBar = this.createProgressBar.bind(this); + this.updateProgressBar = this.updateProgressBar.bind(this); + this.removeProgressBar = this.removeProgressBar.bind(this); + this.upload = this.upload.bind(this); + + // Create history entry + window.addEventListener('mediaManager.history.point', this.addHistoryPoint.bind(this)); + } - let data = Joomla.MediaManager.Edit.current; - if (!current || (current && current !== true)) { - data = Joomla.MediaManager.Edit.original; + /** + * Creates a history snapshot + * PRIVATE + */ + addHistoryPoint() { + if (this.original !== this.current) { + const key = Object.keys(this.history).length; + if (this.history[key] && this.history[key - 1] + && this.history[key] === this.history[key - 1]) { + return; } + this.history[key + 1] = this.current; + } + } - link.click(); + /** + * Creates the images for edit and preview + * PRIVATE + */ + createImageContainer(data) { + if (!data.contents) { + throw new Error('Initialization error "edit-images.js"'); + } - // Move the container to the correct tab - const mediaContainer = document.getElementById('media-manager-edit-container'); - const tab = document.getElementById(link.id.replace('tab-', '')); - tab.insertAdjacentElement('beforeend', mediaContainer); + this.imagePreview = document.createElement('img'); + this.imagePreview.src = data.contents; + this.imagePreview.id = 'image-preview'; + this.imagePreview.style.height = 'auto'; + this.imagePreview.style.maxWidth = '100%'; + this.baseContainer.appendChild(this.imagePreview); + } - activate(link.id.replace('tab-attrib-', ''), data); + // Reset the image to the initial state + Reset(/* current */) { + this.current.contents = `data:image/${this.fileType};base64,${this.options.contents}`; + this.imagePreview.setAttribute('src', this.current.contents); + + requestAnimationFrame(() => { + requestAnimationFrame(() => { + this.imagePreview.setAttribute('width', this.imagePreview.naturalWidth); + this.imagePreview.setAttribute('height', this.imagePreview.naturalHeight); + }); }); - }; - - // Create history entry - window.addEventListener('mediaManager.history.point', () => { - if (Joomla.MediaManager.Edit.original !== Joomla.MediaManager.Edit.current.contents) { - const key = Object.keys(Joomla.MediaManager.Edit.history).length; - if (Joomla.MediaManager.Edit.history[key] && Joomla.MediaManager.Edit.history[key - 1] - && Joomla.MediaManager.Edit.history[key] === Joomla.MediaManager.Edit.history[key - 1]) { - return; - } - Joomla.MediaManager.Edit.history[key + 1] = Joomla.MediaManager.Edit.current.contents; - } - }); + } // @TODO History - Joomla.MediaManager.Edit.Undo = () => { }; + // eslint-disable-next-line class-methods-use-this + Undo() { } + // @TODO History - Joomla.MediaManager.Edit.Redo = () => { }; + // eslint-disable-next-line class-methods-use-this + Redo() { } // @TODO Create the progress bar - Joomla.MediaManager.Edit.createProgressBar = () => { }; + // eslint-disable-next-line class-methods-use-this + createProgressBar() { } // @TODO Update the progress bar - Joomla.MediaManager.Edit.updateProgressBar = (/* position */) => { }; + // eslint-disable-next-line class-methods-use-this + updateProgressBar(/* position */) { } // @TODO Remove the progress bar - Joomla.MediaManager.Edit.removeProgressBar = () => { }; - - // Customize the buttons - Joomla.submitbutton = (task) => { - const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; - const pathName = window.location.pathname.replace(/&view=file.*/g, ''); - const name = options.uploadPath.split('/').pop(); - const forUpload = { - name, - content: Joomla.MediaManager.Edit.current.contents.replace(`data:image/${format};base64,`, ''), - }; - - // eslint-disable-next-line prefer-destructuring - const uploadPath = options.uploadPath; - - const url = `${options.apiBaseUrl}&task=api.files&path=${uploadPath}`; + // eslint-disable-next-line class-methods-use-this + removeProgressBar() { } - const type = 'application/json'; - - forUpload[options.csrfToken] = '1'; - - let fileDirectory = uploadPath.split('/'); - fileDirectory.pop(); - fileDirectory = fileDirectory.join('/'); - - // If we are in root add a backslash - if (fileDirectory.endsWith(':')) { - fileDirectory = `${fileDirectory}/`; - } + /** + * Uploads + * Public + */ + upload(url, stateChangeCallback) { + let format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; - // Respect the images_only URI param - const mediaTypes = document.querySelector('input[name="mediatypes"]'); - let mediatypes; - if (mediaTypes) { - mediatypes = `&mediatypes=${mediaTypes.value ? mediaTypes.value : '0'}`; + if (!format) { + // eslint-disable-next-line prefer-destructuring + format = /data:image\/(.+);/gm.exec(Joomla.MediaManager.Edit.original.contents)[1]; } - switch (task) { - case 'apply': - Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type); - Joomla.MediaManager.Edit.Reset(true); - break; - case 'save': - // eslint-disable-next-line func-names - Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type, function () { - if (this.readyState === XMLHttpRequest.DONE) { - if (window.self !== window.top) { - window.location = `${pathName}?option=com_media&view=media${mediatypes}&path=${fileDirectory}&tmpl=component`; - } else { - window.location = `${pathName}?option=com_media&view=media${mediatypes}&path=${fileDirectory}`; - } - } - }); - break; - case 'cancel': - if (window.self !== window.top) { - window.location = `${pathName}?option=com_media&view=media${mediatypes}&path=${fileDirectory}&tmpl=component`; - } else { - window.location = `${pathName}?option=com_media&view=media${mediatypes}&path=${fileDirectory}`; - } - break; - case 'reset': - Joomla.MediaManager.Edit.Reset('initial'); - break; - case 'undo': - // @TODO magic goes here - break; - case 'redo': - // @TODO other magic goes here - break; - default: - break; + if (!format) { + throw new Error('Unable to determine image format'); } - }; - - /** - * @TODO Extend Joomla.request and drop this code!!!! - */ - // The upload object - Joomla.UploadFile = {}; - - /** - * @TODO Extend Joomla.request and drop this code!!!! - */ - Joomla.UploadFile.exec = (name, data, uploadPath, url, type, stateChangeCallback) => { - const xhr = new XMLHttpRequest(); - xhr.upload.onprogress = (e) => { - Joomla.MediaManager.Edit.updateProgressBar((e.loaded / e.total) * 100); - }; + this.xhr = new XMLHttpRequest(); if (typeof stateChangeCallback === 'function') { - xhr.onreadystatechange = stateChangeCallback; + this.xhr.onreadystatechange = stateChangeCallback; } - xhr.onload = () => { + this.xhr.upload.onprogress = (e) => { + this.updateProgressBar((e.loaded / e.total) * 100); + }; + this.xhr.onload = () => { let resp; try { - resp = JSON.parse(xhr.responseText); + resp = JSON.parse(this.xhr.responseText); } catch (er) { resp = null; } if (resp) { - if (xhr.status === 200) { + if (this.xhr.status === 200) { if (resp.success === true) { - Joomla.MediaManager.Edit.removeProgressBar(); + this.removeProgressBar(); } if (resp.status === '1') { Joomla.renderMessages({ success: [resp.message] }, 'true'); - Joomla.MediaManager.Edit.removeProgressBar(); + this.removeProgressBar(); } } } else { - Joomla.MediaManager.Edit.removeProgressBar(); + this.removeProgressBar(); } + this.xhr = null; }; - xhr.onerror = () => { - Joomla.MediaManager.Edit.removeProgressBar(); + this.xhr.onerror = () => { + this.removeProgressBar(); + this.xhr = null; }; - xhr.open('PUT', url, true); - xhr.setRequestHeader('Content-Type', type); - Joomla.MediaManager.Edit.createProgressBar(); - xhr.send(data); - }; - - // Once the DOM is ready, initialize everything - document.addEventListener('DOMContentLoaded', () => { - const func = () => { - const tabsUlElement = document.getElementById('myTab').firstElementChild; + this.xhr.open('PUT', url, true); + this.xhr.setRequestHeader('Content-Type', 'application/json'); + this.createProgressBar(); + this.xhr.send(JSON.stringify({ + name: Joomla.MediaManager.Edit.options.uploadPath.split('/').pop(), + content: Joomla.MediaManager.Edit.current.contents.replace(`data:image/${format};base64,`, ''), + [Joomla.MediaManager.Edit.options.csrfToken]: 1, + })); + } +} - if (tabsUlElement.tagName !== 'UL') { - setTimeout(func, 50); - return; - } +// Initiate the Editor API +// eslint-disable-next-line no-new +new Edit(); - const links = [].slice.call(tabsUlElement.querySelectorAll('a')); +/** + * Compute the corrent URL + * + * @param {boolean} isModal is the URL for a modal window + * + * @return {{}} the URL object + */ +const getUrl = (isModal) => { + const newUrl = Joomla.MediaManager.Edit.options.currentUrl; + const params = new URLSearchParams(newUrl.search); + params.set('view', 'media'); + params.delete('path'); + params.delete('mediatypes'); + + const { uploadPath } = Joomla.MediaManager.Edit.options; + let fileDirectory = uploadPath.split('/'); + fileDirectory.pop(); + fileDirectory = fileDirectory.join('/'); + + // If we are in root add a backslash + if (fileDirectory.endsWith(':')) { + fileDirectory = `${fileDirectory}/`; + } - if (links[0]) { - activate(links[0].id.replace('tab-attrib-', ''), Joomla.MediaManager.Edit.original); - } + params.set('path', fileDirectory); - // Couple the tabs with the plugin objects - links.forEach((link) => { - link.addEventListener('joomla.tab.shown', ({ relatedTarget, target }) => { - const container = document.getElementById('media-manager-edit-container'); - if (relatedTarget) { - Joomla.MediaManager.Edit[relatedTarget.id.replace('tab-attrib-', '').toLowerCase()].Deactivate(); - - // Clear the DOM - container.innerHTML = ''; - } + // Respect the images_only URI param + const mediaTypes = document.querySelector('input[name="mediatypes"]'); + params.set('mediatypes', (mediaTypes && mediaTypes.value) ? mediaTypes.value : '0'); - let data = Joomla.MediaManager.Edit.current; + if (isModal) { + params.set('tmpl', 'component'); + } - if (!('contents' in Joomla.MediaManager.Edit.current)) { - data = Joomla.MediaManager.Edit.original; + newUrl.search = params; + + return newUrl; +}; + +// Customize the Toolbar buttons behavior +Joomla.submitbutton = (task) => { + const url = new URL(`${Joomla.MediaManager.Edit.options.apiBaseUrl}&task=api.files&path=${Joomla.MediaManager.Edit.options.uploadPath}`); + switch (task) { + case 'apply': + Joomla.MediaManager.Edit.upload(url, null); + Joomla.MediaManager.Edit.imagePreview.src = Joomla.MediaManager.Edit.current.contents; + Joomla.MediaManager.Edit.original = Joomla.MediaManager.Edit.current; + Joomla.MediaManager.Edit.history = {}; + + (async () => { + const activeTab = [].slice.call(document.querySelectorAll('joomla-tab-element')) + .filter((tab) => tab.hasAttribute('active')); + try { + await Joomla.MediaManager.Edit.plugins[activeTab[0].id.replace('attrib-', '')].Deactivate(Joomla.MediaManager.Edit.imagePreview); + await Joomla.MediaManager.Edit.plugins[activeTab[0].id.replace('attrib-', '')].Activate(Joomla.MediaManager.Edit.imagePreview); + } catch (e) { + // eslint-disable-next-line no-console + console.log(e); + } + })(); + break; + case 'save': + Joomla.MediaManager.Edit.upload(url, () => { + if (Joomla.MediaManager.Edit.xhr.readyState === XMLHttpRequest.DONE) { + if (window.self !== window.top) { + window.location = getUrl(true); + } else { + window.location = getUrl(); } - - // Move the container to the correct tab - const tab = document.getElementById(target.id.replace('tab-', '')); - tab.insertAdjacentElement('beforeend', container); - - activate(target.id.replace('tab-attrib-', ''), data); - }); - - link.click(); + } }); - - if (links[0]) { - links[0].click(); - activate(links[0].id.replace('tab-attrib-', ''), Joomla.MediaManager.Edit.original); + break; + case 'cancel': + if (window.self !== window.top) { + window.location = getUrl(true); + } else { + window.location = getUrl(); } - }; - - // @TODO use promises here - setTimeout(func, 50); - }); -})(); + break; + case 'reset': + Joomla.MediaManager.Edit.Reset('initial'); + break; + case 'undo': + // @TODO magic goes here + break; + case 'redo': + // @TODO other magic goes here + break; + default: + break; + } +}; diff --git a/build/media_source/com_media/scss/_variables.scss b/build/media_source/com_media/scss/_variables.scss index ef084e1d495..561f325cf51 100644 --- a/build/media_source/com_media/scss/_variables.scss +++ b/build/media_source/com_media/scss/_variables.scss @@ -1,14 +1,14 @@ // Defaults $gutter-width: 15px; $highlight-color: #2a69b8; -$border-color: var(--atum-bg-dark-7); +$border-color: var(--template-bg-dark-7); $border-radius: .25rem; // Layout $col-main-panel-width: 83.3333%; $col-side-panel-width: 16.6667%; $col-gutter-width: $gutter-width; -$col-box-shadow: 0 2px 10px -8px var(--atum-bg-dark-50); +$col-box-shadow: 0 2px 10px -8px var(--template-bg-dark-50); // Sidebar $sidebar-drive-bg: #fff; @@ -29,7 +29,7 @@ $toolbar-loader-color: linear-gradient(to right, #59afff 0, #59daff $toolbar-loader-height: 2px; // Breadcrumbs -$breadcrumbs-bg: var(--atum-bg-dark-3); +$breadcrumbs-bg: var(--template-bg-dark-3); $breadcrumbs-current-bg: #fff; // Media Browser Grid @@ -59,12 +59,12 @@ $table-item-icon-bg-selected: #006898; $table-item-bg-hover: rgba(0, 0, 0, .03); // Media Info bar -$info-bg: var(--atum-bg-dark-3); -$info-title-bg: var(--atum-bg-dark-5); +$info-bg: var(--template-bg-dark-3); +$info-title-bg: var(--template-bg-dark-5); $info-dt-width: 33.33333%; $info-dd-width: 66.66667%; -$info-close-color: var(--atum-bg-dark-60); -$info-close-color-hover: var(--atum-bg-dark-40); +$info-close-color: var(--template-bg-dark-60); +$info-close-color-hover: var(--template-bg-dark-40); // Table Icon Mapping $icon-type-default: "\f016"; diff --git a/build/media_source/com_media/scss/components/_media-browser.scss b/build/media_source/com_media/scss/components/_media-browser.scss index d0f8be240fd..9d0cbed5acb 100644 --- a/build/media_source/com_media/scss/components/_media-browser.scss +++ b/build/media_source/com_media/scss/components/_media-browser.scss @@ -2,7 +2,7 @@ .media-browser { position: relative; min-height: 70vh; - border-left: 1px solid $border-color; + border-inline-start: 1px solid $border-color; transition: width .3s cubic-bezier(.4, 0, .2, 1); } diff --git a/build/media_source/com_media/scss/components/_media-edit.scss b/build/media_source/com_media/scss/components/_media-edit.scss index efeb0eb7a26..7e9ef07f8b0 100644 --- a/build/media_source/com_media/scss/components/_media-edit.scss +++ b/build/media_source/com_media/scss/components/_media-edit.scss @@ -1,5 +1,5 @@ .media-form { - joomla-tab > section { + joomla-tab > joomla-tab-element { padding: 0; &[active] { @@ -7,8 +7,8 @@ } } - section { - grid-template-columns: repeat(4, minmax(240px, 1fr)); + joomla-tab-element { + grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); > fieldset { padding: 2rem; @@ -47,12 +47,13 @@ } .media-manager-edit { - grid-column: span 3; + grid-column-start: 2; + grid-column-end: 5; background-color: #fff; background-image: linear-gradient(45deg,hsl(var(--hue), 20%, 97%) 25%,transparent 0,transparent 75%,#fafafa 0,hsl(var(--hue),20%,97%)),linear-gradient(45deg,#fafafa 25%,transparent 0,transparent 75%,hsl(var(--hue), 20%, 97%) 0,hsl(var(--hue), 20%, 97%)); background-position: 0 0,10px 10px; background-size: 20px 20px; - border-left: 1px solid var(--atum-bg-dark-7); + border-left: 1px solid var(--template-bg-dark-7); > div > img { padding: 0; diff --git a/build/media_source/com_media/scss/components/_media-infobar.scss b/build/media_source/com_media/scss/components/_media-infobar.scss index 15366035fa4..fb752107bab 100644 --- a/build/media_source/com_media/scss/components/_media-infobar.scss +++ b/build/media_source/com_media/scss/components/_media-infobar.scss @@ -12,7 +12,7 @@ $fa-css-prefix: fa; padding: $gutter-width; overflow-y: auto; background-color: $info-bg; - border-left: 1px solid $border-color; + border-inline-start: 1px solid $border-color; h2 { padding: 8px ($gutter-width + 15px) 8px ($gutter-width - 5px); margin: (-$gutter-width) (-$gutter-width) $gutter-width; diff --git a/build/media_source/com_media/scss/components/_media-toolbar.scss b/build/media_source/com_media/scss/components/_media-toolbar.scss index 282587adccd..5c05a86f656 100644 --- a/build/media_source/com_media/scss/components/_media-toolbar.scss +++ b/build/media_source/com_media/scss/components/_media-toolbar.scss @@ -5,7 +5,7 @@ padding: 0; background-color: $toolbar-bg; border-bottom: 1px solid $border-color; - border-left: 1px solid $border-color; + border-inline-start: 1px solid $border-color; border-radius: $border-radius $border-radius 0 0; box-shadow: 0 -1px 0 0 $border-color; input { @@ -20,7 +20,7 @@ text-align: center; background-color: transparent; border: 0; - border-left: 1px solid $border-color; + border-inline-start: 1px solid $border-color; box-shadow: 1px 0 #fefefe inset; &:hover { background-color: $toolbar-icon-bg-hover; diff --git a/build/media_source/com_media/scss/components/_media-tree.scss b/build/media_source/com_media/scss/components/_media-tree.scss index 9f636af3646..8ad38bde922 100644 --- a/build/media_source/com_media/scss/components/_media-tree.scss +++ b/build/media_source/com_media/scss/components/_media-tree.scss @@ -29,7 +29,7 @@ ul.media-tree { .media-disk-name { padding: 4px 1px; font-size: 1rem; - color: var(--atum-bg-dark); + color: var(--template-bg-dark); &:empty { display: none; @@ -106,7 +106,7 @@ ul.media-tree { padding-right: 2px; font-size: 15px; line-height: normal; - color: var(--atum-bg-dark-60); + color: var(--template-bg-dark-60); vertical-align: middle; } diff --git a/build/media_source/com_menus/css/admin-item-edit_container.css b/build/media_source/com_menus/css/admin-item-edit_container.css index 71d06a51039..ac91fccb18d 100644 --- a/build/media_source/com_menus/css/admin-item-edit_container.css +++ b/build/media_source/com_menus/css/admin-item-edit_container.css @@ -4,20 +4,20 @@ */ .checkbox-toggle { - display: none !important; + display: none !important; } .checkbox-toggle[disabled] ~ .btn-hide { - opacity: 0.5; + opacity: 0.5; } .checkbox-toggle ~ .btn-show { - display: inline; + display: inline; } .checkbox-toggle ~ .btn-hide { - display: none; + display: none; } .checkbox-toggle:checked ~ .btn-show { - display: none; + display: none; } .checkbox-toggle:checked ~ .btn-hide { - display: inline; + display: inline; } diff --git a/build/media_source/com_menus/css/admin-item-edit_modules.css b/build/media_source/com_menus/css/admin-item-edit_modules.css index 9253e7b268c..71008fc67c8 100644 --- a/build/media_source/com_menus/css/admin-item-edit_modules.css +++ b/build/media_source/com_menus/css/admin-item-edit_modules.css @@ -4,14 +4,14 @@ */ ul.horizontal-buttons { - margin-top: 12px; - margin-bottom: 0; - padding-left: 10px; + margin-top: 12px; + margin-bottom: 0; + padding-left: 10px; } ul.horizontal-buttons li { - display: inline-block; - padding-right: 10%; + display: inline-block; + padding-right: 10%; } ul.horizontal-buttons li .control-group { - margin-bottom: 0; + margin-bottom: 0; } diff --git a/build/media_source/com_templates/css/admin-templates-default.css b/build/media_source/com_templates/css/admin-templates-default.css index a6a640e14af..5f930753fff 100644 --- a/build/media_source/com_templates/css/admin-templates-default.css +++ b/build/media_source/com_templates/css/admin-templates-default.css @@ -4,122 +4,122 @@ */ .selected { - background: #08c; - color: #fff; + background: #08c; + color: #fff; } .selected:hover, .selected:focus { - background: #08c !important; - color: #fff; + background: #08c !important; + color: #fff; } #deleteFolder { - margin: 0; + margin: 0; } #image-crop { - max-width: 100% !important; - width: auto; - height: auto; + max-width: 100% !important; + width: auto; + height: auto; } .tree-holder { - overflow-x: auto; + overflow-x: auto; } .modal-body .tree-holder { - max-height: 60vh; + max-height: 60vh; } @media (max-width: 768px) { - .modal-title { - font-size: 1rem; - } - .modal-body .tree-holder { - max-height: 12vh; - margin-bottom: 20px; - } - .modal-body .card-body { - padding: .75rem; - } - .modal-body .col-md-4, - .modal-body .col-md-8 { - padding-left: 0; - padding-right: 0; - } - .card-body .mt-2 { - font-size: 12px; - } + .modal-title { + font-size: 1rem; + } + .modal-body .tree-holder { + max-height: 12vh; + margin-bottom: 20px; + } + .modal-body .card-body { + padding: .75rem; + } + .modal-body .col-md-4, + .modal-body .col-md-8 { + padding-left: 0; + padding-right: 0; + } + .card-body .mt-2 { + font-size: 12px; + } } .treeselect a { - display: block; + display: block; } .diffview { - white-space: pre-wrap; - word-wrap: break-word; - display: inline; - padding: 4px; - border-radius: .2em; + white-space: pre-wrap; + word-wrap: break-word; + display: inline; + padding: 4px; + border-radius: .2em; } .diff-pane { - height: 350px; - border: 0.5px solid grey; - overflow: auto; - padding: 10px; - background-color: #FFF; + height: 350px; + border: 0.5px solid grey; + overflow: auto; + padding: 10px; + background-color: #FFF; } #diff-main.active { - display: block; + display: block; } #diff-main { - display: none; + display: none; } #core-pane.active { - display: block; + display: block; } #core-pane { - display: none; + display: none; } #core-pane .CodeMirror-code { - background-color: #F0F0EE; + background-color: #F0F0EE; } #jform_show_core { - display: inline; + display: inline; } #jform_show_diff { - display: inline; - margin-left: 3.5em; + display: inline; + margin-left: 3.5em; } .switcher-label-0, .switcher-label-1 { - white-space: nowrap; + white-space: nowrap; } /* RTL overrides for templates editing*/ [dir=rtl] .diff-pane { - text-align: left; + text-align: left; } [dir=rtl] #core-pane textarea, #override-pane textarea { - text-align: left; + text-align: left; } [dir=rtl] #core-pane joomla-editor-codemirror, #override-pane joomla-editor-codemirror { - text-align: left; + text-align: left; } [dir=rtl] #toggle-buttons { - text-align: right !important; + text-align: right !important; } diff --git a/build/media_source/mod_languages/css/template.css b/build/media_source/mod_languages/css/template.css index 90bdfbaf5fe..be63278020a 100644 --- a/build/media_source/mod_languages/css/template.css +++ b/build/media_source/mod_languages/css/template.css @@ -1,56 +1,46 @@ div.mod-languages ul { - margin: 0; - padding: 0; - list-style:none; + padding: 0; + margin: 0; + list-style: none; } div.mod-languages li { - margin-left: .3em; - margin-right: .3em; + margin: 0 .5rem; } -div.mod-languages li:last-of-type { - margin-bottom: .6em; +div.mod-languages ul.lang-inline li { + display: inline-block; } -div.mod-languages ul.lang-inline li { - display:inline-block; +div.mod-languages .dropdown-menu { + padding: .5rem 0; } div.mod-languages ul.lang-block li { - display: block; + display: block; + padding: .5rem 0; + text-align: start; } -html[dir=rtl] div.mod-languages ul.lang-block li { - text-align: right; +div.mod-languages ul li.lang-active { + background-color: #f0f0f0; } div.mod-languages img { - border: none; - display: inline-block; + display: inline-block; + border: none; } div.mod-languages a { - text-decoration: none; + padding: .5rem; + text-decoration: none; } div.mod-languages .btn-group { - display: flex !important; + display: flex !important; + margin: 0; } div.mod-languages .btn-group .btn { - flex: none; -} - -div.mod-languages .dropdown-menu { - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.16), 0 2px 4px rgba(0, 0, 0, 0.23); -} - -div.mod-languages .dropdown-menu::after { - top: -1.4rem; -} - -html[dir=rtl] div.mod-languages .dropdown-menu::after { - left: auto; - right: .9em; + flex: none; } diff --git a/build/media_source/plg_content_vote/css/rating.css b/build/media_source/plg_content_vote/css/rating.css index ce42d7ec31b..671818a6e5e 100644 --- a/build/media_source/plg_content_vote/css/rating.css +++ b/build/media_source/plg_content_vote/css/rating.css @@ -1,48 +1,33 @@ -[dir=ltr] .content_rating ul { - list-style: none; - padding-left: 0; - margin-bottom: 0.5em; +.content_rating ul { + list-style: none; + padding-inline-start: 0; + margin-bottom: 0.5em; } -[dir=rtl] .content_rating ul { - list-style: none; - padding-right: 0; - margin-bottom: 0.5em; +.content_rating .vote-star, +.content_rating .vote-star-empty, +.content_rating .vote-star-half { + display: inline-block; } -.content_rating .vote-star { - display: inline-block; -} - -.content_rating .vote-star svg { - width: 1em; - height: 1em; - fill: #fd7e14; -} - -.content_rating .vote-star-empty { - display: inline-block; +.content_rating .vote-star svg, +.content_rating .vote-star-half svg { + width: 1em; + height: 1em; + fill: #fd7e14; } .content_rating .vote-star-empty svg { - width: 1em; - height: 1em; - fill: #d3d3d3; + width: 1em; + height: 1em; + fill: #d3d3d3; } -[dir=ltr] .content_rating .vote-star-half { - display: inline-block; - margin-left: -1em; +.content_rating .vote-star-half { + margin-inline-start: -1em; } [dir=rtl] .content_rating .vote-star-half { - display: inline-block; - margin-right: -1em; - transform: scaleX(-1); + transform: scaleX(-1); } -.content_rating .vote-star-half svg { - width: 1em; - height: 1em; - fill: #fd7e14; -} diff --git a/build/media_source/plg_editors_codemirror/css/codemirror.css b/build/media_source/plg_editors_codemirror/css/codemirror.css index 9a9df372e29..80be033806a 100644 --- a/build/media_source/plg_editors_codemirror/css/codemirror.css +++ b/build/media_source/plg_editors_codemirror/css/codemirror.css @@ -4,41 +4,41 @@ */ .CodeMirror { - margin-bottom: 15px; - border: 1px solid #ccc; + margin-bottom: 15px; + border: 1px solid #ccc; } /* In order to hide the Joomla menu */ .CodeMirror-fullscreen { - z-index: 1040; + z-index: 1040; } /* Make the fold marker a little more visible/nice */ .CodeMirror-foldmarker { - background: rgb(255,128,0); - background: rgba(255,128,0,.5); - box-shadow: inset 0 0 2px rgba(255,255,255,.5); - font-family: serif; - font-size: 90%; - border-radius: 1em; - padding: 0 1em; - vertical-align: middle; - color: white; - text-shadow: none; + background: rgb(255,128,0); + background: rgba(255,128,0,.5); + box-shadow: inset 0 0 2px rgba(255,255,255,.5); + font-family: serif; + font-size: 90%; + border-radius: 1em; + padding: 0 1em; + vertical-align: middle; + color: white; + text-shadow: none; } .CodeMirror-foldgutter, .CodeMirror-markergutter { - width: 1.2em; - text-align: center; + width: 1.2em; + text-align: center; } .CodeMirror-markergutter { - cursor: pointer; + cursor: pointer; } .CodeMirror-markergutter-mark { - cursor: pointer; - text-align: center; + cursor: pointer; + text-align: center; } .CodeMirror-markergutter-mark:after { - content: "\25CF"; + content: "\25CF"; } diff --git a/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js b/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js index c4238cbc1ff..c3f6b9c291d 100644 --- a/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js +++ b/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js @@ -41,8 +41,8 @@ Joomla = window.Joomla || {}; const button = document.querySelector('#select-file-button'); const returnUrl = document.querySelector('#installer-return').value; const progress = document.getElementById('upload-progress'); - const progressBar = progress.querySelectorAll('.bar')[0]; - const percentage = progress.querySelectorAll('.uploading-number')[0]; + const progressBar = progress.querySelector('.progress-bar'); + const percentage = progress.querySelector('.uploading-number'); let uploadUrl = 'index.php?option=com_installer&task=install.ajax_upload'; function showError(res) { @@ -139,7 +139,7 @@ Joomla = window.Joomla || {}; if (evt.lengthComputable) { const percentComplete = evt.loaded / evt.total; const number = Math.round(percentComplete * 100); - progressBar.css('width', `${number}%`); + progressBar.style.width = `${number}%`; progressBar.setAttribute('aria-valuenow', number); percentage.textContent = `${number}`; if (number === 100) { @@ -153,8 +153,9 @@ Joomla = window.Joomla || {}; method: 'POST', perform: true, data, - headers: { 'Content-Type': 'false' }, - uploadProgressCallback: progressCallback, + onBefore: (xhr) => { + xhr.upload.addEventListener('progress', progressCallback); + }, onSuccess: (response) => { if (!response) { showError(response); diff --git a/build/media_source/plg_installer_webinstaller/js/client.es6.js b/build/media_source/plg_installer_webinstaller/js/client.es6.js index 7485530af47..95838a158a5 100644 --- a/build/media_source/plg_installer_webinstaller/js/client.es6.js +++ b/build/media_source/plg_installer_webinstaller/js/client.es6.js @@ -401,7 +401,7 @@ class WebInstaller { customElements.whenDefined('joomla-tab').then(() => { const installerTabs = document.getElementById('myTab'); - const link = installerTabs.querySelector('#tab-web'); + const link = installerTabs.querySelector('button[aria-controls=web]'); // Abort if the IFW tab cannot be found if (!link) { @@ -412,7 +412,7 @@ customElements.whenDefined('joomla-tab').then(() => { link.click(); } - if (link.hasAttribute('active') && !instance) { + if (link.hasAttribute('aria-expanded') && link.getAttribute('aria-expanded') === 'true' && !instance) { instance = new WebInstaller(); instance.initialise(); } diff --git a/build/media_source/plg_installer_webinstaller/scss/client.scss b/build/media_source/plg_installer_webinstaller/scss/client.scss index 1a7de3c4a93..bb4197bc898 100644 --- a/build/media_source/plg_installer_webinstaller/scss/client.scss +++ b/build/media_source/plg_installer_webinstaller/scss/client.scss @@ -122,16 +122,16 @@ $extension-types: ( .input-group-append { button#search-extensions { - color: var(--atum-text-light); - background-color: var(--atum-link-color); - border-color: var(--atum-link-color); + color: var(--template-text-light); + background-color: var(--template-link-color); + border-color: var(--template-link-color); border-top-left-radius: 0; border-bottom-left-radius: 0; } button#search-reset { margin-inline-start: .8rem; - background-color: var(--atum-bg-dark); + background-color: var(--template-bg-dark); border-radius: .25rem; } } diff --git a/build/media_source/plg_media-action_crop/js/crop.es6.js b/build/media_source/plg_media-action_crop/js/crop.es6.js index 48cb340273d..5b5436c9ad3 100644 --- a/build/media_source/plg_media-action_crop/js/crop.es6.js +++ b/build/media_source/plg_media-action_crop/js/crop.es6.js @@ -2,93 +2,99 @@ * @copyright (C) 2018 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ - /* global Cropper */ +let formElements; +let activated = false; +let instance; -Joomla = window.Joomla || {}; - -Joomla.MediaManager = Joomla.MediaManager || {}; -Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {}; - -(() => { - 'use strict'; +const addListeners = () => { + formElements.cropX.addEventListener('change', ({ currentTarget }) => { + instance.setData({ x: parseInt(currentTarget.value, 10) }); + }); + formElements.cropY.addEventListener('change', ({ currentTarget }) => { + instance.setData({ y: parseInt(currentTarget.value, 10) }); + }); + formElements.cropWidth.addEventListener('change', ({ currentTarget }) => { + instance.setData({ width: parseInt(currentTarget.value, 10) }); + }); + formElements.cropHeight.addEventListener('change', ({ currentTarget }) => { + instance.setData({ height: parseInt(currentTarget.value, 10) }); + }); + formElements.aspectRatio.addEventListener('change', ({ currentTarget }) => { + instance.setAspectRatio(currentTarget.value); + }); + activated = true; +}; - const initCrop = () => { - const image = document.getElementById('image-preview'); +const init = (image) => { + // Set default aspect ratio after numeric check, option has a dummy value + const defaultCropFactor = image.naturalWidth / image.naturalHeight; + if (!Number.isNaN(defaultCropFactor) && Number.isFinite(defaultCropFactor)) { + formElements.cropAspectRatioOption.value = defaultCropFactor; + } - // Initiate the cropper - Joomla.MediaManager.Edit.crop.cropper = new Cropper(image, { - viewMode: 1, - responsive: true, - restore: true, - autoCrop: true, - movable: false, - zoomable: false, - rotatable: false, - autoCropArea: 1, - // scalable: false, - minContainerWidth: image.offsetWidth, - minContainerHeight: image.offsetHeight, - crop(e) { - document.getElementById('jform_crop_x').value = Math.round(e.detail.x); - document.getElementById('jform_crop_y').value = Math.round(e.detail.y); - document.getElementById('jform_crop_width').value = Math.round(e.detail.width); - document.getElementById('jform_crop_height').value = Math.round(e.detail.height); + // Initiate the cropper + instance = new Cropper(image, { + viewMode: 1, + responsive: true, + restore: true, + autoCrop: true, + movable: false, + zoomable: false, + rotatable: false, + autoCropArea: 1, + // scalable: false, + crop(e) { + formElements.cropX.value = Math.round(e.detail.x); + formElements.cropY.value = Math.round(e.detail.y); + formElements.cropWidth.value = Math.round(e.detail.width); + formElements.cropHeight.value = Math.round(e.detail.height); + const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; + const quality = formElements.cropQuality.value; - const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; + // Update the store + Joomla.MediaManager.Edit.current.contents = this.cropper.getCroppedCanvas().toDataURL(`image/${format}`, quality); - const quality = document.getElementById('jform_crop_quality').value; - - // Update the store - Joomla.MediaManager.Edit.current.contents = this.cropper.getCroppedCanvas().toDataURL(`image/${format}`, quality); - - // Notify the app that a change has been made - window.dispatchEvent(new Event('mediaManager.history.point')); - }, - }); + // Notify the app that a change has been made + window.dispatchEvent(new Event('mediaManager.history.point')); + }, + }); - document.getElementById('jform_crop_x').addEventListener('change', ({ target }) => { - Joomla.MediaManager.Edit.crop.cropper.setData({ x: parseInt(target.value, 10) }); - }); - document.getElementById('jform_crop_y').addEventListener('change', ({ target }) => { - Joomla.MediaManager.Edit.crop.cropper.setData({ y: parseInt(target.value, 10) }); - }); - document.getElementById('jform_crop_width').addEventListener('change', ({ target }) => { - Joomla.MediaManager.Edit.crop.cropper.setData({ width: parseInt(target.value, 10) }); - }); - document.getElementById('jform_crop_height').addEventListener('change', ({ target }) => { - Joomla.MediaManager.Edit.crop.cropper.setData({ height: parseInt(target.value, 10) }); - }); - document.getElementById('jform_aspectRatio').addEventListener('change', ({ target }) => { - Joomla.MediaManager.Edit.crop.cropper.setAspectRatio(target.value); - }); + // Add listeners + if (!activated) { + addListeners(); + } - // Wait for the image to load its data - image.addEventListener('load', () => { - // Get all option elements if future need - const elements = [].slice.call(document.querySelectorAll('.crop-aspect-ratio-option')); + instance.setAspectRatio(formElements.cropAspectRatioOption.value); +}; - // Set default aspect ratio after numeric check, option has a dummy value - const defaultCropFactor = image.naturalWidth / image.naturalHeight; - if (!Number.isNaN(defaultCropFactor) && Number.isFinite(defaultCropFactor)) { - elements[0].value = defaultCropFactor; - } - Joomla.MediaManager.Edit.crop.cropper.setAspectRatio(elements[0].value); - }); +// Register the Events +window.addEventListener('media-manager-edit-init', () => { + formElements = { + aspectRatio: document.getElementById('jform_aspectRatio'), + cropHeight: document.getElementById('jform_crop_height'), + cropWidth: document.getElementById('jform_crop_width'), + cropY: document.getElementById('jform_crop_y'), + cropX: document.getElementById('jform_crop_x'), + cropQuality: document.getElementById('jform_crop_quality'), + cropAspectRatioOption: document.querySelector('.crop-aspect-ratio-option'), }; + Joomla.MediaManager.Edit.plugins.crop = { + Activate(image) { + return new Promise((resolve /* , reject */) => { + init(image); - // Register the Events - Joomla.MediaManager.Edit.crop = { - Activate(mediaData) { - // Initialize - initCrop(mediaData); + resolve(); + }); }, - Deactivate() { - if (!Joomla.MediaManager.Edit.crop.cropper) { - return; - } - // Destroy the instance - Joomla.MediaManager.Edit.crop.cropper.destroy(); + Deactivate(image) { + return new Promise((resolve /* , reject */) => { + if (image.cropper) { + image.cropper.destroy(); + instance = null; + } + resolve(); + }); }, }; -})(); +}, { once: true }); diff --git a/build/media_source/plg_media-action_resize/js/resize.es6.js b/build/media_source/plg_media-action_resize/js/resize.es6.js index dd7544e9f2d..b41a0b98212 100644 --- a/build/media_source/plg_media-action_resize/js/resize.es6.js +++ b/build/media_source/plg_media-action_resize/js/resize.es6.js @@ -2,85 +2,93 @@ * @copyright (C) 2018 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -Joomla = window.Joomla || {}; - -Joomla.MediaManager = Joomla.MediaManager || {}; -Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {}; - -(() => { - 'use strict'; - - // Update image - const resize = (width, height) => { - // The image element - const image = document.getElementById('image-source'); - - // The canvas where we will resize the image - const canvas = document.createElement('canvas'); - canvas.width = width; - canvas.height = height; - canvas.getContext('2d').drawImage(image, 0, 0, width, height); - - // The format - const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; - - // The quality - const quality = document.getElementById('jform_resize_quality').value; - - // Creating the data from the canvas - Joomla.MediaManager.Edit.current.contents = canvas.toDataURL(`image/${format}`, quality); - - // Updating the preview element - const preview = document.getElementById('image-preview'); - preview.width = width; - preview.height = height; - preview.src = Joomla.MediaManager.Edit.current.contents; - - // Update the width input box - document.getElementById('jform_resize_width').value = parseInt(width, 10); - - // Update the height input box - document.getElementById('jform_resize_height').value = parseInt(height, 10); - - // Notify the app that a change has been made - window.dispatchEvent(new Event('mediaManager.history.point')); - }; - - const initResize = () => { - const funct = () => { - const image = document.getElementById('image-source'); - - const resizeWidthInputBox = document.getElementById('jform_resize_width'); - const resizeHeightInputBox = document.getElementById('jform_resize_height'); - - // Update the input boxes - resizeWidthInputBox.value = image.width; - resizeHeightInputBox.value = image.height; - - // The listeners - resizeWidthInputBox.addEventListener('change', ({ target }) => { - resize( - parseInt(target.value, 10), - parseInt(target.value, 10) / (image.width / image.height), - ); - }); - resizeHeightInputBox.addEventListener('change', ({ target }) => { - resize( - parseInt(target.value, 10) * (image.width / image.height), - parseInt(target.value, 10), - ); - }); - }; - setTimeout(funct, 1000); +let formElements; +let activated = false; + +// Update image +const resize = (width, height, image) => { + // The canvas where we will resize the image + let canvas = document.createElement('canvas'); + canvas.width = width; + canvas.height = height; + canvas.getContext('2d').drawImage(image, 0, 0, width, height); + + // The format + const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : Joomla.MediaManager.Edit.original.extension; + + // The quality + const quality = formElements.resizeQuality.value; + + // Creating the data from the canvas + Joomla.MediaManager.Edit.current.contents = canvas.toDataURL(`image/${format}`, quality); + + // Updating the preview element + image.width = width; + image.height = height; + image.src = Joomla.MediaManager.Edit.current.contents; + + // Update the width input box + formElements.resizeWidth.value = parseInt(width, 10); + + // Update the height input box + formElements.resizeHeight.value = parseInt(height, 10); + + // Notify the app that a change has been made + window.dispatchEvent(new Event('mediaManager.history.point')); + + canvas = null; +}; + +const addListeners = (image) => { + // The listeners + formElements.resizeWidth.addEventListener('change', ({ target }) => { + resize( + parseInt(target.value, 10), + parseInt(target.value, 10) / (image.width / image.height), + image, + ); + }); + formElements.resizeHeight.addEventListener('change', ({ target }) => { + resize( + parseInt(target.value, 10) * (image.width / image.height), + parseInt(target.value, 10), + image, + ); + }); +}; + +const initResize = (image) => { + // Update the input boxes + formElements.resizeWidth.value = image.naturalWidth; + formElements.resizeHeight.value = image.naturalHeight; + + if (!activated) { + activated = true; + addListeners(image); + } +}; + +window.addEventListener('media-manager-edit-init', () => { + // Get the form elements + formElements = { + resizeWidth: document.getElementById('jform_resize_width'), + resizeHeight: document.getElementById('jform_resize_height'), + resizeQuality: document.getElementById('jform_resize_quality'), }; // Register the Events - Joomla.MediaManager.Edit.resize = { - Activate(mediaData) { - // Initialize - initResize(mediaData); + Joomla.MediaManager.Edit.plugins.resize = { + Activate(image) { + return new Promise((resolve /* , reject */) => { + // Initialize + initResize(image); + resolve(); + }); }, - Deactivate() { + Deactivate(/* image */) { + return new Promise((resolve /* , reject */) => { + resolve(); + }); }, }; -})(); +}, { once: true }); diff --git a/build/media_source/plg_media-action_rotate/js/rotate.es6.js b/build/media_source/plg_media-action_rotate/js/rotate.es6.js index 71441c86c1a..05e6257884c 100644 --- a/build/media_source/plg_media-action_rotate/js/rotate.es6.js +++ b/build/media_source/plg_media-action_rotate/js/rotate.es6.js @@ -2,95 +2,106 @@ * @copyright (C) 2018 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -Joomla = window.Joomla || {}; +let activated = false; -Joomla.MediaManager = Joomla.MediaManager || {}; -Joomla.MediaManager.Edit = Joomla.MediaManager.Edit || {}; +// Update image +const rotate = (angle, image) => { + // The canvas where we will rotate the image + let canvas = document.createElement('canvas'); -(() => { - 'use strict'; + // Pseudo rectangle calculation + if ((angle >= 0 && angle < 45) + || (angle >= 135 && angle < 225) + || (angle >= 315 && angle <= 360)) { + canvas.width = image.naturalWidth; + canvas.height = image.naturalHeight; + } else { + // swap + canvas.width = image.naturalHeight; + canvas.height = image.naturalWidth; + } - // Update image - const rotate = (angle) => { - // The image element - const image = document.getElementById('image-source'); + const ctx = canvas.getContext('2d'); + ctx.clearRect(0, 0, canvas.width, canvas.height); + ctx.translate(canvas.width / 2, canvas.height / 2); + ctx.rotate((angle * Math.PI) / 180); + ctx.drawImage(image, -image.naturalWidth / 2, -image.naturalHeight / 2); - // The canvas where we will resize the image - const canvas = document.createElement('canvas'); + // The format + const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : 'jpg'; - // Pseudo rectangle calculation - if ((angle >= 0 && angle < 45) - || (angle >= 135 && angle < 225) - || (angle >= 315 && angle <= 360)) { - canvas.width = image.width; - canvas.height = image.height; - } else { - // swap - canvas.width = image.height; - canvas.height = image.width; - } - const ctx = canvas.getContext('2d'); - ctx.translate(canvas.width / 2, canvas.height / 2); - ctx.rotate((angle * Math.PI) / 180); - ctx.drawImage(image, -image.width / 2, -image.height / 2); + // The quality + const quality = document.getElementById('jform_rotate_quality').value; - // The format - const format = Joomla.MediaManager.Edit.original.extension === 'jpg' ? 'jpeg' : 'jpg'; + // Creating the data from the canvas + Joomla.MediaManager.Edit.current.contents = canvas.toDataURL(`image/${format}`, quality); - // The quality - const quality = document.getElementById('jform_rotate_quality').value; + // Updating the preview element + image.width = canvas.width; + image.height = canvas.height; + image.src = ''; + requestAnimationFrame( + () => requestAnimationFrame(() => { + image.src = Joomla.MediaManager.Edit.current.contents; + }), + ); - // Creating the data from the canvas - Joomla.MediaManager.Edit.current.contents = canvas.toDataURL(`image/${format}`, quality); + // Update the angle input box + document.getElementById('jform_rotate_a').value = angle; - // Updating the preview element - const preview = document.getElementById('image-preview'); - preview.width = canvas.width; - preview.height = canvas.height; - preview.src = Joomla.MediaManager.Edit.current.contents; + // Notify the app that a change has been made + window.dispatchEvent(new Event('mediaManager.history.point')); + canvas = null; +}; - // Update the height input box - document.getElementById('jform_rotate_a').value = angle; +const initRotate = (image) => { + if (!activated) { + // The number input listener + document.getElementById('jform_rotate_a').addEventListener('change', ({ target }) => { + rotate(parseInt(target.value, 10), image); - // Notify the app that a change has been made - window.dispatchEvent(new Event('mediaManager.history.point')); - }; - - const initRotate = () => { - const funct = () => { - // The number input listener - document.getElementById('jform_rotate_a').addEventListener('input', ({ target }) => { - rotate(parseInt(target.value, 10)); - - // Deselect all buttons - const elements = [].slice.call(document.querySelectorAll('#jform_rotate_distinct label')); - elements.forEach((element) => { + target.value = 0; + // Deselect all buttons + [].slice.call(document.querySelectorAll('#jform_rotate_distinct label')) + .forEach((element) => { element.classList.remove('active'); element.classList.remove('focus'); }); - }); + }); - // The 90 degree rotate buttons listeners - const elements = [].slice.call(document.querySelectorAll('#jform_rotate_distinct label')); - elements.forEach((element) => { + // The 90 degree rotate buttons listeners + [].slice.call(document.querySelectorAll('#jform_rotate_distinct [type=radio]')) + .forEach((element) => { element.addEventListener('click', ({ target }) => { - const inputElement = document.querySelector(`#${target.getAttribute('for')}`); - if (inputElement) { - rotate(parseInt(inputElement.value, 10)); - } + rotate(parseInt(target.value, 10), image); + + // Deselect all buttons + [].slice.call(document.querySelectorAll('#jform_rotate_distinct label')) + .forEach((el) => { + el.classList.remove('active'); + el.classList.remove('focus'); + }); }); }); - }; - setTimeout(funct, 1000); - }; + activated = true; + } +}; + +window.addEventListener('media-manager-edit-init', () => { // Register the Events - Joomla.MediaManager.Edit.rotate = { - Activate(mediaData) { - // Initialize - initRotate(mediaData); + Joomla.MediaManager.Edit.plugins.rotate = { + Activate(image) { + return new Promise((resolve) => { + // Initialize + initRotate(image); + resolve(); + }); }, - Deactivate() { + Deactivate(/* image */) { + return new Promise((resolve) => { + resolve(); + }); }, }; -})(); +}, { once: true }); diff --git a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js index e448213962c..5ace8d26e99 100644 --- a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js +++ b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js @@ -3,12 +3,11 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Ajax call to get the update status of the installed extensions (() => { 'use strict'; - // Add a listener on content loaded to initiate the check - document.addEventListener('DOMContentLoaded', () => { + // Ajax call to get the update status of the installed extensions + const fetchUpdate = () => { if (Joomla.getOptions('js-extensions-update')) { const options = Joomla.getOptions('js-extensions-update'); @@ -52,5 +51,10 @@ }, }); } + }; + + // Give some times to the layout and other scripts to settle their stuff + window.addEventListener('load', () => { + setTimeout(fetchUpdate, 330); }); })(); diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js index f0717d75c80..4167927bdd4 100644 --- a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js +++ b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js @@ -4,8 +4,6 @@ */ if (Joomla && Joomla.getOptions('js-extensions-update')) { - const options = Joomla.getOptions('js-joomla-update'); - const update = (type, text) => { const link = document.getElementById('plg_quickicon_joomlaupdate'); const linkSpans = [].slice.call(link.querySelectorAll('span.j-links-link')); @@ -20,34 +18,43 @@ if (Joomla && Joomla.getOptions('js-extensions-update')) { } }; - fetch(options.ajaxUrl, { method: 'GET' }) - .then((response) => { - response.json().then((updateInfoList) => { - if (Array.isArray(updateInfoList)) { - if (updateInfoList.length === 0) { - // No updates - update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE')); - } else { - const updateInfo = updateInfoList.shift(); + const fetchUpdate = () => { + const options = Joomla.getOptions('js-joomla-update'); - if (updateInfo.version !== options.version) { - update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', ` \u200E ${updateInfo.version}`)); - } else { + fetch(options.ajaxUrl, { method: 'GET' }) + .then((response) => { + response.json().then((updateInfoList) => { + if (Array.isArray(updateInfoList)) { + if (updateInfoList.length === 0) { + // No updates update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE')); + } else { + const updateInfo = updateInfoList.shift(); + + if (updateInfo.version !== options.version) { + update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND').replace('%s', ` \u200E ${updateInfo.version}`)); + } else { + update('success', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE')); + } } + } else { + // An error occurred + update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); } - } else { - // An error occurred - update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); - } + }) + .catch(() => { + // An error occurred + update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); + }); }) - .catch(() => { - // An error occurred - update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); - }); - }) - .catch(() => { - // An error occurred - update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); - }); + .catch(() => { + // An error occurred + update('danger', Joomla.Text._('PLG_QUICKICON_JOOMLAUPDATE_ERROR')); + }); + }; + + // Give some times to the layout and other scripts to settle their stuff + window.addEventListener('load', () => { + setTimeout(fetchUpdate, 300); + }); } diff --git a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js index f243aa3cca3..059fec48f46 100644 --- a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js +++ b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js @@ -3,12 +3,11 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// Ajax call to get the override status. (() => { 'use strict'; - // Add a listener on content loaded to initiate the check. - document.addEventListener('DOMContentLoaded', () => { + // Ajax call to get the override status. + const checkOverride = () => { if (Joomla.getOptions('js-override-check')) { const options = Joomla.getOptions('js-override-check'); const update = (type, text, linkHref) => { @@ -62,5 +61,10 @@ }, }); } + }; + + // Give some times to the layout and other scripts to settle their stuff + window.addEventListener('load', () => { + setTimeout(checkOverride, 390); }); })(); diff --git a/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js b/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js index e3fd990010b..3b5fd16bf9c 100644 --- a/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js +++ b/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js @@ -6,7 +6,7 @@ ((document) => { 'use strict'; - document.addEventListener('DOMContentLoaded', () => { + const checkPrivacy = () => { const variables = Joomla.getOptions('js-privacy-check'); const ajaxUrl = variables.plg_quickicon_privacycheck_ajax_url; const url = variables.plg_quickicon_privacycheck_url; @@ -67,5 +67,10 @@ link.textContent = text.ERROR; }, }); + }; + + // Give some times to the layout and other scripts to settle their stuff + window.addEventListener('load', () => { + setTimeout(checkPrivacy, 360); }); })(document); diff --git a/build/media_source/plg_system_debug/css/debug.css b/build/media_source/plg_system_debug/css/debug.css index 335bc64f086..630330f1e9f 100644 --- a/build/media_source/plg_system_debug/css/debug.css +++ b/build/media_source/plg_system_debug/css/debug.css @@ -1,14 +1,14 @@ /** - * @copyright (C) 2012 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2012 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ /* Debug Bar */ .phpdebugbar-badge { - color: white !important; - background-color: rgb(40,70,106) !important; + color: white !important; + background-color: rgb(40,70,106) !important; } div.phpdebugbar-header, a.phpdebugbar-restore-btn { - background: #efefef url("data:image/svg+xml;utf8,") no-repeat 5px 4px / 20px 20px !important; + background: #efefef url("data:image/svg+xml;utf8,") no-repeat 5px 4px / 20px 20px !important; } diff --git a/build/media_source/system/css/calendar-jos.css b/build/media_source/system/css/calendar-jos.css index 8c19bf382bc..83110eeaaab 100644 --- a/build/media_source/system/css/calendar-jos.css +++ b/build/media_source/system/css/calendar-jos.css @@ -1,183 +1,183 @@ /** - * @copyright (C) 2007 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2007 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ /* The main calendar widget. DIV containing a table. */ div.calendar { - position: relative; - z-index: 10000; - width: 226px; + position: relative; + z-index: 10000; + width: 226px; } .calendar, .calendar table { - border: 1px solid #cccccc; - font-size: 11px; - color: #000; - cursor: default; - background: #efefef; - font-family: arial,verdana,sans-serif; + border: 1px solid #cccccc; + font-size: 11px; + color: #000; + cursor: default; + background: #efefef; + font-family: arial,verdana,sans-serif; } /* Header part -- contains navigation buttons and day names. */ .calendar .button { /* "<<", "<", ">", ">>" buttons have this class */ - text-align: center; /* They are the navigation buttons */ - padding: 2px; /* Make the buttons seem like they're pressing */ + text-align: center; /* They are the navigation buttons */ + padding: 2px; /* Make the buttons seem like they're pressing */ } .calendar thead .title { /* This holds the current "month, year" */ - font-weight: bold; /* Pressing it will take you to the current date */ - text-align: center; - background: #333333; - color: #ffffff; - padding: 2px; + font-weight: bold; /* Pressing it will take you to the current date */ + text-align: center; + background: #333333; + color: #ffffff; + padding: 2px; } .calendar thead .headrow { /* Row containing navigation buttons */ - background: #dedede; - color: #000; + background: #dedede; + color: #000; } .calendar thead .name { /* Cells containing the day names */ - border-bottom: 1px solid #cccccc; - padding: 2px; - text-align: center; - color: #000; + border-bottom: 1px solid #cccccc; + padding: 2px; + text-align: center; + color: #000; } .calendar thead .weekend { /* How a weekend day name shows in header */ - color: #999; + color: #999; } .calendar thead .hilite { /* How do the buttons in header appear when hover */ - background: #bbbbbb; - color: #000000; - border: 1px solid #cccccc; - padding: 1px; + background: #bbbbbb; + color: #000000; + border: 1px solid #cccccc; + padding: 1px; } .calendar thead .active { /* Active (pressed) buttons in header */ - background: #c77; - padding: 2px 0 0 2px; + background: #c77; + padding: 2px 0 0 2px; } .calendar thead .daynames { /* Row containing the day names */ - background: #dddddd; + background: #dddddd; } /* The body part -- contains all the days in month. */ .calendar tbody .day { /* Cells containing month days dates */ - width: 2em; - text-align: right; - padding: 2px 4px 2px 2px; + width: 2em; + text-align: right; + padding: 2px 4px 2px 2px; } .calendar table .wn { - padding: 2px 3px 2px 2px; - border-right: 1px solid #cccccc; - background: #dddddd; + padding: 2px 3px 2px 2px; + border-right: 1px solid #cccccc; + background: #dddddd; } .calendar tbody .rowhilite td { - background: #666666; - color: #ffffff; + background: #666666; + color: #ffffff; } .calendar tbody .rowhilite td.wn { - background: #666666; - color: #ffffff; + background: #666666; + color: #ffffff; } .calendar tbody td.active { /* Active (pressed) cells */ - background: #000000; - color: #ffffff; + background: #000000; + color: #ffffff; } .calendar tbody td.weekend { /* Cells showing weekend days */ - color: #999; + color: #999; } .calendar tbody td.selected { /* Cell showing today date */ - font-weight: bold; - background: #000000; - color: #ffffff; + font-weight: bold; + background: #000000; + color: #ffffff; } .calendar tbody td.hilite { /* Hovered cells */ - background: #999999; - color: #ffffff; + background: #999999; + color: #ffffff; } .calendar tbody td.today { - font-weight: bold; + font-weight: bold; } .calendar tbody .disabled { - color: #999; + color: #999; } .calendar tbody .emptycell { /* Empty cells (the best is to hide them) */ - visibility: hidden; + visibility: hidden; } .calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */ - display: none; + display: none; } /* The footer part -- status bar and "Close" button */ .calendar tfoot .footrow { /* The in footer (only one right now) */ - text-align: center; - background: #cccccc; - color: #000; + text-align: center; + background: #cccccc; + color: #000; } .calendar tfoot .ttip { /* Tooltip (status bar) cell */ - border-top: 1px solid #cccccc; - background: #efefef; - color: #000000; + border-top: 1px solid #cccccc; + background: #efefef; + color: #000000; } .calendar tfoot .hilite { /* Hover style for buttons in footer */ - background: #666666; - border: 1px solid #f40; - padding: 1px; + background: #666666; + border: 1px solid #f40; + padding: 1px; } .calendar tfoot .active { /* Active (pressed) style for buttons in footer */ - background: #999999; - padding: 2px 0 0 2px; + background: #999999; + padding: 2px 0 0 2px; } /* Combo boxes (menus that display months/years for direct selection) */ .combo { - position: absolute; - display: none; - top: 0; - left: 0; - width: 4em; - cursor: default; - border: 1px solid #655; - background: #ffffff; - color: #000; - font-size: smaller; + position: absolute; + display: none; + top: 0; + left: 0; + width: 4em; + cursor: default; + border: 1px solid #655; + background: #ffffff; + color: #000; + font-size: smaller; } .combo .label { - width: 100%; - text-align: center; + width: 100%; + text-align: center; } .combo .hilite { - background: #fc8; + background: #fc8; } .combo .active { - border-top: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; - background: #efefef; - font-weight: bold; + border-top: 1px solid #cccccc; + border-bottom: 1px solid #cccccc; + background: #efefef; + font-weight: bold; } diff --git a/build/media_source/system/css/debug.css b/build/media_source/system/css/debug.css index 6032513a735..429a00030bc 100644 --- a/build/media_source/system/css/debug.css +++ b/build/media_source/system/css/debug.css @@ -1,211 +1,211 @@ /** - * @copyright (C) 2012 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2012 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ /* Common CSS for system debug */ div#system-debug { - clear: both; + clear: both; } #system-debug { - background-color: #fff; - color: #000; - border: 1px dashed silver; - padding: 10px; + background-color: #fff; + color: #000; + border: 1px dashed silver; + padding: 10px; } #system-debug div.dbg-header { - background-color: #ddd; - border: 1px solid #eee; - font-size: 16px; + background-color: #ddd; + border: 1px solid #eee; + font-size: 16px; } #system-debug h3 { - margin: 0; + margin: 0; } #system-debug a h3 { - background-color: #ddd; - color: #000; - font-size: 14px; - padding: 5px; - text-decoration: none; - margin: 0; + background-color: #ddd; + color: #000; + font-size: 14px; + padding: 5px; + text-decoration: none; + margin: 0; } #system-debug .dbg-error a h3 { - background-color: red; + background-color: red; } #system-debug a:hover h3, #system-debug a:focus h3 { - background-color: #4d4d4d; - color: #ddd; - font-size: 14px; - cursor: pointer; - text-decoration: none; + background-color: #4d4d4d; + color: #ddd; + font-size: 14px; + cursor: pointer; + text-decoration: none; } #system-debug div.dbg-container { - padding: 10px; + padding: 10px; } #system-debug span.dbg-command { - color: blue; - font-weight: bold; + color: blue; + font-weight: bold; } #system-debug span.dbg-table { - color: green; - font-weight: bold; + color: green; + font-weight: bold; } #system-debug b.dbg-operator { - color: red; - font-weight: bold; + color: red; + font-weight: bold; } #system-debug h1 { - background-color: #2c2c2c; - color: #fff; - padding: 10px; - margin: 0; - font-size: 16px; - line-height: 1em; + background-color: #2c2c2c; + color: #fff; + padding: 10px; + margin: 0; + font-size: 16px; + line-height: 1em; } #system-debug h4 { - font-size: 14px; - font-weight: bold; - margin: 5px 0 0 0; + font-size: 14px; + font-weight: bold; + margin: 5px 0 0 0; } #system-debug h5 { - font-size: 13px; - font-weight: bold; - margin: 5px 0 0 0; + font-size: 13px; + font-weight: bold; + margin: 5px 0 0 0; } div#system-debug { - margin: 5px; + margin: 5px; } #system-debug ol { - margin-left: 25px; - margin-right: 25px; - text-align: left; - direction: ltr; + margin-left: 25px; + margin-right: 25px; + text-align: left; + direction: ltr; } #system-debug ul { - list-style: none; - text-align: left; - direction: ltr; + list-style: none; + text-align: left; + direction: ltr; } #system-debug li { - font-size: 13px; - margin-bottom: 10px; + font-size: 13px; + margin-bottom: 10px; } #system-debug code { - font-size: 13px; - text-align: left; - direction: ltr; + font-size: 13px; + text-align: left; + direction: ltr; } #system-debug p { - font-size: 13px; + font-size: 13px; } #system-debug div.dbg-header.dbg-error { - background-color: red; + background-color: red; } #system-debug .dbg-warning { - color: red; - font-weight: bold; - background-color: #ffffcc !important; + color: red; + font-weight: bold; + background-color: #ffffcc !important; } #system-debug .accordion { - margin-bottom: 0; + margin-bottom: 0; } #system-debug .dbg-noprofile { - text-decoration: line-through; + text-decoration: line-through; } /* dbg-bars */ #system-debug .alert, #system-debug .dbg-bars { - margin-bottom: 10px; + margin-bottom: 10px; } #system-debug .dbg-bar-spacer { - float: left; - height: 100%; + float: left; + height: 100%; } /* dbg-bars-query */ #system-debug .dbg-bars-query .dbg-bar { - opacity: 0.3; - height: 12px; - margin-top: 3px; + opacity: 0.3; + height: 12px; + margin-top: 3px; } #system-debug .dbg-bars-query:hover .dbg-bar { - opacity: 0.6; - height: 18px; - margin-top: 0; + opacity: 0.6; + height: 18px; + margin-top: 0; } #system-debug .dbg-bars-query .dbg-bar:hover, #system-debug .dbg-bars-query .dbg-bar-active, #system-debug .dbg-bars-query:hover .dbg-bar-active { - opacity: 1; - height: 18px; - margin-top: 0; + opacity: 1; + height: 18px; + margin-top: 0; } /* dbg-query-table */ #system-debug table.dbg-query-table { - margin: 0 0 6px; + margin: 0 0 6px; } #system-debug table.dbg-query-table th, #system-debug table.dbg-query-table td { - padding: 3px 8px; + padding: 3px 8px; } #system-debug .dbg-profile-list .label { - display: inline-block; - min-width: 60px; - text-align: right; + display: inline-block; + min-width: 60px; + text-align: right; } #system-debug .dbg-query-memory, #system-debug .dbg-query-rowsnumber { - margin-left: 50px; + margin-left: 50px; } #dbg_container_session pre { - background: white; - border: 0; - margin: 0; - padding: 0; - overflow-wrap: break-word; - white-space: pre-wrap; - word-break: break-word; + background: white; + border: 0; + margin: 0; + padding: 0; + overflow-wrap: break-word; + white-space: pre-wrap; + word-break: break-word; } #dbg_container_session pre .blue { - color:blue; + color:blue; } #dbg_container_session pre .green { - color:green; + color:green; } #dbg_container_session pre .black { - color:black; + color:black; } #dbg_container_session pre .grey { - color:grey; + color:grey; } diff --git a/build/media_source/system/css/fields/calendar-rtl.css b/build/media_source/system/css/fields/calendar-rtl.css index 039cb2f700c..258d4846499 100644 --- a/build/media_source/system/css/fields/calendar-rtl.css +++ b/build/media_source/system/css/fields/calendar-rtl.css @@ -1,173 +1,173 @@ /** - * @copyright (C) 2016 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2016 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ .js-calendar { - box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important; + box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important; } .calendar-container { - float: left; - min-width: 160px; - padding: 0; - list-style: none; - border-radius: 5px; - background-color: #ffffff !important; - z-index: 1100 !important; + float: left; + min-width: 160px; + padding: 0; + list-style: none; + border-radius: 5px; + background-color: #ffffff !important; + z-index: 1100 !important; } .calendar-container table { - table-layout: fixed; - max-width: 262px; - border-radius: 5px; - background-color: #ffffff !important; - z-index: 1100 !important; + table-layout: fixed; + max-width: 262px; + border-radius: 5px; + background-color: #ffffff !important; + z-index: 1100 !important; } /* The main calendar widget. DIV containing a table. */ div.calendar-container table th, .calendar-container table td { - box-shadow: none; - padding: 8px 0; - line-height: 1.1em; - text-align: center; + box-shadow: none; + padding: 8px 0; + line-height: 1.1em; + text-align: center; } div.calendar-container table body td { - line-height: 2em; + line-height: 2em; } .calendar-container table { - border-collapse: separate; + border-collapse: separate; } div.calendar-container table td.title { /* This holds the current "month, year" */ - vertical-align: middle; - text-align: center; + vertical-align: middle; + text-align: center; } .calendar-container table thead td.headrow { /* Row containing navigation buttons */ - background: #fff; - color: #000; + background: #fff; + color: #000; } .calendar-container table thead td.name { /* Cells containing the day names */ - border-bottom: 1px solid #fff; - text-align: center; - color: #000; + border-bottom: 1px solid #fff; + text-align: center; + color: #000; } .calendar-container table thead td.weekend { /* How a weekend day name shows in header */ - color: #999; + color: #999; } /* The body part -- contains all the days in month. */ .calendar-container table tbody td.day { /* Cells containing month days dates */ - text-align: right; + text-align: right; } .calendar-container table tbody td.wn { - background: #fff; + background: #fff; } .calendar-container table tbody td.weekend { /* Cells showing weekend days */ - color: #999; + color: #999; } .calendar-container table tbody td.hilite { /* Hovered cells */ - background: #999999; - color: #ffffff; + background: #999999; + color: #ffffff; } .calendar-container table tbody td.day { - border: 0; - cursor : pointer; - font-size: 12px; - min-width: 38px; + border: 0; + cursor : pointer; + font-size: 12px; + min-width: 38px; } .calendar-container table tbody td.day.wn { - text-align: center; - background-color: #f4f4f4; + text-align: center; + background-color: #f4f4f4; } .calendar-container table tbody td.day.selected { /* Cell showing today date */ - background: #3071a9; - color: #fff; - border: 0; + background: #3071a9; + color: #fff; + border: 0; } .calendar-container table tbody td.today { - position: relative; - height: 100%; - width: auto; - font-weight: bold; + position: relative; + height: 100%; + width: auto; + font-weight: bold; } .calendar-container table tbody td.today:after { - position: absolute; - bottom: 3px; - left: 3px; - right: 3px; - content: ""; - height: 3px; - border-radius: 1.5px; - background-color: #46a546; + position: absolute; + bottom: 3px; + left: 3px; + right: 3px; + content: ""; + height: 3px; + border-radius: 1.5px; + background-color: #46a546; } .calendar-container table tbody td.today.selected:after { - background-color: #fff; + background-color: #fff; } .calendar-container table tbody td.day:hover { - cursor: pointer; - background: #3d8fd7; - color: #fff; + cursor: pointer; + background: #3d8fd7; + color: #fff; } .calendar-container table tbody td.day:hover:after { - background-color: #fff; + background-color: #fff; } .calendar-container table tbody .disabled { - color: #999; - background-color: #fafafa; + color: #999; + background-color: #fafafa; } .calendar-container table tbody .emptycell { /* Empty cells (the best is to hide them) */ - visibility: hidden; + visibility: hidden; } .calendar-container table tbody .emptyrow { /* Empty row (some months need less than 6 rows) */ - display: none; + display: none; } .calendar-container .calendar-head-row td { - padding: 4px 0 !important; - border-bottom: none; + padding: 4px 0 !important; + border-bottom: none; } .calendar-container .day-name { - font-size: 0.7rem; - font-weight: bold; + font-size: 0.7rem; + font-weight: bold; } .calendar-container .time td { - padding: 8px 8px 8px 0; + padding: 8px 8px 8px 0; } .buttons-wrapper { - padding: 5px 5px; - width:100%; + padding: 5px 5px; + width:100%; } .buttons-wrapper .btn { - min-width: 60px; - color: #495057; - border: 1px solid #495057; - margin-left: .5rem; - padding: 0 16px; - line-height: 2.375rem; - box-shadow: 1px 0 1px 1px rgba(0,0,0,.25); + min-width: 60px; + color: #495057; + border: 1px solid #495057; + margin-left: .5rem; + padding: 0 16px; + line-height: 2.375rem; + box-shadow: 1px 0 1px 1px rgba(0,0,0,.25); } .buttons-wrapper .btn:hover { - color: #fff; - background: #1a466b; + color: #fff; + background: #1a466b; } .buttons-wrapper .btn:last-child { - margin-left: 0; + margin-left: 0; } .time .time-title { - background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-position: center; + background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-position: center; } diff --git a/build/media_source/system/css/fields/calendar.css b/build/media_source/system/css/fields/calendar.css index eb438a83251..e04be321dc6 100644 --- a/build/media_source/system/css/fields/calendar.css +++ b/build/media_source/system/css/fields/calendar.css @@ -1,174 +1,174 @@ /** - * @copyright (C) 2016 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2016 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ .js-calendar { - box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important; + box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important; } .calendar-container { - float: left; - min-width: 160px; - padding: 0; - list-style: none; - border-radius: 5px; - background-color: #ffffff !important; - z-index: 1100 !important; + float: left; + min-width: 160px; + padding: 0; + list-style: none; + border-radius: 5px; + background-color: #ffffff !important; + z-index: 1100 !important; } .calendar-container table { - table-layout: fixed; - max-width: 262px; - border-radius: 5px; - background-color: #ffffff !important; - z-index: 1100 !important; + table-layout: fixed; + max-width: 262px; + border-radius: 5px; + background-color: #ffffff !important; + z-index: 1100 !important; } /* The main calendar widget. DIV containing a table. */ div.calendar-container table th, .calendar-container table td { - box-shadow: none; - padding: 8px 0; - line-height: 1.1em; - text-align: center; + box-shadow: none; + padding: 8px 0; + line-height: 1.1em; + text-align: center; } div.calendar-container table body td { - line-height: 2em; + line-height: 2em; } .calendar-container table { - border-collapse: separate; + border-collapse: separate; } div.calendar-container table td.title { /* This holds the current "month, year" */ - vertical-align: middle; - text-align: center; + vertical-align: middle; + text-align: center; } .calendar-container table thead td.headrow { /* Row containing navigation buttons */ - background: #fff; - color: #000; + background: #fff; + color: #000; } .calendar-container table thead td.name { /* Cells containing the day names */ - border-bottom: 1px solid #fff; - text-align: center; - color: #000; + border-bottom: 1px solid #fff; + text-align: center; + color: #000; } .calendar-container table thead td.weekend { /* How a weekend day name shows in header */ - color: #999; + color: #999; } /* The body part -- contains all the days in month. */ .calendar-container table tbody td.day { /* Cells containing month days dates */ - text-align: right; + text-align: right; } .calendar-container table tbody td.wn { - background: #fff; + background: #fff; } .calendar-container table tbody td.weekend { /* Cells showing weekend days */ - color: #999; + color: #999; } .calendar-container table tbody td.hilite { /* Hovered cells */ - background: #999999; - color: #ffffff; + background: #999999; + color: #ffffff; } .calendar-container table tbody td.day { - border: 0; - cursor : pointer; - font-size: 12px; - min-width: 38px; + border: 0; + cursor : pointer; + font-size: 12px; + min-width: 38px; } .calendar-container table tbody td.day.wn { - text-align: center; - background-color: #f4f4f4; + text-align: center; + background-color: #f4f4f4; } .calendar-container table tbody td.day.selected { /* Cell showing today date */ - background: #3071a9; - color: #fff; - border: 0; + background: #3071a9; + color: #fff; + border: 0; } .calendar-container table tbody td.today { - position: relative; - height: 100%; - width: auto; - font-weight: bold; + position: relative; + height: 100%; + width: auto; + font-weight: bold; } .calendar-container table tbody td.today:after { - position: absolute; - bottom: 3px; - left: 3px; - right: 3px; - content: ""; - height: 3px; - border-radius: 1.5px; - background-color: #46a546; + position: absolute; + bottom: 3px; + left: 3px; + right: 3px; + content: ""; + height: 3px; + border-radius: 1.5px; + background-color: #46a546; } .calendar-container table tbody td.today.selected:after { - background-color: #fff; + background-color: #fff; } .calendar-container table tbody td.day:hover { - cursor: pointer; - background: #3d8fd7; - color: #fff; + cursor: pointer; + background: #3d8fd7; + color: #fff; } .calendar-container table tbody td.day:hover:after { - background-color: #fff; + background-color: #fff; } .calendar-container table tbody .disabled { - color: #999; - background-color: #fafafa; + color: #999; + background-color: #fafafa; } .calendar-container table tbody .emptycell { /* Empty cells (the best is to hide them) */ - visibility: hidden; + visibility: hidden; } .calendar-container table tbody .emptyrow { /* Empty row (some months need less than 6 rows) */ - display: none; + display: none; } .calendar-container .calendar-head-row td { - padding: 4px 0 !important; - border-bottom: none; + padding: 4px 0 !important; + border-bottom: none; } .calendar-container .day-name { - font-size: 0.7rem; - font-weight: bold; + font-size: 0.7rem; + font-weight: bold; } .calendar-container .time td { - padding: 8px 0 8px 8px; + padding: 8px 0 8px 8px; } .buttons-wrapper { - padding: 5px 5px; - width:100%; + padding: 5px 5px; + width:100%; } .buttons-wrapper .btn { - min-width: 60px; - color: #495057; - border: 1px solid #495057; - margin-right: .5rem; - padding: 0 16px; - line-height: 2.375rem; - box-shadow: 1px 1px 1px 0 rgba(0,0,0,.25); + min-width: 60px; + color: #495057; + border: 1px solid #495057; + margin-right: .5rem; + padding: 0 16px; + line-height: 2.375rem; + box-shadow: 1px 1px 1px 0 rgba(0,0,0,.25); } .buttons-wrapper .btn:hover { - color: #fff; - background: #1a466b; + color: #fff; + background: #1a466b; } .buttons-wrapper .btn:last-child { - margin-right: 0; + margin-right: 0; } .time .time-title { - background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-position: center; + background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg width='22' height='22' viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1024 544v448q0 14-9 23t-23 9h-320q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h224v-352q0-14 9-23t23-9h64q14 0 23 9t9 23zm416 352q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-position: center; } diff --git a/build/media_source/system/css/frontediting.css b/build/media_source/system/css/frontediting.css index f812cf7f7b0..a26bb26aca7 100644 --- a/build/media_source/system/css/frontediting.css +++ b/build/media_source/system/css/frontediting.css @@ -1,6 +1,6 @@ /** - * @copyright (C) 2013 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2013 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ /* Module edit in front-end */ diff --git a/build/media_source/system/css/mootree.css b/build/media_source/system/css/mootree.css index 2ebce64ca45..abd95bbcd9c 100644 --- a/build/media_source/system/css/mootree.css +++ b/build/media_source/system/css/mootree.css @@ -1,28 +1,28 @@ /** - * @copyright (C) 2007 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2007 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ .mooTree_node { - font-family: Verdana, Arial, Helvetica; - font-size: 10px; - white-space: nowrap; + font-family: Verdana, Arial, Helvetica; + font-size: 10px; + white-space: nowrap; } .mooTree_text { - padding-top: 3px; - height: 15px; - cursor: pointer; + padding-top: 3px; + height: 15px; + cursor: pointer; } .mooTree_img { - float: left; - width: 18px; - height: 18px; - overflow: hidden; + float: left; + width: 18px; + height: 18px; + overflow: hidden; } -.mooTree_selected { - background-color: #ffc; - font-weight: bold; +.mooTree_selected { + background-color: #ffc; + font-weight: bold; } diff --git a/build/media_source/system/css/mootree_rtl.css b/build/media_source/system/css/mootree_rtl.css index 1f354904a48..b64809de279 100644 --- a/build/media_source/system/css/mootree_rtl.css +++ b/build/media_source/system/css/mootree_rtl.css @@ -1,8 +1,8 @@ /** - * @copyright (C) 2010 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2010 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ .mooTree_img { - float: right; -} \ No newline at end of file + float: right; +} diff --git a/build/media_source/system/css/sortablelist.css b/build/media_source/system/css/sortablelist.css index 04736850b15..f09115502f0 100644 --- a/build/media_source/system/css/sortablelist.css +++ b/build/media_source/system/css/sortablelist.css @@ -1,6 +1,6 @@ /** - * @copyright (C) 2012 Open Source Matters, Inc. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @copyright (C) 2012 Open Source Matters, Inc. + * @license GNU General Public License version 2 or later; see LICENSE.txt */ .dnd-list-highlight { position: relative; @@ -31,46 +31,46 @@ } .dndlist-place-holder { - height: 51px; - border-left: none; - border-right:none; + height: 51px; + border-left: none; + border-right:none; } .dndlist-dragged-row { - background-color: #5bb75b !important; - *background-color: #51a351 !important; - background-image: -ms-linear-gradient(top, #62c462, #51a351) !important; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)) !important; - background-image: -webkit-linear-gradient(top, #62c462, #51a351) !important; - background-image: -o-linear-gradient(top, #62c462, #51a351) !important; - background-image: -moz-linear-gradient(top, #62c462, #51a351) !important; - background-image: linear-gradient(top, #62c462, #51a351) !important; - background-repeat: repeat-x !important; - border-color: #51a351 #51a351 #387038 !important; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25) !important; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0) !important; - filter: progid:dximagetransform.microsoft.gradient(enabled=false) !important; - height: 54px; - opacity: 0.7; - filter: alpha(opacity=70); + background-color: #5bb75b !important; + *background-color: #51a351 !important; + background-image: -ms-linear-gradient(top, #62c462, #51a351) !important; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)) !important; + background-image: -webkit-linear-gradient(top, #62c462, #51a351) !important; + background-image: -o-linear-gradient(top, #62c462, #51a351) !important; + background-image: -moz-linear-gradient(top, #62c462, #51a351) !important; + background-image: linear-gradient(top, #62c462, #51a351) !important; + background-repeat: repeat-x !important; + border-color: #51a351 #51a351 #387038 !important; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25) !important; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0) !important; + filter: progid:dximagetransform.microsoft.gradient(enabled=false) !important; + height: 54px; + opacity: 0.7; + filter: alpha(opacity=70); } .dndlist-group-disabled { - opacity: 0.3; - filter: alpha(opacity=30); + opacity: 0.3; + filter: alpha(opacity=30); } .dndlist-group-disabled td { - background-image: url("../img/bg-overlay.png"); + background-image: url("../img/bg-overlay.png"); } .sortable .sortable-handler { - cursor: auto; + cursor: auto; } .sortable .sortable-handler.sortable-inactive{ - opacity: 0.5; - filter: alpha(opacity=50); + opacity: 0.5; + filter: alpha(opacity=50); } .middle, .table td.middle, .table th.middle { diff --git a/build/media_source/system/images/arrow.png b/build/media_source/system/images/arrow.png deleted file mode 100644 index a7bfcb0803b..00000000000 Binary files a/build/media_source/system/images/arrow.png and /dev/null differ diff --git a/build/media_source/system/images/arrow_rtl.png b/build/media_source/system/images/arrow_rtl.png deleted file mode 100644 index 924ecc79bd0..00000000000 Binary files a/build/media_source/system/images/arrow_rtl.png and /dev/null differ diff --git a/build/media_source/system/images/blank.png b/build/media_source/system/images/blank.png deleted file mode 100644 index e1c6726e8f4..00000000000 Binary files a/build/media_source/system/images/blank.png and /dev/null differ diff --git a/build/media_source/system/images/calendar.png b/build/media_source/system/images/calendar.png deleted file mode 100644 index 586bc28ed06..00000000000 Binary files a/build/media_source/system/images/calendar.png and /dev/null differ diff --git a/build/media_source/system/images/checked_out.png b/build/media_source/system/images/checked_out.png deleted file mode 100644 index 6ad8f25ac9b..00000000000 Binary files a/build/media_source/system/images/checked_out.png and /dev/null differ diff --git a/build/media_source/system/images/edit.png b/build/media_source/system/images/edit.png deleted file mode 100644 index a0a2e085ee5..00000000000 Binary files a/build/media_source/system/images/edit.png and /dev/null differ diff --git a/build/media_source/system/images/edit_unpublished.png b/build/media_source/system/images/edit_unpublished.png deleted file mode 100644 index ade6f889ba7..00000000000 Binary files a/build/media_source/system/images/edit_unpublished.png and /dev/null differ diff --git a/build/media_source/system/images/emailButton.png b/build/media_source/system/images/emailButton.png deleted file mode 100644 index 79add119b79..00000000000 Binary files a/build/media_source/system/images/emailButton.png and /dev/null differ diff --git a/build/media_source/system/images/icon-16-logout.png b/build/media_source/system/images/icon-16-logout.png deleted file mode 100644 index db03e83803f..00000000000 Binary files a/build/media_source/system/images/icon-16-logout.png and /dev/null differ diff --git a/build/media_source/system/images/icon_error.gif b/build/media_source/system/images/icon_error.gif deleted file mode 100644 index f3dadeed1f9..00000000000 Binary files a/build/media_source/system/images/icon_error.gif and /dev/null differ diff --git a/build/media_source/system/images/indent.png b/build/media_source/system/images/indent.png deleted file mode 100644 index c7dc01a0635..00000000000 Binary files a/build/media_source/system/images/indent.png and /dev/null differ diff --git a/build/media_source/system/images/indent1.png b/build/media_source/system/images/indent1.png deleted file mode 100644 index 9ad8acdd0d2..00000000000 Binary files a/build/media_source/system/images/indent1.png and /dev/null differ diff --git a/build/media_source/system/images/indent2.png b/build/media_source/system/images/indent2.png deleted file mode 100644 index 52dfc7baa50..00000000000 Binary files a/build/media_source/system/images/indent2.png and /dev/null differ diff --git a/build/media_source/system/images/indent3.png b/build/media_source/system/images/indent3.png deleted file mode 100644 index f9250c844f6..00000000000 Binary files a/build/media_source/system/images/indent3.png and /dev/null differ diff --git a/build/media_source/system/images/indent4.png b/build/media_source/system/images/indent4.png deleted file mode 100644 index be88c8797f6..00000000000 Binary files a/build/media_source/system/images/indent4.png and /dev/null differ diff --git a/build/media_source/system/images/indent5.png b/build/media_source/system/images/indent5.png deleted file mode 100644 index be88c8797f6..00000000000 Binary files a/build/media_source/system/images/indent5.png and /dev/null differ diff --git a/build/media_source/system/images/joomla.png b/build/media_source/system/images/joomla.png deleted file mode 100644 index 21fe24d1ed0..00000000000 Binary files a/build/media_source/system/images/joomla.png and /dev/null differ diff --git a/build/media_source/system/images/jquery.minicolors.png b/build/media_source/system/images/jquery.minicolors.png deleted file mode 100644 index 8fa1e9d9062..00000000000 Binary files a/build/media_source/system/images/jquery.minicolors.png and /dev/null differ diff --git a/build/media_source/system/images/livemarks-rtl.png b/build/media_source/system/images/livemarks-rtl.png deleted file mode 100644 index 0500d7d7d40..00000000000 Binary files a/build/media_source/system/images/livemarks-rtl.png and /dev/null differ diff --git a/build/media_source/system/images/livemarks.png b/build/media_source/system/images/livemarks.png deleted file mode 100644 index e26426240a6..00000000000 Binary files a/build/media_source/system/images/livemarks.png and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/blank.gif b/build/media_source/system/images/mooRainbow/blank.gif deleted file mode 100644 index a7114b3bd6d..00000000000 Binary files a/build/media_source/system/images/mooRainbow/blank.gif and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/moor_arrows.gif b/build/media_source/system/images/mooRainbow/moor_arrows.gif deleted file mode 100644 index 43c49b327fa..00000000000 Binary files a/build/media_source/system/images/mooRainbow/moor_arrows.gif and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/moor_boverlay.png b/build/media_source/system/images/mooRainbow/moor_boverlay.png deleted file mode 100644 index b816711cae0..00000000000 Binary files a/build/media_source/system/images/mooRainbow/moor_boverlay.png and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/moor_cursor.gif b/build/media_source/system/images/mooRainbow/moor_cursor.gif deleted file mode 100644 index 9515a38e5f7..00000000000 Binary files a/build/media_source/system/images/mooRainbow/moor_cursor.gif and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/moor_slider.png b/build/media_source/system/images/mooRainbow/moor_slider.png deleted file mode 100644 index 55d24f5814c..00000000000 Binary files a/build/media_source/system/images/mooRainbow/moor_slider.png and /dev/null differ diff --git a/build/media_source/system/images/mooRainbow/moor_woverlay.png b/build/media_source/system/images/mooRainbow/moor_woverlay.png deleted file mode 100644 index eedff1d7924..00000000000 Binary files a/build/media_source/system/images/mooRainbow/moor_woverlay.png and /dev/null differ diff --git a/build/media_source/system/images/mootree.gif b/build/media_source/system/images/mootree.gif deleted file mode 100644 index b7150f613fd..00000000000 Binary files a/build/media_source/system/images/mootree.gif and /dev/null differ diff --git a/build/media_source/system/images/mootree_loader.gif b/build/media_source/system/images/mootree_loader.gif deleted file mode 100644 index e0841879567..00000000000 Binary files a/build/media_source/system/images/mootree_loader.gif and /dev/null differ diff --git a/build/media_source/system/images/new.png b/build/media_source/system/images/new.png deleted file mode 100644 index a174ae1df7b..00000000000 Binary files a/build/media_source/system/images/new.png and /dev/null differ diff --git a/build/media_source/system/images/no_indent.png b/build/media_source/system/images/no_indent.png deleted file mode 100644 index 1797bf909a7..00000000000 Binary files a/build/media_source/system/images/no_indent.png and /dev/null differ diff --git a/build/media_source/system/images/pdf_button.png b/build/media_source/system/images/pdf_button.png deleted file mode 100644 index c2fdd724d7a..00000000000 Binary files a/build/media_source/system/images/pdf_button.png and /dev/null differ diff --git a/build/media_source/system/images/printButton.png b/build/media_source/system/images/printButton.png deleted file mode 100644 index 7d0c4750255..00000000000 Binary files a/build/media_source/system/images/printButton.png and /dev/null differ diff --git a/build/media_source/system/images/rating_star.png b/build/media_source/system/images/rating_star.png deleted file mode 100644 index 28367c75401..00000000000 Binary files a/build/media_source/system/images/rating_star.png and /dev/null differ diff --git a/build/media_source/system/images/rating_star_blank.png b/build/media_source/system/images/rating_star_blank.png deleted file mode 100644 index 3d6c3042975..00000000000 Binary files a/build/media_source/system/images/rating_star_blank.png and /dev/null differ diff --git a/build/media_source/system/images/sort0.png b/build/media_source/system/images/sort0.png deleted file mode 100644 index 4e61527dedf..00000000000 Binary files a/build/media_source/system/images/sort0.png and /dev/null differ diff --git a/build/media_source/system/images/sort1.png b/build/media_source/system/images/sort1.png deleted file mode 100644 index e0610fa12da..00000000000 Binary files a/build/media_source/system/images/sort1.png and /dev/null differ diff --git a/build/media_source/system/images/sort_asc.png b/build/media_source/system/images/sort_asc.png deleted file mode 100644 index ed29d625aa8..00000000000 Binary files a/build/media_source/system/images/sort_asc.png and /dev/null differ diff --git a/build/media_source/system/images/sort_desc.png b/build/media_source/system/images/sort_desc.png deleted file mode 100644 index a26df9717ab..00000000000 Binary files a/build/media_source/system/images/sort_desc.png and /dev/null differ diff --git a/build/media_source/system/images/sort_none.png b/build/media_source/system/images/sort_none.png deleted file mode 100644 index 4924e85ca6d..00000000000 Binary files a/build/media_source/system/images/sort_none.png and /dev/null differ diff --git a/build/media_source/system/images/tooltip.png b/build/media_source/system/images/tooltip.png deleted file mode 100644 index 133e888a8e1..00000000000 Binary files a/build/media_source/system/images/tooltip.png and /dev/null differ diff --git a/build/media_source/system/images/weblink.png b/build/media_source/system/images/weblink.png deleted file mode 100644 index c4973d3bd0b..00000000000 Binary files a/build/media_source/system/images/weblink.png and /dev/null differ diff --git a/build/media_source/system/joomla.asset.json b/build/media_source/system/joomla.asset.json index 18a4f3b51cd..97875f6fdb1 100644 --- a/build/media_source/system/joomla.asset.json +++ b/build/media_source/system/joomla.asset.json @@ -191,11 +191,6 @@ "type": "style", "uri": "system/fields/calendar-rtl.css" }, - { - "name": "field.calendar.locale", - "type": "script", - "uri": "" - }, { "name": "field.calendar.helper", "type": "script", @@ -209,7 +204,6 @@ "defer": true }, "dependencies": [ - "field.calendar.locale", "field.calendar.helper" ] }, diff --git a/build/media_source/system/js/draggable.es6.js b/build/media_source/system/js/draggable.es6.js index 2f9545b3e01..e72856d7bcd 100644 --- a/build/media_source/system/js/draggable.es6.js +++ b/build/media_source/system/js/draggable.es6.js @@ -8,9 +8,7 @@ let direction; let isNested; let dragElementIndex; let dropElementIndex; -let dropElement; let container = document.querySelector('.js-draggable'); -const orderRows = container.querySelectorAll('[name="order[]"]'); if (container) { /** The script expects a form with a class js-form @@ -38,11 +36,6 @@ if (container) { } if (container) { - // Add data order attribute for initial ordering - for (let i = 0, l = orderRows.length; l > i; i += 1) { - orderRows[i].dataset.order = i + 1; - } - // IOS 10 BUG document.addEventListener('touchstart', () => {}, false); @@ -54,7 +47,6 @@ if (container) { if (dragIndex < dropIndex) { rows[dropIndex].setAttribute('value', rows[dropIndex - 1].value); - // Move down for (i = dragIndex; i < dropIndex; i += 1) { if (direction === 'asc') { rows[i].setAttribute('value', parseInt(rows[i].value, 10) - 1); @@ -149,12 +141,6 @@ if (container) { // Update positions for a children of the moved item rearrangeChildren(el); - - // Reset data order attribute for initial ordering - const elements = container.querySelectorAll('[name="order[]"]'); - for (let i = 0, l = elements.length; l > i; i += 1) { - elements[i].dataset.order = i + 1; - } }; // eslint-disable-next-line no-undef @@ -200,12 +186,6 @@ if (container) { dragElementIndex = rowElements.indexOf(el); }) .on('drop', (el) => { - dropElement = el; - }) - .on('dragend', () => { - if (dropElement) { - saveTheOrder(dropElement); - dropElement = null; - } + saveTheOrder(el); }); } diff --git a/build/media_source/system/js/fields/calendar-locales/af.es5.js b/build/media_source/system/js/fields/calendar-locales/af.es5.js deleted file mode 100644 index 0bab8839122..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/af.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Vandag", - weekend : [0, 6], - wk : "wk", - time : "Tyd:", - days : ["Sondag", "Maandag", "Dinsdag", "Woensdag", "Donnerdag", "Vrydag", "Saterdag"], - shortDays : ["So", "Ma", "Di", "Wo", "Do", "Vr", "Sa"], - months : ["Januarie", "Februarie", "Maart", "April", "Mei", "Junie", "Julie", "Augustus", "September", "Oktober", "November", "Desember"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"], - AM : "VM", - PM : "NM", - am : "vm", - pm : "nm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Sluit", - clear: "Stoor" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/ar.es5.js b/build/media_source/system/js/fields/calendar-locales/ar.es5.js deleted file mode 100644 index 7bd0b78a684..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ar.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "اليوم", - weekend : [6, 5], - wk : "الأسبوع", - time : "الساعة:", - days : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"], - shortDays : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"], - months : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"], - shortMonths : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"], - AM : "ق‌ظ", - PM : "ب‌ظ", - am : "ق‌ظ", - pm : "ب‌ظ", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "إغلاق", - clear: "الغاء" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/bg.es5.js b/build/media_source/system/js/fields/calendar-locales/bg.es5.js deleted file mode 100644 index 7c85757c05e..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/bg.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Днес", - weekend : [0, 6], - wk : "седм", - time : "Време:", - days : ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота"], - shortDays : ["Нед", "Пон", "Вт", "Ср", "Чет", "Пет", "Съб"], - months : ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"], - shortMonths : ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Затвори", - clear: "Изчисти" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/bn.es5.js b/build/media_source/system/js/fields/calendar-locales/bn.es5.js deleted file mode 100644 index d385c91396b..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/bn.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "আজ", - weekend : [0, 6], - wk : "সপ্তাহ", - time : "সময়:", - days : ["রবিবার", "সোমবার", "মঙ্গলবার", "বুধবার", "বৃহস্পতিবার", "শুক্রবার", "শনিবার"], - shortDays : ["রবি", "সোম", "মঙ্গল", "বুধ", "বৃহস্পতি", "শুক্র", "শনি"], - months : ["জানুয়ারি", "ফেব্রুয়ারি", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর"], - shortMonths : ["জানুয়ারি", "ফেব্রুয়ারি", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর"], - AM : "পূর্বাহ্ণ", - PM : "অপরাহ্ন", - am : "পূর্বাহ্ণ", - pm : "অপরাহ্ন", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "প্রস্থান", - clear: "সংরক্ষণ" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/bs.es5.js b/build/media_source/system/js/fields/calendar-locales/bs.es5.js deleted file mode 100644 index 6376168ad46..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/bs.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Danas", - weekend : [0, 6], - wk : "se", - time : "Vrijeme:", - days : ["Nedjelja", "Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota"], - shortDays : ["Ned", "Pon", "Uto", "Sri", "Čet", "Pet", "Sub"], - months : ["Januar", "Februar", "Mart", "April", "Maj", "Juni", "Juli", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zatvori", - clear: "Snimi" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ca.es5.js b/build/media_source/system/js/fields/calendar-locales/ca.es5.js deleted file mode 100644 index 6d3fbc880b5..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ca.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Avui", - weekend : [0, 6], - wk : "Setm", - time : "Hora:", - days : ["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte"], - shortDays : ["Du", "Dl", "Dm", "Dx", "Dj", "Dv", "Ds"], - months : ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"], - shortMonths : ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Tancar", - clear: "Desar" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/cs.es5.js b/build/media_source/system/js/fields/calendar-locales/cs.es5.js deleted file mode 100644 index db0dae13bf4..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/cs.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "dnes", - weekend : [0, 6], - wk : "kt", - time : "čas:", - days : ["neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota"], - shortDays : ["ne", "po", "út", "st", "čt", "pá", "so"], - months : ["leden", "únor", "březen", "duben", "květen", "červen", "červenec", "srpen", "září", "říjen", "listopad", "prosinec"], - shortMonths : ["led", "úno", "bře", "dub", "kvě", "čen", "čec", "srp", "zář", "říj", "lis", "pro"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "zavřít", - clear: "vymazat" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/cy.es5.js b/build/media_source/system/js/fields/calendar-locales/cy.es5.js deleted file mode 100644 index 9c099f5d8b1..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/cy.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Heddiw", - weekend : [0, 6], - wk : "wy", - time : "Amser:", - days : ["Dydd Sul", "Dydd llun", "Dydd Mawrth", "Dydd Mercher", "Dydd Iau", "Dydd Gwener", "Dydd Sadwrn"], - shortDays : ["Sul", "Llun", "Maw", "Mer", "Iau", "Gwen", "Sad"], - months : ["Ionawr", "Chwefror", "Mawrth", "Ebrill", "Mai", "Mehefin", "Gorffennaf", "Awst", "Medi", "Hydref", "Tachwedd", "Rhagfyr"], - shortMonths : ["Ion", "Chw", "Maw", "Ebr", "Mai", "Meh", "Gor", "Awst", "Medi", "Hyd", "Tach", "Rhag"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Cau", - clear: "Clirio" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/da.es5.js b/build/media_source/system/js/fields/calendar-locales/da.es5.js deleted file mode 100644 index 0c4e31955c1..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/da.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "I dag", - weekend : [0, 6], - wk : "uge", - time : "Tid:", - days : ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"], - shortDays : ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"], - months : ["Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Luk", - clear: "Nulstil" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js b/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js index 281eb270dcc..1f39e8f914e 100644 --- a/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js +++ b/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js @@ -1,6 +1,8 @@ !(function(Date){ 'use strict'; + var localNumbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + /****************** Gregorian dates ********************/ /** Constants used for time computations */ Date.SECOND = 1000 /* milliseconds */; @@ -208,11 +210,37 @@ return ''; }; + /** Method to convert numbers to local symbols. */ + Date.convertNumbers = function(str) { + str = str.toString(); + + for (var i = 0, l = localNumbers.length; i < l; i++) { + str = str.replace(new RegExp(i, 'g'), localNumbers[i]); + } + + return str; + }; + + /** Translates to english numbers a string. */ + Date.toEnglish = function(str) { + str = this.toString(); + var nums = [0,1,2,3,4,5,6,7,8,9]; + for (var i = 0; i < 10; i++) { + str = str.replace(new RegExp(nums[i], 'g'), i); + } + return str; + }; + + /** Order the months from Gergorian to the calendar order */ + Date.monthsToLocalOrder = function(months) { + return months; + }; + /** INTERFACE METHODS FOR THE CALENDAR PICKER **/ /************* END **************/ /** Method to parse a string and return a date. **/ - Date.parseFieldDate = function(str, fmt, dateType) { + Date.parseFieldDate = function(str, fmt, dateType, localStrings) { if (dateType != 'gregorian') str = Date.toEnglish(str); @@ -248,7 +276,10 @@ case "%b": case "%B": for (j = 0; j < 12; ++j) { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; } + if (localStrings.months[j].substr(0, a[i].length).toLowerCase() === a[i].toLowerCase()) { + m = j; + break; + } } break; @@ -288,7 +319,10 @@ if (a[i].search(/[a-zA-Z]+/) != -1) { var t = -1; for (j = 0; j < 12; ++j) { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; } + if (localStrings.months[j].substr(0, a[i].length).toLowerCase() === a[i].toLowerCase()) { + t = j; + break; + } } if (t != -1) { if (m != -1) { @@ -313,7 +347,7 @@ }; /** Prints the date in a string according to the given format. */ - Date.prototype.print = function (str, dateType, translate) { + Date.prototype.print = function (str, dateType, translate, localStrings) { /** Handle calendar type **/ if (typeof dateType !== 'string') str = ''; if (!dateType) dateType = 'gregorian'; @@ -337,10 +371,10 @@ ir = 12; var min = this.getMinutes(); var sec = this.getSeconds(); - s["%a"] = JoomlaCalLocale.shortDays[w]; // abbreviated weekday name - s["%A"] = JoomlaCalLocale.days[w]; // full weekday name - s["%b"] = JoomlaCalLocale.shortMonths[m]; // abbreviated month name - s["%B"] = JoomlaCalLocale.months[m]; // full month name + s["%a"] = localStrings.shortDays[w]; // abbreviated weekday name + s["%A"] = localStrings.days[w]; // full weekday name + s["%b"] = localStrings.shortMonths[m]; // abbreviated month name + s["%B"] = localStrings.months[m]; // full month name // FIXME: %c : preferred date and time representation for the current locale s["%C"] = 1 + Math.floor(y / 100); // the century number s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31) @@ -355,8 +389,8 @@ s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12 s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59 s["%n"] = "\n"; // a newline character - s["%p"] = pm ? JoomlaCalLocale.PM : JoomlaCalLocale.AM; - s["%P"] = pm ? JoomlaCalLocale.pm : JoomlaCalLocale.am; + s["%p"] = pm ? localStrings.pm.toUpperCase() : localStrings.am.toUpperCase(); + s["%P"] = pm ? localStrings.pm : localStrings.am; // FIXME: %r : the time in am/pm notation %I:%M:%S %p // FIXME: %R : the time in 24-hour notation %H:%M s["%s"] = Math.floor(this.getTime() / 1000); @@ -375,8 +409,9 @@ var re = /%./g; var tmpDate = str.replace(re, function (par) { return s[par] || par; }); - if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]' && dateType != 'gregorian' && translate) + if (dateType != 'gregorian' && translate) { tmpDate = Date.convertNumbers(tmpDate); + } return tmpDate; }; diff --git a/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js b/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js index 4fae67800fb..8909fb1f2af 100644 --- a/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js +++ b/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js @@ -1,3 +1,8 @@ +!(function(Date){ + 'use strict'; + + var localNumbers = ['۰', '۱', '۲', '۳', '۴', '۵', '۶', '۷', '۸', '۹']; + /** BEGIN: DATE OBJECT PATCHES **/ /** Adds the number of days array to the Date object. */ Date.gregorian_MD = [31,28,31,30,31,30,31,31,30,31,30,31]; @@ -156,7 +161,7 @@ Date.prototype.getLocalMonthDays = function(dateType, month) { if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) { return 29; } else { - Date.local_MD[month]; + return Date.local_MD[month]; } } else { var year = this.getFullYear(); @@ -217,7 +222,7 @@ Date.prototype.getMonthDays = function(month) { return 29; } else { if (Date.dateType != 'gregorian') { - Date.local_MD[month]; + return Date.local_MD[month]; } else { return Date.gregorian_MD[month]; } @@ -247,21 +252,55 @@ Date.gregorianToLocalCal = function(y, m, d) { /** Method to convert numbers from local symbols to English numbers. */ Date.numbersToIso = function(str) { - var i, nums =[0,1,2,3,4,5,6,7,8,9]; + var i, nums = [0,1,2,3,4,5,6,7,8,9]; str = str.toString(); - if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]') { - for (i = 0; i < nums.length; i++) { - str = str.replace(new RegExp(JoomlaCalLocale.localLangNumbers[i], 'g'), nums[i]); - } + + for (i = 0; i < nums.length; i++) { + str = str.replace(new RegExp(localNumbers[i], 'g'), nums[i]); + } + + return str; +}; + +/** Method to convert numbers to local symbols. */ +Date.convertNumbers = function(str) { + str = str.toString(); + + for (var i = 0, l = localNumbers.length; i < l; i++) { + str = str.replace(new RegExp(i, 'g'), localNumbers[i]); + } + + return str; +}; + +/** Translates to english numbers a string. */ +Date.toEnglish = function(str) { + str = this.toString(); + var nums = [0,1,2,3,4,5,6,7,8,9]; + for (var i = 0; i < 10; i++) { + str = str.replace(new RegExp(nums[i], 'g'), i); } return str; }; + + /** Order the days from Gergorian to calendar order */ + Date.monthsToLocalOrder = function(months, dateType) { + if (dateType === 'jalali'){ + months.push(months.shift()); // January to the end + months.push(months.shift()); // February to the end + + return months; + } else { + return months; + } + }; + /** INTERFACE METHODS FOR THE CALENDAR PICKER **/ /************* END **************/ /** Prints the date in a string according to the given format. */ -Date.prototype.print = function (str, dateType, translate) { +Date.prototype.print = function (str, dateType, translate, localStrings) { /** Handle calendar type **/ if (typeof dateType !== 'string') str = ''; if (!dateType) dateType = 'gregorian'; @@ -286,10 +325,10 @@ Date.prototype.print = function (str, dateType, translate) { ir = 12; var min = this.getMinutes(); var sec = this.getSeconds(); - s["%a"] = JoomlaCalLocale.shortDays[w]; // abbreviated weekday name - s["%A"] = JoomlaCalLocale.days[w]; // full weekday name - s["%b"] = JoomlaCalLocale.shortMonths[m]; // abbreviated month name - s["%B"] = JoomlaCalLocale.months[m]; // full month name + s["%a"] = localStrings.shortDays[w]; // abbreviated weekday name + s["%A"] = localStrings.days[w]; // full weekday name + s["%b"] = localStrings.shortMonths[m]; // abbreviated month name + s["%B"] = localStrings.months[m]; // full month name // FIXME: %c : preferred date and time representation for the current locale s["%C"] = 1 + Math.floor(y / 100); // the century number s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31) @@ -304,8 +343,8 @@ Date.prototype.print = function (str, dateType, translate) { s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12 s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59 s["%n"] = "\n"; // a newline character - s["%p"] = pm ? JoomlaCalLocale.PM : JoomlaCalLocale.AM; - s["%P"] = pm ? JoomlaCalLocale.pm : JoomlaCalLocale.am; + s["%p"] = pm ? localStrings.pm.toUpperCase() : localStrings.am.toUpperCase(); + s["%P"] = pm ? localStrings.pm : localStrings.am; // FIXME: %r : the time in am/pm notation %I:%M:%S %p // FIXME: %R : the time in 24-hour notation %H:%M s["%s"] = Math.floor(this.getTime() / 1000); @@ -324,13 +363,14 @@ Date.prototype.print = function (str, dateType, translate) { var re = /%./g; var tmpDate = str.replace(re, function (par) { return s[par] || par; }); - if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]' && translate) + if (translate) { tmpDate = Date.convertNumbers(tmpDate); + } return tmpDate; }; -Date.parseFieldDate = function(str, fmt, dateType) { +Date.parseFieldDate = function(str, fmt, dateType, localStrings) { str = Date.numbersToIso(str); var today = new Date(); @@ -342,6 +382,7 @@ Date.parseFieldDate = function(str, fmt, dateType) { var i = 0, j = 0; var hr = 0; var min = 0; + var sec = 0; for (i = 0; i < a.length; ++i) { if (!a[i]) continue; @@ -364,11 +405,7 @@ Date.parseFieldDate = function(str, fmt, dateType) { case "%b": case "%B": for (j = 0; j < 12; ++j) { - if (dateType != 'gregorian') { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; } - } else { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; } - } + if (localStrings.months[j].substr(0, a[i].length).toLowerCase() === a[i].toLowerCase()) { m = j; break; } } break; @@ -407,11 +444,7 @@ Date.parseFieldDate = function(str, fmt, dateType) { if (a[i].search(/[a-zA-Z]+/) != -1) { var t = -1; for (j = 0; j < 12; ++j) { - if (dateType != 'gregorian') { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; } - } else { - if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; } - } + if (localStrings.months[j].substr(0, a[i].length).toLowerCase() === a[i].toLowerCase()) { t = j; break; } } if (t != -1) { if (m != -1) { @@ -444,7 +477,7 @@ Date.parseFieldDate = function(str, fmt, dateType) { * Based on code from http://farsiweb.info */ -JalaliDate = { +var JalaliDate = { g_days_in_month: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31], j_days_in_month: [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29] }; @@ -621,3 +654,5 @@ Date.prototype.getJalaliDay = function() { day = (day) % 7; return day; }; + +})(Date); diff --git a/build/media_source/system/js/fields/calendar-locales/de.es5.js b/build/media_source/system/js/fields/calendar-locales/de.es5.js deleted file mode 100644 index 98f22510268..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/de.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Heute", - weekend : [0, 6], - wk : "KW", - time : "Uhrzeit:", - days : ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"], - shortDays : ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam"], - months : ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"], - shortMonths : ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Schließen", - clear: "Leeren" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/el.es5.js b/build/media_source/system/js/fields/calendar-locales/el.es5.js deleted file mode 100644 index c2537d35ad6..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/el.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Σήμερα", - weekend : [0, 6], - wk : "εβδ.", - time : "Ώρα:", - days : ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο"], - shortDays : ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ"], - months : ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"], - shortMonths : ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μαϊ", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"], - AM : "ΠΜ", - PM : "ΜΜ", - am : "πμ", - pm : "μμ", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Κλείσιμο", - clear: "Καθαρισμός" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/en.es5.js b/build/media_source/system/js/fields/calendar-locales/en.es5.js deleted file mode 100644 index 4789f2852bf..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/en.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Today", - weekend : [0, 6], - wk : "wk", - time : "Time:", - days : ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], - shortDays : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], - months : ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Close", - clear: "Clear" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/es.es5.js b/build/media_source/system/js/fields/calendar-locales/es.es5.js deleted file mode 100644 index e0ec73182a5..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/es.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Hoy", - weekend : [0, 6], - wk : "Sem", - time : "Hora:", - days : ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"], - shortDays : ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sá"], - months : ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"], - shortMonths : ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Cerrar", - clear: "Limpiar" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/eu.es5.js b/build/media_source/system/js/fields/calendar-locales/eu.es5.js deleted file mode 100644 index 12310c6a787..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/eu.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Gaur", - weekend : [0, 6], - wk : "ast.", - time : "Ordua:", - days : ["Igandea", "Astelehena", "Asteartea", "Asteazkena", "Osteguna", "Ostirala", "Larunbata"], - shortDays : ["ig.", "al.", "as.", "az.", "og.", "or.", "lr."], - months : ["Urtarrila", "Otsaila", "Martxoa", "Apirila", "Maiatza", "Ekaina", "Uztaila", "Abuztua", "Iraila", "Urria", "Azaroa", "Abendua"], - shortMonths : ["urt.", "ots.", "mar.", "api.", "mai.", "eka.", "uzt.", "abu.", "ira.", "urr.", "aza.", "abe."], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Itxi", - clear: "Garbitu" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js b/build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js deleted file mode 100644 index 0edb05605a4..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/fa-ir.es5.js +++ /dev/null @@ -1,20 +0,0 @@ -window.JoomlaCalLocale = { - today : "امروز", - weekend : [5], - wk : "هفته", - time : "زمان", - days : ["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"], - shortDays : ["یک","دو","سه","چهار","پنج","جمعه","شنبه"], - months : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"], - shortMonths : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"], - AM : "ق.ظ.", - PM : "ب.ظ.", - am : "ق.ظ.", - pm : "ب.ظ.", - dateType : "jalali", - minYear : 1268, - maxYear : 1458, - exit: "بستن", - clear: "پاک", - localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"] -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/fi.es5.js b/build/media_source/system/js/fields/calendar-locales/fi.es5.js deleted file mode 100644 index a35c1e3cf23..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/fi.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Tänään", - weekend : [0, 6], - wk : "vk", - time : "Aika:", - days : ["Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai"], - shortDays : ["Su", "Ma", "Ti", "Ke", "To", "Pe", "La"], - months : ["Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kesäkuu", "Heinäkuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu"], - shortMonths : ["Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä", "Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu"], - AM : "AP", - PM : "IP", - am : "ap", - pm : "ip", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Sulje", - clear: "Tyhjennä" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/fr.es5.js b/build/media_source/system/js/fields/calendar-locales/fr.es5.js deleted file mode 100644 index e62ac80f6c3..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/fr.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Aujourd'hui", - weekend : [0, 6], - wk : "wk", - time : "Heure :", - days : ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"], - shortDays : ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"], - months : ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"], - shortMonths : ["Jan", "Fév", "Mar", "Avr", "Mai", "Jui", "Juol", "Aoû", "Sep", "Oct", "Nov", "Déc"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Fermer", - clear: "Effacer" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ga.es5.js b/build/media_source/system/js/fields/calendar-locales/ga.es5.js deleted file mode 100644 index 824ace3ba7c..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ga.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Inniu", - weekend : [0, 6], - wk : "7n", - time : "Am:", - days : ["Dé Domhnaigh", "Dé Luain", "Dé Máirt", "Dé Céadaoin", "Déardaoin", "Dé hAoine", "Dé Sathairn"], - shortDays : ["Domh", "Luan", "Máirt", "Céad", "Déar", "Aoine", "Sath"], - months : ["Eanáir", "Feabhra", "Márta", "Aibreán", "Bealtaine", "Meitheamh", "Iúil", "Lúnasa", "Meán Fómhair", "Deireadh Fómhair", "Samhain", "Nollaig"], - shortMonths : ["Ean", "Feabh", "Márta", "Aib", "Beal", "Meith", "Iúil", "Lún", "MFómh", "DFómh", "Samh", "Noll"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Dún", - clear: "Glan" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/hr.es5.js b/build/media_source/system/js/fields/calendar-locales/hr.es5.js deleted file mode 100644 index 918a016c43e..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/hr.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Danas", - weekend : [0, 6], - wk : "tj", - time : "Vrijeme:", - days : ["Nedjelja", "Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota"], - shortDays : ["Ned", "Pon", "Uto", "Sri", "Čet", "Pet", "Sub"], - months : ["Siječanj", "Veljača", "Ožujak", "Travanj", "Svibanj", "Lipanj", "Srpanj", "Kolovoz", "Rujan", "Listopad", "Studeni", "Prosinac"], - shortMonths : ["Sij", "Velj", "Ožu", "Tra", "Svi", "Lip", "Srp", "Kol", "Ruj", "Lis", "Stu", "Pro"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zatvori", - clear: "Otkaži" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/hu.es5.js b/build/media_source/system/js/fields/calendar-locales/hu.es5.js deleted file mode 100644 index 117c20ff363..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/hu.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Ma", - weekend : [0, 6], - wk : "hét", - time : "Időpont:", - days : ["vasárnap", "hétfő", "kedd", "szerda", "csütörtök", "péntek", "szombat"], - shortDays : ["V", "H", "K", "Sze", "Cs", "P", "Szo"], - months : ["január", "február", "március", "április", "május", "június", "július", "augusztus", "szeptember", "október", "november", "december"], - shortMonths : ["jan", "febr", "márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec"], - AM : "de.", - PM : "du.", - am : "de.", - pm : "du.", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Bezárás", - clear: "Törlés" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/it.es5.js b/build/media_source/system/js/fields/calendar-locales/it.es5.js deleted file mode 100644 index 026f3f8b225..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/it.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Oggi", - weekend : [0, 6], - wk : "set", - time : "Ora:", - days : ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"], - shortDays : ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"], - months : ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"], - shortMonths : ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Chiudi", - clear: "Annulla" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ja.es5.js b/build/media_source/system/js/fields/calendar-locales/ja.es5.js deleted file mode 100644 index f9c3900a152..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ja.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "今日", - weekend : [0, 6], - wk : "週", - time : "時間:", - days : ["日曜日", "月曜日", "火曜日", "水曜日", "木曜日", "金曜日", "土曜日"], - shortDays : ["日", "月", "火", "水", "木", "金", "土"], - months : ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], - shortMonths : ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], - AM : "午前", - PM : "午後", - am : "午前", - pm : "午後", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "閉じる", - clear: "クリア" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ka.es5.js b/build/media_source/system/js/fields/calendar-locales/ka.es5.js deleted file mode 100644 index f05f34e084c..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ka.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "დღეს", - weekend : [0, 6], - wk : "კვ", - time : "დრო:", - days : ["კვირა", "ორშაბათი", "სამშაბათი", "ოთხშაბათი", "ხუთშაბათი", "პარასკევი", "შაბათი"], - shortDays : ["კვ", "ორშ", "სამშ", "ოთხშ", "ხუთშ", "პარ", "შაბ"], - months : ["იანვარი", "თებერვალი", "მარტი", "აპრილი", "მაისი", "ივნისი", "ივლისი", "აგვისტო", "სექტემბერი", "ოქტომბერი", "ნოემბერი", "დეკემბერი"], - shortMonths : ["იან", "თებ", "მარ", "აპრ", "მაი", "ივნ", "ივლ", "აგვ", "სექ", "ოქტ", "ნოე", "დეკ"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "დახურვა", - clear: "გასუფთავება" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/kk.es5.js b/build/media_source/system/js/fields/calendar-locales/kk.es5.js deleted file mode 100644 index 1564518644d..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/kk.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Бүгін", - weekend : [0, 6], - wk : "апта", - time : "Уақыт:", - days : ["Жексенбі", "Дүйсенбі", "Сейсенбі", "Сәрсенбі", "Бейсенбі", "Жұма", "Сенбі"], - shortDays : ["Жекс", "Дүйс", "Сейс", "Сәрс", "Бейс", "Жұма", "Сенбі"], - months : ["Қаңтар", "Ақпан", "Наурыз", "Сәуір", "Мамыр", "Маусым", "Шілде", "Тамыз", "Қыркүйек", "Қазан", "Қараша", "Желтоқсан"], - shortMonths : ["Қаң", "Ақп", "Нау", "Сәу", "Мам", "Мау", "Шіл", "Там", "Қырк", "Қаз", "Қар", "Жел"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Жабу", - clear: "Өшіру" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ko.es5.js b/build/media_source/system/js/fields/calendar-locales/ko.es5.js deleted file mode 100644 index f9dbe3d76bd..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ko.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "오늘", - weekend : [0, 6], - wk : "wk", - time : "시간:", - days : ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일"], - shortDays : ["일", "월", "화", "수", "목", "금", "토"], - months : ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], - shortMonths : ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], - AM : "오전", - PM : "오후", - am : "오전", - pm : "오후", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "닫기", - clear: "Clear" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/lt.es5.js b/build/media_source/system/js/fields/calendar-locales/lt.es5.js deleted file mode 100644 index 1c9763b6549..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/lt.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Šiandien", - weekend : [0, 6], - wk : "wk", - time : "Laikas:", - days : ["Sekmadienis", "Pirmadienis", "Antradienis", "Trečiadienis", "Ketvirtadienis", "Penktadienis", "Šeštadienis"], - shortDays : ["Sek", "Pir", "Ant", "Tre", "Ket", "Pen", "Šeš"], - months : ["Sausis", "Vasaris", "Kovas", "Balandis", "Gegužė", "Birželis", "Liepa", "Rugpjūtis", "Rugsšjis", "Spalis", "Lapkritis", "Gruodis"], - shortMonths : ["Sau", "Vas", "Kov", "Bal", "Geg", "Bir", "Lie", "Rug", "Rgs", "Spa", "Lap", "Grd"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Uždaryti", - clear: "Išvalyti" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/mk.es5.js b/build/media_source/system/js/fields/calendar-locales/mk.es5.js deleted file mode 100644 index ca56474ce76..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/mk.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Денес", - weekend : [0, 6], - wk : "нед", - time : "Време:", - days : ["Недела", "Понеделник", "Вторник", "Среда", "Четврток", "Петок", "Сабота"], - shortDays : ["Нед", "Пон", "Вто", "Сре", "Чет", "Пет", "Саб"], - months : ["Јануари", "Февруари", "Март", "Април", "Мај", "Јуни", "Јули", "Август", "Септември", "Октомври", "Ноември", "Декември"], - shortMonths : ["Јан", "Фев", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Ное", "Дек"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Затвори", - clear: "Зачувај" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/nb.es5.js b/build/media_source/system/js/fields/calendar-locales/nb.es5.js deleted file mode 100644 index 61df3da8ef1..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/nb.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Dagens dato", - weekend : [0, 6], - wk : "Uke", - time : "Tid:", - days : ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"], - shortDays : ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"], - months : ["Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Lukk", - clear: "Tøm" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/nl.es5.js b/build/media_source/system/js/fields/calendar-locales/nl.es5.js deleted file mode 100644 index cb1fb612428..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/nl.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Vandaag", - weekend : [0, 6], - wk : "wk", - time : "Tijd:", - days : ["Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"], - shortDays : ["Zon", "Maa", "Din", "Woe", "Don", "Vri", "Zat"], - months : ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"], - shortMonths : ["Jan", "Feb", "Maa", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Sluiten", - clear: "Legen" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/pl.es5.js b/build/media_source/system/js/fields/calendar-locales/pl.es5.js deleted file mode 100644 index a75c4128a55..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/pl.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Dzisiaj", - weekend : [0, 6], - wk : "tydz", - time : "Godzina:", - days : ["Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota"], - shortDays : ["nie.", "pon.", "wt.", "śr.", "czw.", "pt.", "sob."], - months : ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"], - shortMonths : ["Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zamknij", - clear: "Wyczyść" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/prs-af.es5.js b/build/media_source/system/js/fields/calendar-locales/prs-af.es5.js deleted file mode 100644 index 0edb05605a4..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/prs-af.es5.js +++ /dev/null @@ -1,20 +0,0 @@ -window.JoomlaCalLocale = { - today : "امروز", - weekend : [5], - wk : "هفته", - time : "زمان", - days : ["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"], - shortDays : ["یک","دو","سه","چهار","پنج","جمعه","شنبه"], - months : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"], - shortMonths : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"], - AM : "ق.ظ.", - PM : "ب.ظ.", - am : "ق.ظ.", - pm : "ب.ظ.", - dateType : "jalali", - minYear : 1268, - maxYear : 1458, - exit: "بستن", - clear: "پاک", - localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"] -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/pt.es5.js b/build/media_source/system/js/fields/calendar-locales/pt.es5.js deleted file mode 100644 index 7f053a658b8..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/pt.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Hoje", - weekend : [0, 6], - wk : "sem", - time : "Hora:", - days : ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"], - shortDays : ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab"], - months : ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"], - shortMonths : ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Fechar", - clear: "Limpar" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/ru.es5.js b/build/media_source/system/js/fields/calendar-locales/ru.es5.js deleted file mode 100644 index ee4cc729a50..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ru.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Сегодня", - weekend : [0, 6], - wk : "нед", - time : "Время:", - days : ["Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"], - shortDays : ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"], - months : ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"], - shortMonths : ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Закрыть", - clear: "Очистить" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/sk.es5.js b/build/media_source/system/js/fields/calendar-locales/sk.es5.js deleted file mode 100644 index bf30309e01c..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sk.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Dnes", - weekend : [0, 6], - wk : "týž.", - time : "Čas:", - days : ["Nedeľa", "Pondelok", "Utorok", "Streda", "Štvrtok", "Piatok", "Sobota"], - shortDays : ["Ned", "Pon", "Uto", "Str", "Štv", "Pia", "Sob"], - months : ["Január", "Február", "Marec", "Apríl", "Máj", "Jún", "Júl", "August", "September", "Október", "November", "December"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Máj", "Jún", "Júl", "Aug", "Sep", "Okt", "Nov", "Dec"], - AM : "DOPOL.", - PM : "POPOL.", - am : "dopol.", - pm : "popol.", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zavrieť", - clear: "Vymazať" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/sl.es5.js b/build/media_source/system/js/fields/calendar-locales/sl.es5.js deleted file mode 100644 index 33addc32dec..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sl.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Danes", - weekend : [0, 6], - wk : "td", - time : "Čas:", - days : ["Nedelja", "Ponedeljek", "Torek", "Sreda", "Četrtek", "Petek", "Sobota"], - shortDays : ["Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob"], - months : ["Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zapri", - clear: "Počisti" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js b/build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js deleted file mode 100644 index 98615073834..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sr-rs.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Данас", - weekend : [0, 6], - wk : "нед", - time : "Време:", - days : ["Недеља", "Понедељак", "Уторак", "Среда", "Четвртак", "Петак", "Субота"], - shortDays : ["Нед", "Пон", "Уто", "Сре", "Чет", "Пет", "Суб"], - months : ["Јануар", "Фенруар", "Март", "Април", "Мај", "Јуни", "Јули", "Август", "Септембар", "Октобар", "Новембар", "Децембар"], - shortMonths : ["Јан", "Феб", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Нов", "Дец"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Затвори", - clear: "Зачувај" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js b/build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js deleted file mode 100644 index f22131bda0d..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sr-yu.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Danas", - weekend : [0, 6], - wk : "ned", - time : "Vreme:", - days : ["Nedelja", "Ponedeljak", "Utorak", "Sreda", "Četvrtak", "Petak", "Subota"], - shortDays : ["Ned", "Pon", "Uto", "Sre", "Čet", "Pet", "Sub"], - months : ["Januar", "Fenruar", "Mart", "April", "Maj", "Juni", "Juli", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Zatvori", - clear: "Sačuvaj" -}; diff --git a/build/media_source/system/js/fields/calendar-locales/sv.es5.js b/build/media_source/system/js/fields/calendar-locales/sv.es5.js deleted file mode 100644 index 3031020d61e..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sv.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Idag", - weekend : [0, 6], - wk : "vk", - time : "Tid:", - days : ["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"], - shortDays : ["Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"], - months : ["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"], - shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"], - AM : "FM", - PM : "EM", - am : "fm", - pm : "em", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Stäng", - clear: "Rensa" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/sw.es5.js b/build/media_source/system/js/fields/calendar-locales/sw.es5.js deleted file mode 100644 index 61317f92985..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/sw.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Leo", - weekend : [0, 6], - wk : "wk", - time : "Saa:", - days : ["Jumapili", "Jumatatu", "Jumanne", "Jumatano", "Alhamisi", "Ijumaa", "Jumamosi"], - shortDays : ["Jmp", "Jmt", "Jmn", "Jtn", "Alh", "Ijm", "Jmm"], - months : ["Januari", "Februari", "Machi", "Aprili", "Mai", "Juni", "Julai", "Augosti", "Septemba", "Oktoba", "Novemba", "Desemba"], - shortMonths : ["Jan", "Feb", "Mach", "Apr", "Mai", "Jun", "Jul", "Ago", "Sep", "Okt", "Nov", "Des"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Funga", - clear: "Safisha" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/ta.es5.js b/build/media_source/system/js/fields/calendar-locales/ta.es5.js deleted file mode 100644 index 9e258ce6b00..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/ta.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "இன்று", - weekend : [0, 6], - wk : "வா", - time : "நேரம்:", - days : ["ஞாயிறு", "திங்கள்", "செவ்வாய்", "புதன்", "வியாழன்", "வெள்ளி", "சனி"], - shortDays : ["ஞா", "தி", "செ", "பு", "வி", "வெ", "ச"], - months : ["ஜனவரி", "பிப்ரவரி", "மார்ச்", "ஏப்ரல்", "மே", "ஜூன்", "ஜூலை", "ஆகஸ்ட்", "செப்டம்பர்", "அக்டோபர்", "நவம்பர்", "டிசம்பர்"], - shortMonths : ["ஜன", "பிப்", "மார்", "ஏப்", "மே", "ஜூன்", "ஜூலை", "ஆக", "செப்", "அக்", "நவ", "டிச"], - AM : "முப", - PM : "பிப", - am : "முப", - pm : "பிப", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "மூடுக", - clear: "துடைக்க" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/th.es5.js b/build/media_source/system/js/fields/calendar-locales/th.es5.js deleted file mode 100644 index c338c5c9418..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/th.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "วันนี้", - weekend : [0, 6], - wk : "สัปดาห์", - time : "เวลา:", - days : ["อาทิตย์", "จันทร์", "อังคาร", "พุธ", "พฤหัสบดี", "ศุกร์", "เสาร์"], - shortDays : ["อา.", "จ.", "อ.", "พ.", "พฤ.", "ศ.", "ส."], - months : ["มกราคม", "กุมภาพันธ์", "มีนาคม", "เมษายน", "พฤษภาคม", "มิถุนายน", "กรกฏาคม", "สิงหาคม", "กันยายน", "ตุลาคม", "พฤศจิกายน", "ธันวาคม"], - shortMonths : ["ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค."], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "ปิด", - clear: "ล้าง" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/uk.es5.js b/build/media_source/system/js/fields/calendar-locales/uk.es5.js deleted file mode 100644 index dd6fc82f937..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/uk.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "Сьогодні", - weekend : [0, 6], - wk : "тждн.", - time : "Час:", - days : ["Неділя", "Понеділок", "Вівторок", "Середа", "Четвер", "П'ятниця", "Субота"], - shortDays : ["Нд.", "Пн.", "Вт.", "Ср.", "Чт.", "Пт.", "Сб."], - months : ["Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вересень", "Жовтень", "Листопад", "Грудень"], - shortMonths : ["Січ.", "Лют.", "Бер.", "Квіт.", "Трав.", "Черв.", "Лип.", "Серп.", "Вер.", "Жовт.", "Лист.", "Груд."], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "Закрити", - clear: "Очистити" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js b/build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js deleted file mode 100644 index b11305e31f6..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/zh-CN.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "今天", - weekend : [0, 6], - wk : "星期", - time : "时间", - days : ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"], - shortDays : ["日", "一", "二", "三", "四", "五", "六"], - months : ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], - shortMonths : ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"], - AM : "上午", - PM : "下午", - am : "上午", - pm : "下午", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "关闭", - clear: "清除" -}; \ No newline at end of file diff --git a/build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js b/build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js deleted file mode 100644 index cf785942926..00000000000 --- a/build/media_source/system/js/fields/calendar-locales/zh-TW.es5.js +++ /dev/null @@ -1,19 +0,0 @@ -window.JoomlaCalLocale = { - today : "今天", - weekend : [0, 6], - wk : "週", - time : "時間:", - days : ["日", "一", "二", "三", "四", "五", "六"], - shortDays : ["日", "一", "二", "三", "四", "五", "六"], - months : ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], - shortMonths : ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"], - AM : "AM", - PM : "PM", - am : "am", - pm : "pm", - dateType : "gregorian", - minYear : 1900, - maxYear : 2100, - exit: "關閉", - clear: "清除" -}; diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js index 1e267505ac3..1ac66f10478 100644 --- a/build/media_source/system/js/fields/calendar.es5.js +++ b/build/media_source/system/js/fields/calendar.es5.js @@ -5,28 +5,6 @@ !(function(window, document){ 'use strict'; - /** Method to convert numbers to local symbols. */ - Date.convertNumbers = function(str) { - var str = str.toString(); - - if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]') { - for (var i = 0; i < JoomlaCalLocale.localLangNumbers.length; i++) { - str = str.replace(new RegExp(i, 'g'), JoomlaCalLocale.localLangNumbers[i]); - } - } - return str; - }; - - /** Translates to english numbers a string. */ - Date.toEnglish = function(str) { - str = this.toString(); - var nums = [0,1,2,3,4,5,6,7,8,9]; - for (var i = 0; i < 10; i++) { - str = str.replace(new RegExp(nums[i], 'g'), i); - } - return str; - }; - var JoomlaCalendar = function (element) { // Initialize only if the element exists @@ -44,6 +22,8 @@ element._joomlaCalendar = this; + var self = this; + this.writable = true; this.hidden = true; this.params = {}; @@ -60,46 +40,83 @@ debug: false, clicked: false, element: {style: {display: "none"}}, - writable: true + writable: true, }; - var self = this, - btn = this.button, + // Localisation strings + var _t = Joomla.Text._; + this.strings = { + today: _t('JLIB_HTML_BEHAVIOR_TODAY', 'Today'), + wk: _t('JLIB_HTML_BEHAVIOR_WK', 'wk'), + // ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], + days: ['SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY'], + // ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], + shortDays: ['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'], + // ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + months: ['JANUARY', 'FEBRUARY', 'MARCH', 'APRIL', 'MAY', 'JUNE', 'JULY', 'AUGUST', 'SEPTEMBER', 'OCTOBER', 'NOVEMBER', 'DECEMBER'], + // ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], + shortMonths: ['JANUARY_SHORT', 'FEBRUARY_SHORT', 'MARCH_SHORT', 'APRIL_SHORT', 'MAY_SHORT', 'JUNE_SHORT', + 'JULY_SHORT', 'AUGUST_SHORT', 'SEPTEMBER_SHORT', 'OCTOBER_SHORT', 'NOVEMBER_SHORT', 'DECEMBER_SHORT',], + am: _t('JLIB_HTML_BEHAVIOR_AM', 'am'), + pm: _t('JLIB_HTML_BEHAVIOR_PM', 'pm'), + exit: _t('JCLOSE', 'Close'), + clear: _t('JCLEAR', 'Clear') + }; + + // Translate lists of Days, Months + this.strings.days = this.strings.days.map(function (c){ + return _t(c); + }); + this.strings.shortDays = this.strings.shortDays.map(function (c){ + return _t(c); + }); + this.strings.months = this.strings.months.map(function (c){ + return _t(c); + }); + this.strings.shortMonths = this.strings.shortMonths.map(function (c){ + return _t(c); + }); + + var btn = this.button, instanceParams = { inputField : this.inputField, - dateType : JoomlaCalLocale.dateType ? JoomlaCalLocale.dateType : 'gregorian', - direction : (document.dir !== undefined) ? document.dir : document.getElementsByTagName("html")[0].getAttribute("dir"), - firstDayOfWeek : btn.getAttribute("data-firstday") ? parseInt(btn.getAttribute("data-firstday")) : 0, - dateFormat : "%Y-%m-%d %H:%M:%S", - weekend : JoomlaCalLocale.weekend ? JoomlaCalLocale.weekend : [0,6], - minYear : JoomlaCalLocale.minYear ? JoomlaCalLocale.minYear : 1900, - maxYear : JoomlaCalLocale.maxYear ? JoomlaCalLocale.maxYear : 2100, - minYearTmp : btn.getAttribute("data-min-year"), - maxYearTmp : btn.getAttribute("data-max-year"), - weekendTmp : btn.getAttribute("data-weekend"), + dateType : btn.dataset.dateType || 'gregorian', + direction : document.dir ? document.dir : document.getElementsByTagName("html")[0].getAttribute("dir"), + firstDayOfWeek : btn.dataset.firstday ? parseInt(btn.dataset.firstday, 10) : 0, + dateFormat : btn.dataset.dateFormat || "%Y-%m-%d %H:%M:%S", + weekend : [0,6], + minYear : 1000, + maxYear : 2100, time24 : true, - showsOthers : (parseInt(btn.getAttribute("data-show-others")) === 1) ? true : false, + showsOthers : true, showsTime : true, - weekNumbers : (parseInt(btn.getAttribute("data-week-numbers")) === 1) ? true : false, + weekNumbers : true, showsTodayBtn : true, - compressedHeader: (parseInt(btn.getAttribute("data-only-months-nav")) === 1) ? true : false, + compressedHeader: false, }; - // Keep B/C - if (btn.getAttribute("data-dayformat")) { - instanceParams.dateFormat = btn.getAttribute("data-dayformat") ? btn.getAttribute("data-dayformat") : "%Y-%m-%d %H:%M:%S"; + if ('showOthers' in btn.dataset) { + instanceParams.showsOthers = parseInt(btn.dataset.showOthers, 10) === 1; + } + + if ('weekNumbers' in btn.dataset) { + instanceParams.weekNumbers = parseInt(btn.dataset.weekNumbers, 10) === 1; } - if (btn.getAttribute("data-time-24")) { - instanceParams.time24 = parseInt(btn.getAttribute("data-time-24")) === 24 ? true : false; + if ('onlyMonthsNav' in btn.dataset) { + instanceParams.compressedHeader = parseInt(btn.dataset.onlyMonthsNav, 10) === 1; } - if (btn.getAttribute("data-show-time")) { - instanceParams.showsTime = parseInt(btn.getAttribute("data-show-time")) === 1 ? true : false; + if ('time24' in btn.dataset) { + instanceParams.time24 = parseInt(btn.dataset.time24 , 10) === 24; } - if (btn.getAttribute("data-today-btn")) { - instanceParams.showsTodayBtn = parseInt(btn.getAttribute("data-today-btn")) === 1 ? true : false; + if ('showTime' in btn.dataset) { + instanceParams.showsTime = parseInt(btn.dataset.showTime, 10) === 1; + } + + if ('todayBtn' in btn.dataset) { + instanceParams.showsTodayBtn = parseInt(btn.dataset.todayBtn, 10) === 1; } // Merge the parameters @@ -108,18 +125,28 @@ } // Evaluate the min year - if (isInt(self.params.minYearTmp)) { - self.params.minYear = getBoundary(parseInt(self.params.minYearTmp), self.params.dateType); + if (btn.dataset.minYear) { + self.params.minYear = parseInt(btn.dataset.minYear, 10); } // Evaluate the max year - if (isInt(self.params.maxYearTmp)) { - self.params.maxYear = getBoundary(parseInt(self.params.maxYearTmp), self.params.dateType); + if (btn.dataset.maxYear) { + self.params.maxYear = parseInt(btn.dataset.maxYear, 10); } // Evaluate the weekend days - if (self.params.weekendTmp !== "undefined") { - self.params.weekend = self.params.weekendTmp.split(',').map(function(item) { return parseInt(item, 10); }); + if (btn.dataset.weekend) { + self.params.weekend = btn.dataset.weekend.split(',').map(function(item) { return parseInt(item, 10); }); + } + + // Legacy thing, days for RTL is reversed + if (this.params.direction === 'rtl') { + this.strings.days = this.strings.days.reverse(); + this.strings.shortDays = this.strings.shortDays.reverse(); } + // Other calendar may have a different order for months + this.strings.months = Date.monthsToLocalOrder(this.strings.months, this.params.dateType); + this.strings.shortMonths = Date.monthsToLocalOrder(this.strings.shortMonths, this.params.dateType); + // Event handler need to define here, to be able access in current context this._dayMouseDown = function(event) { return self._handleDayMouseDown(event); @@ -145,11 +172,11 @@ JoomlaCalendar.prototype.checkInputs = function () { // Get the date from the input - var inputAltValueDate = Date.parseFieldDate(this.inputField.getAttribute('data-alt-value'), this.params.dateFormat, 'gregorian'); + var inputAltValueDate = Date.parseFieldDate(this.inputField.getAttribute('data-alt-value'), this.params.dateFormat, 'gregorian', this.strings); if (this.inputField.value !== '') { this.date = inputAltValueDate; - this.inputField.value = inputAltValueDate.print(this.params.dateFormat, this.params.dateType, true); + this.inputField.value = inputAltValueDate.print(this.params.dateFormat, this.params.dateType, true, this.strings); } else { this.date = new Date(); } @@ -224,15 +251,15 @@ /** Method to set the value for the input field */ JoomlaCalendar.prototype.callHandler = function () { /** Output the date **/ - this.inputField.setAttribute('data-alt-value', this.date.print(this.params.dateFormat, 'gregorian', false)); + this.inputField.setAttribute('data-alt-value', this.date.print(this.params.dateFormat, 'gregorian', false, this.strings)); if (this.inputField.getAttribute('data-alt-value') && this.inputField.getAttribute('data-alt-value') !== '0000-00-00 00:00:00') { - this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true); + this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true, this.strings); if (this.params.dateType !== 'gregorian') { - this.inputField.setAttribute('data-local-value', this.date.print(this.params.dateFormat, this.params.dateType, true)); + this.inputField.setAttribute('data-local-value', this.date.print(this.params.dateFormat, this.params.dateType, true, this.strings)); } } - this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true); + this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true, this.strings); if (this.dateClicked && typeof this.params.onUpdate === "function") { this.params.onUpdate(this); @@ -256,7 +283,8 @@ JoomlaCalendar.prototype.show = function () { this.checkInputs(); this.inputField.focus(); - this.dropdownElement.classList.remove('hidden'); + this.dropdownElement.classList.add('open'); + this.dropdownElement.removeAttribute('hidden'); this.hidden = false; document.addEventListener("keydown", this._calKeyEvent, true); @@ -279,7 +307,8 @@ document.removeEventListener("keypress", this._calKeyEvent, true); document.removeEventListener("mousedown", this._documentClick, true); - this.dropdownElement.classList.add('hidden'); + this.dropdownElement.classList.remove('open'); + this.dropdownElement.setAttribute('hidden', ''); this.hidden = true; }; @@ -543,7 +572,7 @@ div.style.boxShadow = "0 0 70px 0 rgba(0,0,0,0.67)"; div.style.minWidth = this.inputField.width; div.style.padding = '0'; - div.classList.add('hidden'); + div.setAttribute('hidden', ''); div.style.left = "auto"; div.style.top = "auto"; div.style.zIndex = 1060; @@ -617,7 +646,7 @@ if (this.params.weekNumbers) { cell = createElement("td", row); cell.className = "day-name wn"; - cell.innerHTML = Joomla.sanitizeHtml(JoomlaCalLocale.wk); + cell.textContent = self.strings.wk; } for (var i = 7; i > 0; --i) { cell = createElement("td", row); @@ -629,7 +658,7 @@ var fdow = this.params.firstDayOfWeek, cell = this.firstdayname, - weekend = JoomlaCalLocale.weekend; + weekend = this.params.weekend; for (var i = 0; i < 7; ++i) { var realday = (i + fdow) % 7; @@ -644,7 +673,7 @@ cell.classList.add("weekend"); } - cell.innerHTML = Joomla.sanitizeHtml(JoomlaCalLocale.shortDays[(i + fdow) % 7]); + cell.textContent = this.strings.shortDays[(i + fdow) % 7]; cell = cell.nextSibling; } @@ -725,14 +754,14 @@ if (t12) { var selAttr = true, - altDate = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, 'gregorian'); + altDate = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, 'gregorian', self.strings); pm = (altDate.getHours() >= 12); var part = createElement("select", cell); part.className = "time-ampm"; part.style.width = '100%'; - part.options.add(new Option(JoomlaCalLocale.PM, "pm", pm ? selAttr : '', pm ? selAttr : '')); - part.options.add(new Option(JoomlaCalLocale.AM, "am", pm ? '' : selAttr, pm ? '' : selAttr)); + part.options.add(new Option(self.strings.pm, "pm", pm ? selAttr : '', pm ? selAttr : '')); + part.options.add(new Option(self.strings.am, "am", pm ? '' : selAttr, pm ? '' : selAttr)); AP = part; // Event listener for the am/pm select @@ -762,7 +791,7 @@ row = createElement("div", this.wrapper); row.className = "buttons-wrapper btn-group"; - this._nav_clear = hh(JoomlaCalLocale.clear, '', 100, 'button', '', 'js-btn btn btn-clear', {"type": "button", "data-action": "clear"}); + this._nav_clear = hh(this.strings.clear, '', 100, 'button', '', 'js-btn btn btn-clear', {"type": "button", "data-action": "clear"}); var cleara = row.querySelector('[data-action="clear"]'); cleara.addEventListener("click", function (e) { @@ -781,7 +810,7 @@ }); if (this.params.showsTodayBtn) { - this._nav_now = hh(JoomlaCalLocale.today, '', 0, 'button', '', 'js-btn btn btn-today', {"type": "button", "data-action": "today"}); + this._nav_now = hh(this.strings.today, '', 0, 'button', '', 'js-btn btn btn-today', {"type": "button", "data-action": "today"}); var todaya = this.wrapper.querySelector('[data-action="today"]'); todaya.addEventListener('click', function (e) { @@ -793,7 +822,7 @@ }); } - this._nav_exit = hh(JoomlaCalLocale.exit, '', 999, 'button', '', 'js-btn btn btn-exit', {"type": "button", "data-action": "exit"}); + this._nav_exit = hh(this.strings.exit, '', 999, 'button', '', 'js-btn btn btn-exit', {"type": "button", "data-action": "exit"}); var exita = this.wrapper.querySelector('[data-action="exit"]'); exita.addEventListener('click', function (e) { e.preventDefault(); @@ -804,15 +833,15 @@ } if (typeof self.dateClicked === 'undefined') { // value needs to be validated - self.inputField.setAttribute('data-alt-value', Date.parseFieldDate(self.inputField.value, self.params.dateFormat, self.params.dateType) - .print(self.params.dateFormat, 'gregorian', false)); + self.inputField.setAttribute('data-alt-value', Date.parseFieldDate(self.inputField.value, self.params.dateFormat, self.params.dateType, self.strings) + .print(self.params.dateFormat, 'gregorian', false, self.strings)); } else { - self.inputField.setAttribute('data-alt-value', self.date.print(self.params.dateFormat, 'gregorian', false)); + self.inputField.setAttribute('data-alt-value', self.date.print(self.params.dateFormat, 'gregorian', false, self.strings)); } } else { self.inputField.setAttribute('data-alt-value', '0000-00-00 00:00:00'); } - self.date = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, self.params.dateType); + self.date = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, self.params.dateType, self.strings); } self.close(); }); @@ -863,7 +892,7 @@ var row = this.tbody.firstChild, ar_days = this.ar_days = new Array(), - weekend = JoomlaCalLocale.weekend, + weekend = this.params.weekend, monthDays = parseInt(date.getLocalWeekDays(this.params.dateType)); /** Fill the table **/ @@ -871,7 +900,7 @@ var cell = row.firstChild; if (this.params.weekNumbers) { cell.className = "day wn"; - cell.innerHTML = Joomla.sanitizeHtml(date.getLocalWeekNumber(this.params.dateType)); //date.convertNumbers(); + cell.textContent = date.getLocalWeekNumber(this.params.dateType); cell = cell.nextSibling; } @@ -904,7 +933,7 @@ cell.style.cursor = "pointer"; } cell.disabled = false; - cell.innerHTML = this.params.debug ? Joomla.sanitizeHtml(iday) : Joomla.sanitizeHtml(Date.convertNumbers(iday)); // translated day number for each cell + cell.textContent = this.params.debug ? iday : Date.convertNumbers(iday); // translated day number for each cell if (!cell.disabled) { cell.caldate = new Date(date); if (current_month && iday === mday) { @@ -920,9 +949,11 @@ } if (!(hasdays || this.params.showsOthers)) { row.classList.add('hidden'); + row.setAttribute('hidden', ''); row.className = "emptyrow"; } else { row.classList.remove('hidden'); + row.removeAttribute('hidden', ''); } } @@ -968,11 +999,11 @@ } if (!this.params.compressedHeader) { - this._nav_month.getElementsByTagName('span')[0].innerHTML = this.params.debug ? month + ' ' + JoomlaCalLocale.months[month] : JoomlaCalLocale.months[month]; - this.title.getElementsByTagName('span')[0].innerHTML = this.params.debug ? year + ' ' + Date.convertNumbers(year.toString()) : Date.convertNumbers(year.toString()); + this._nav_month.getElementsByTagName('span')[0].textContent = this.params.debug ? month + ' ' + this.strings.months[month] : this.strings.months[month]; + this.title.getElementsByTagName('span')[0].textContent = this.params.debug ? year + ' ' + Date.convertNumbers(year.toString()) : Date.convertNumbers(year.toString()); } else { var tmpYear = Date.convertNumbers(year.toString()); - this._nav_month.getElementsByTagName('span')[0].innerHTML = !this.params.monthBefore ? JoomlaCalLocale.months[month] + ' - ' + tmpYear : tmpYear + ' - ' + JoomlaCalLocale.months[month] ; + this._nav_month.getElementsByTagName('span')[0].textContent = !this.params.monthBefore ? this.strings.months[month] + ' - ' + tmpYear : tmpYear + ' - ' + this.strings.months[month] ; } this.table.style.visibility = "visible"; }; @@ -984,7 +1015,7 @@ var calObj = JoomlaCalendar.getCalObject(this)._joomlaCalendar; // If calendar is open we will handle the event elsewhere - if (!calObj.dropdownElement.classList.contains('hidden')) { + if (!calObj.dropdownElement.hasAttribute('hidden')) { event.preventDefault(); return; } @@ -996,23 +1027,23 @@ if (calObj.params.dateType !== 'gregorian') { // We need to transform the date for the data-alt-value - var ndate, date = Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType); + var ndate, date = Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType, calObj.strings); ndate = Date.localCalToGregorian(date.getFullYear(), date.getMonth(), date.getDate()); date.setFullYear(ndate[0]); date.setMonth(ndate[1]); date.setDate(ndate[2]); - calObj.inputField.setAttribute('data-alt-value', date.print(calObj.params.dateFormat, 'gregorian', false)); + calObj.inputField.setAttribute('data-alt-value', date.print(calObj.params.dateFormat, 'gregorian', false, calObj.strings)); } else { - calObj.inputField.setAttribute('data-alt-value', Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType) - .print(calObj.params.dateFormat, 'gregorian', false)); + calObj.inputField.setAttribute('data-alt-value', Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType, calObj.strings) + .print(calObj.params.dateFormat, 'gregorian', false, calObj.strings)); } } else { - calObj.inputField.setAttribute('data-alt-value', calObj.date.print(calObj.params.dateFormat, 'gregorian', false)); + calObj.inputField.setAttribute('data-alt-value', calObj.date.print(calObj.params.dateFormat, 'gregorian', false, calObj.strings)); } } else { calObj.inputField.setAttribute('data-alt-value', '0000-00-00 00:00:00'); } - calObj.date = Date.parseFieldDate(calObj.inputField.getAttribute('data-alt-value'), calObj.params.dateFormat, calObj.params.dateType); + calObj.date = Date.parseFieldDate(calObj.inputField.getAttribute('data-alt-value'), calObj.params.dateFormat, calObj.params.dateType, calObj.strings); } self.close(); @@ -1084,27 +1115,6 @@ */ JoomlaCalendar.init = function (element, container) { - // Fall back for translation strings - window.JoomlaCalLocale = window.JoomlaCalLocale ? JoomlaCalLocale : {}; - JoomlaCalLocale.today = JoomlaCalLocale.today ? JoomlaCalLocale.today : 'today'; - JoomlaCalLocale.weekend = JoomlaCalLocale.weekend ? JoomlaCalLocale.weekend : [0, 6]; - JoomlaCalLocale.localLangNumbers = JoomlaCalLocale.localLangNumbers ? JoomlaCalLocale.localLangNumbers : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; - JoomlaCalLocale.wk = JoomlaCalLocale.wk ? JoomlaCalLocale.wk : 'wk'; - JoomlaCalLocale.AM = JoomlaCalLocale.AM ? JoomlaCalLocale.AM : 'AM'; - JoomlaCalLocale.PM = JoomlaCalLocale.PM ? JoomlaCalLocale.PM : 'PM'; - JoomlaCalLocale.am = JoomlaCalLocale.am ? JoomlaCalLocale.am : 'am'; - JoomlaCalLocale.pm = JoomlaCalLocale.pm ? JoomlaCalLocale.pm : 'pm'; - JoomlaCalLocale.dateType = JoomlaCalLocale.dateType ? JoomlaCalLocale.dateType : 'gregorian'; - JoomlaCalLocale.time = JoomlaCalLocale.time ? JoomlaCalLocale.time : 'time'; - JoomlaCalLocale.days = JoomlaCalLocale.days ? JoomlaCalLocale.days : '["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]'; - JoomlaCalLocale.shortDays = JoomlaCalLocale.shortDays ? JoomlaCalLocale.shortDays : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; - JoomlaCalLocale.months = JoomlaCalLocale.months ? JoomlaCalLocale.months : ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; - JoomlaCalLocale.shortMonths = JoomlaCalLocale.shortMonths ? JoomlaCalLocale.shortMonths : ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; - JoomlaCalLocale.minYear = JoomlaCalLocale.minYear ? JoomlaCalLocale.minYear : 1900; - JoomlaCalLocale.maxYear = JoomlaCalLocale.maxYear ? JoomlaCalLocale.maxYear : 2100; - JoomlaCalLocale.exit = JoomlaCalLocale.exit ? JoomlaCalLocale.exit : 'Cancel'; - JoomlaCalLocale.clear = JoomlaCalLocale.clear ? JoomlaCalLocale.clear : 'Clear'; - var instance = element._joomlaCalendar; if (!instance) { new JoomlaCalendar(element); diff --git a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js index a1f8bd6bacf..d0a55315008 100644 --- a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js +++ b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js @@ -12,7 +12,13 @@ if (!Joomla) { * @param {*} path * @returns {string} */ -const getExtension = (path) => path.split(/[#?]/)[0].split('.').pop().trim(); +const getExtension = (path) => { + const parts = path.split(/[#]/); + if (parts.length > 1) { + return parts[1].split(/[?]/)[0].split('.').pop().trim(); + } + return path.split(/[#?]/)[0].split('.').pop().trim(); +}; class JoomlaFieldMedia extends HTMLElement { constructor() { @@ -180,15 +186,14 @@ class JoomlaFieldMedia extends HTMLElement { this.setValue(''); } - updatePreview(withValue) { + updatePreview() { if (['true', 'static'].indexOf(this.preview) === -1 || this.preview === 'false' || !this.previewElement) { return; } // Reset preview if (this.preview) { - let { value } = this.inputElement; - if (withValue) value = withValue; + const { value } = this.inputElement; const { supportedExtensions } = this; if (!value) { this.buttonClearEl.style.display = 'none'; diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js index 25e2cdaaa1b..92ecca71519 100644 --- a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js +++ b/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js @@ -270,6 +270,7 @@ haveName.forEach((elem) => { const $el = elem; const name = $el.getAttribute('name'); + const aria = $el.getAttribute('aria-describedby'); const id = name .replace(/(\[\]$)/g, '') .replace(/(\]\[)/g, '__') @@ -335,6 +336,10 @@ $el.id = idNew; } + if (aria) { + $el.setAttribute('aria-describedby', `${nameNew}-desc`); + } + // Check if there is a label for this input const lbl = row.querySelector(`label[for="${forOldAttr}"]`); if (lbl) { diff --git a/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js index 7bfc5b4c7e6..b7c69a67891 100644 --- a/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js +++ b/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js @@ -197,7 +197,7 @@ const insertAsImage = async (media, editor, fieldClass) => { } } editor.value = `${Joomla.selectedMediaFile.url}#joomlaImage://${media.path.replace(':', '')}?width=${Joomla.selectedMediaFile.width}&height=${Joomla.selectedMediaFile.height}`; - fieldClass.updatePreview(Joomla.selectedMediaFile.url); + fieldClass.updatePreview(); } } }; diff --git a/build/media_source/system/js/messages.es6.js b/build/media_source/system/js/messages.es6.js index 1308f43e8e8..40c80a53378 100644 --- a/build/media_source/system/js/messages.es6.js +++ b/build/media_source/system/js/messages.es6.js @@ -68,6 +68,7 @@ Joomla.renderMessages = (messages, selector, keepOld, timeout) => { } messagesBox.setAttribute('type', alertClass); + messagesBox.setAttribute('close-text', Joomla.Text._('JCLOSE')); messagesBox.setAttribute('dismiss', true); if (timeout && parseInt(timeout, 10) > 0) { diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.es6.js index b3e090cd32d..bb108d2c7a6 100644 --- a/build/media_source/system/js/searchtools.es6.js +++ b/build/media_source/system/js/searchtools.es6.js @@ -174,14 +174,12 @@ Joomla = window.Joomla || {}; } // Do we need to add to mark filter as enabled? - if (this.getFilterFields()) { - this.getFilterFields().forEach((i) => { + this.getFilterFields().forEach((i) => { + self.checkFilter(i); + i.addEventListener('change', () => { self.checkFilter(i); - i.addEventListener('change', () => { - self.checkFilter(i); - }); }); - } + }); if (this.clearButton) { this.clearButton.addEventListener('click', self.clear); @@ -245,16 +243,14 @@ Joomla = window.Joomla || {}; self.searchField.value = ''; } - if (self.getFilterFields()) { - self.getFilterFields().forEach((i) => { - i.value = ''; - self.checkFilter(i); + self.getFilterFields().forEach((i) => { + i.value = ''; + self.checkFilter(i); - if (window.jQuery && window.jQuery.chosen) { - window.jQuery(i).trigger('chosen:updated'); - } - }); - } + if (window.jQuery && window.jQuery.chosen) { + window.jQuery(i).trigger('chosen:updated'); + } + }); if (self.clearListOptions) { self.getListFields().forEach((i) => { @@ -286,10 +282,9 @@ Joomla = window.Joomla || {}; // eslint-disable-next-line class-methods-use-this checkActiveStatus(cont) { - const els = [].slice.call(this.getFilterFields()); let activeFilterCount = 0; - els.forEach((item) => { + this.getFilterFields().forEach((item) => { if (item.classList.contains('active')) { activeFilterCount += 1; cont.filterButton.classList.remove('btn-secondary'); @@ -359,6 +354,8 @@ Joomla = window.Joomla || {}; if (this.filterContainer) { return Array.prototype.slice.call(this.filterContainer.querySelectorAll('select,input')); } + + return []; } getListFields() { diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js index 6e1dd07b8ca..65e81efd1eb 100644 --- a/build/media_source/system/js/showon.es6.js +++ b/build/media_source/system/js/showon.es6.js @@ -98,7 +98,7 @@ Object.keys(this.fields).forEach((key) => { if (this.fields[key].origin.length) { this.fields[key].origin.forEach((elem) => { - // Initialise + // Initialize the showon behaviour for the given HTMLElement self.linkedOptions(key); // Setup listeners diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss new file mode 100644 index 00000000000..f94624aaffa --- /dev/null +++ b/build/media_source/system/scss/joomla-fontawesome.scss @@ -0,0 +1,14 @@ +// Override the font path +$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default; +$fa-font-display: block !default; + +// Font Awesome 5 Free +@import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; +@import "../../../../media/vendor/fontawesome-free/scss/regular"; +@import "../../../../media/vendor/fontawesome-free/scss/solid"; + +// Brands must be imported last +@import "../../../../media/vendor/fontawesome-free/scss/brands"; + +// B/C for Icomoon +@import "icomoon"; diff --git a/build/media_source/templates/cassiopeia/js/mod_menu/menu-metismenu.es6.js b/build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js similarity index 100% rename from build/media_source/templates/cassiopeia/js/mod_menu/menu-metismenu.es6.js rename to build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js diff --git a/build/media_source/vendor/bootstrap/js/modal.es6.js b/build/media_source/vendor/bootstrap/js/modal.es6.js index 2426895e1f6..6da13470a73 100644 --- a/build/media_source/vendor/bootstrap/js/modal.es6.js +++ b/build/media_source/vendor/bootstrap/js/modal.es6.js @@ -88,7 +88,6 @@ Joomla.initialiseModal = (modal, options) => { const padding = modalBody.offsetTop; const maxModalHeight = parseFloat(getComputedStyle(document.body, null).height.replace('px', '')) - (padding * 2); modalBodyPadding = modalBodyHeightOuter - modalBodyHeight; - // eslint-disable-next-line max-len maxModalBodyHeight = maxModalHeight - (modalHeaderHeight + modalFooterHeight + modalBodyPadding); } diff --git a/components/com_banners/src/Model/BannersModel.php b/components/com_banners/src/Model/BannersModel.php index 4db1854f541..96d891b524d 100644 --- a/components/com_banners/src/Model/BannersModel.php +++ b/components/com_banners/src/Model/BannersModel.php @@ -255,7 +255,7 @@ protected function getListQuery() // Filter by language if ($this->getState('filter.language')) { - $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*']); + $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING); } $query->order($db->quoteName('a.sticky') . ' DESC, ' . ($randomise ? $query->rand() : $db->quoteName('a.ordering'))); diff --git a/components/com_config/src/Controller/ConfigController.php b/components/com_config/src/Controller/ConfigController.php index 2b63e7895b6..8b76a722c94 100644 --- a/components/com_config/src/Controller/ConfigController.php +++ b/components/com_config/src/Controller/ConfigController.php @@ -13,7 +13,6 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Client\ClientHelper; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; @@ -36,7 +35,6 @@ class ConfigController extends BaseController * @param \JInput $input Input * * @since 1.6 - * @see \JControllerLegacy */ public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { @@ -71,7 +69,7 @@ public function save() $this->checkToken(); // Check if the user is authorized to do this. - if (!Factory::getUser()->authorise('core.admin')) + if (!$this->app->getIdentity()->authorise('core.admin')) { $this->app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR')); $this->app->redirect('index.php'); diff --git a/components/com_config/src/Controller/ModulesController.php b/components/com_config/src/Controller/ModulesController.php index f90cd177d75..61b093ea357 100644 --- a/components/com_config/src/Controller/ModulesController.php +++ b/components/com_config/src/Controller/ModulesController.php @@ -39,7 +39,6 @@ class ModulesController extends BaseController * @param \JInput $input Input * * @since 1.6 - * @see \JControllerLegacy */ public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { diff --git a/components/com_config/src/Controller/TemplatesController.php b/components/com_config/src/Controller/TemplatesController.php index 97f01d54310..084eb8ca9b1 100644 --- a/components/com_config/src/Controller/TemplatesController.php +++ b/components/com_config/src/Controller/TemplatesController.php @@ -13,7 +13,6 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Client\ClientHelper; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; @@ -36,7 +35,6 @@ class TemplatesController extends BaseController * @param \JInput $input Input * * @since 1.6 - * @see \JControllerLegacy */ public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { @@ -72,7 +70,7 @@ public function save() $this->checkToken(); // Check if the user is authorized to do this. - if (!Factory::getUser()->authorise('core.admin')) + if (!$this->app->getIdentity()->authorise('core.admin')) { $this->setRedirect('index.php', Text::_('JERROR_ALERTNOAUTHOR')); diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php index 98eccd2ba00..48b1130edb0 100644 --- a/components/com_contact/src/Controller/ContactController.php +++ b/components/com_contact/src/Controller/ContactController.php @@ -323,7 +323,7 @@ protected function allowAdd($data = array()) { if ($categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('catid'), 'int')) { - $user = Factory::getUser(); + $user = $this->app->getIdentity(); // If the category has been passed in the data or URL check it. return $user->authorise('core.create', 'com_contact.category.' . $categoryId); @@ -358,7 +358,7 @@ protected function allowEdit($data = array(), $key = 'id') if ($categoryId) { - $user = Factory::getUser(); + $user = $this->app->getIdentity(); // The category has been set. Check the category permissions. if ($user->authorise('core.edit', $this->option . '.category.' . $categoryId)) diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php index 4c66a7f9c18..b75671da7ae 100644 --- a/components/com_contact/src/Controller/DisplayController.php +++ b/components/com_contact/src/Controller/DisplayController.php @@ -68,7 +68,7 @@ public function display($cachable = false, $urlparams = array()) $vName = $this->input->get('view', 'categories'); $this->input->set('view', $vName); - if (Factory::getUser()->get('id')) + if ($this->app->getIdentity()->get('id')) { $cachable = false; } diff --git a/components/com_contact/src/Model/CategoriesModel.php b/components/com_contact/src/Model/CategoriesModel.php index 83d3e1a9eec..d5ee42aa1af 100644 --- a/components/com_contact/src/Model/CategoriesModel.php +++ b/components/com_contact/src/Model/CategoriesModel.php @@ -103,7 +103,7 @@ protected function getStoreId($id = '') } /** - * Redefine the function an add some properties to make the styling more easy + * Redefine the function and add some properties to make the styling easier * * @return mixed An array of data items on success, false on failure. */ diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php index 920150652fa..2da942f7c34 100644 --- a/components/com_contact/src/Model/CategoryModel.php +++ b/components/com_contact/src/Model/CategoryModel.php @@ -227,10 +227,9 @@ protected function getListQuery() } // Filter on the language. - if ($language = $this->getState('filter.language')) + if ($this->getState('filter.language')) { - $language = [Factory::getLanguage()->getTag(), '*']; - $query->whereIn($db->quoteName('a.language'), $language); + $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING); } // Set sortname ordering if selected diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php index 104fcdfe0a3..bde2e530315 100644 --- a/components/com_contact/src/Model/FeaturedModel.php +++ b/components/com_contact/src/Model/FeaturedModel.php @@ -143,8 +143,7 @@ protected function getListQuery() // Filter by language if ($this->getState('filter.language')) { - $language = [Factory::getLanguage()->getTag(), '*']; - $query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING); + $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING); } // Add the list ordering clause. diff --git a/components/com_contact/src/View/Contact/HtmlView.php b/components/com_contact/src/View/Contact/HtmlView.php index bfdf158ed99..49ce47768e8 100644 --- a/components/com_contact/src/View/Contact/HtmlView.php +++ b/components/com_contact/src/View/Contact/HtmlView.php @@ -346,7 +346,7 @@ public function display($tpl = null) $item->text = $item->misc; } - $app->triggerEvent('onContentPrepare', array ('com_contact.contact', &$item, &$this->params, $offset)); + $app->triggerEvent('onContentPrepare', array ('com_contact.contact', &$item, &$item->params, $offset)); // Store the events for later $item->event = new \stdClass; diff --git a/components/com_contact/tmpl/form/edit.php b/components/com_contact/tmpl/form/edit.php index ba156752d27..cdb20b89ae8 100644 --- a/components/com_contact/tmpl/form/edit.php +++ b/components/com_contact/tmpl/form/edit.php @@ -34,7 +34,7 @@
- tab_name, array('active' => 'details')); ?> + tab_name, ['active' => 'details', 'recall' => true, 'breakpoint' => 768]); ?> tab_name, 'details', empty($this->item->id) ? Text::_('COM_CONTACT_NEW_CONTACT') : Text::_('COM_CONTACT_EDIT_CONTACT')); ?> form->renderField('name'); ?> diff --git a/components/com_content/src/Controller/ArticleController.php b/components/com_content/src/Controller/ArticleController.php index 8b1f4a7b28a..5989033cb64 100644 --- a/components/com_content/src/Controller/ArticleController.php +++ b/components/com_content/src/Controller/ArticleController.php @@ -93,7 +93,7 @@ public function add() */ protected function allowAdd($data = array()) { - $user = Factory::getUser(); + $user = $this->app->getIdentity(); $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('catid'), 'int'); $allow = null; @@ -127,7 +127,7 @@ protected function allowAdd($data = array()) protected function allowEdit($data = array(), $key = 'id') { $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - $user = Factory::getUser(); + $user = $this->app->getIdentity(); // Zero record (id:0), return component edit permission by calling parent controller method if (!$recordId) diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php index 9774e83d4ac..67872d6df8a 100644 --- a/components/com_content/src/Controller/DisplayController.php +++ b/components/com_content/src/Controller/DisplayController.php @@ -76,7 +76,7 @@ public function display($cachable = false, $urlparams = false) $vName = $this->input->getCmd('view', 'categories'); $this->input->set('view', $vName); - $user = Factory::getUser(); + $user = $this->app->getIdentity(); if ($user->get('id') || ($this->input->getMethod() === 'POST' diff --git a/components/com_content/src/Model/CategoriesModel.php b/components/com_content/src/Model/CategoriesModel.php index 2912a1b9eef..b3a3a4ebcac 100644 --- a/components/com_content/src/Model/CategoriesModel.php +++ b/components/com_content/src/Model/CategoriesModel.php @@ -96,7 +96,7 @@ protected function getStoreId($id = '') } /** - * Redefine the function an add some properties to make the styling more easy + * Redefine the function and add some properties to make the styling easier * * @param bool $recursive True if you want to return children recursively. * diff --git a/components/com_content/tmpl/categories/default.php b/components/com_content/tmpl/categories/default.php index c7a77f34f86..19a6961ac35 100644 --- a/components/com_content/tmpl/categories/default.php +++ b/components/com_content/tmpl/categories/default.php @@ -19,7 +19,7 @@ /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ $wa = $this->document->getWebAssetManager(); $wa->getRegistry()->addExtensionRegistryFile('com_categories'); -$wa->useScript('com_categories.shared-categories-accordion'); +$wa->usePreset('com_categories.shared-categories-accordion'); ?>
diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php index 908c1bdc14a..fae6443ff36 100644 --- a/components/com_content/tmpl/categories/default_items.php +++ b/components/com_content/tmpl/categories/default_items.php @@ -20,7 +20,7 @@ items[$this->parent->id] as $id => $item) : ?> params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
-

+
escape($item->title); ?> params->get('show_cat_num_articles_cat') == 1) :?> @@ -29,19 +29,19 @@ numitems; ?> - getChildren()) > 0 && $this->maxLevelcat > 1) : ?> - - -

+
+ getChildren()) > 0 && $this->maxLevelcat > 1) : ?> + + params->get('show_description_image') && $item->getParams()->get('image')) : ?> <?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?> @@ -54,7 +54,7 @@ class="btn btn-secondary btn-sm float-end" getChildren()) > 0 && $this->maxLevelcat > 1) : ?> -
+ -> - - +> + + value === 1 ? ' active' : ''; ?> -
+ name=" $group->level + 1)), ENT_COMPAT, 'utf-8') . $group->text; ?>" id="permission-value; ?>"> @@ -243,8 +243,7 @@ class="form-select novalidate"
-
+ - diff --git a/layouts/joomla/installer/changelog.php b/layouts/joomla/installer/changelog.php index 31d6ca1d2dc..da83da03d88 100644 --- a/layouts/joomla/installer/changelog.php +++ b/layouts/joomla/installer/changelog.php @@ -29,7 +29,7 @@ function ($items, $changeType) { $class = 'bg-dark'; break; case 'language': - $class = 'bg-jlanguage'; + $class = 'bg-primary'; break; case 'addition': $class = 'bg-success'; @@ -38,7 +38,7 @@ function ($items, $changeType) { $class = 'bg-warning text-dark'; break; case 'remove': - $class = 'bg-light text-dark'; + $class = 'bg-secondary'; break; default: case 'note': diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php index fe42fc10aab..cd9afe30943 100644 --- a/layouts/joomla/links/link.php +++ b/layouts/joomla/links/link.php @@ -13,13 +13,14 @@ $id = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"'); $target = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"'); +$rel = empty($displayData['rel']) ? '' : (' rel="' . $displayData['rel'] . '"'); $onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"'); $title = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"'); $text = empty($displayData['text']) ? '' : ('' . $displayData['text'] . '') ?> > - > + > diff --git a/libraries/classmap.php b/libraries/classmap.php index ab2b38897be..fcfc9ac8bf5 100644 --- a/libraries/classmap.php +++ b/libraries/classmap.php @@ -106,7 +106,6 @@ JLoader::registerAlias('JAuthenticationHelper', '\\Joomla\\CMS\\Helper\\AuthenticationHelper', '5.0'); JLoader::registerAlias('JHelper', '\\Joomla\\CMS\\Helper\\CMSHelper', '5.0'); JLoader::registerAlias('JHelperContent', '\\Joomla\\CMS\\Helper\\ContentHelper', '5.0'); -JLoader::registerAlias('JHelperContenthistory', '\\Joomla\\CMS\\Helper\\ContentHistoryHelper', '5.0'); JLoader::registerAlias('JLibraryHelper', '\\Joomla\\CMS\\Helper\\LibraryHelper', '5.0'); JLoader::registerAlias('JHelperMedia', '\\Joomla\\CMS\\Helper\\MediaHelper', '5.0'); JLoader::registerAlias('JModuleHelper', '\\Joomla\\CMS\\Helper\\ModuleHelper', '5.0'); diff --git a/libraries/src/Document/JsonapiDocument.php b/libraries/src/Document/JsonapiDocument.php index ad4c3341bd9..2c10a09490b 100644 --- a/libraries/src/Document/JsonapiDocument.php +++ b/libraries/src/Document/JsonapiDocument.php @@ -99,7 +99,7 @@ public function setErrors($errors) */ public function setJsonapi($jsonapi) { - $this->setJsonapi($jsonapi); + $this->document->setJsonapi($jsonapi); return $this; } diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php index b7df22564f5..22e22df8a10 100644 --- a/libraries/src/Factory.php +++ b/libraries/src/Factory.php @@ -418,8 +418,7 @@ public static function getDbo() @trigger_error( sprintf( '%1$s() is deprecated. Load the database from the dependency injection container.', - __METHOD__, - __CLASS__ + __METHOD__ ), E_USER_DEPRECATED ); diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php index 1f49bb57c66..a0ac2dc239c 100644 --- a/libraries/src/Filter/InputFilter.php +++ b/libraries/src/Filter/InputFilter.php @@ -23,6 +23,17 @@ */ class InputFilter extends BaseInputFilter { + /** + * An array containing a list of extensions for files that are typically + * executable directly in the webserver context, potentially resulting in code executions + * + * @since __DEPOY_VERSION__ + */ + public const FORBIDDEN_FILE_EXTENSIONS = [ + 'php', 'phps', 'pht', 'phtml', 'php3', 'php4', 'php5', 'php6', 'php7', 'asp', + 'php8', 'phar', 'inc', 'pl', 'cgi', 'fcgi', 'java', 'jar', 'py', 'aspx' + ]; + /** * A flag for Unicode Supplementary Characters (4-byte Unicode character) stripping. * @@ -180,9 +191,7 @@ public static function isSafeFile($file, $options = array()) 'null_byte' => true, // Forbidden string in extension (e.g. php matched .php, .xxx.php, .php.xxx and so on) - 'forbidden_extensions' => array( - 'php', 'phps', 'pht', 'phtml', 'php3', 'php4', 'php5', 'php6', 'php7', 'phar', 'inc', 'pl', 'cgi', 'fcgi', 'java', 'jar', 'py', - ), + 'forbidden_extensions' => self::FORBIDDEN_FILE_EXTENSIONS, // true, diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php index 9555b81f0ff..8b82996c155 100644 --- a/libraries/src/Form/Field/CalendarField.php +++ b/libraries/src/Form/Field/CalendarField.php @@ -283,34 +283,18 @@ protected function getInput() protected function getLayoutData() { $data = parent::getLayoutData(); - $tag = Factory::getLanguage()->getTag(); - $calendar = Factory::getLanguage()->getCalendar(); + $lang = Factory::getApplication()->getLanguage(); + $calendar = $lang->getCalendar(); $direction = strtolower(Factory::getDocument()->getDirection()); // Get the appropriate file for the current language date helper $helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js'; - if (!empty($calendar) && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar))) + if ($calendar && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar))) { $helperPath = 'system/fields/calendar-locales/date/' . strtolower($calendar) . '/date-helper.min.js'; } - // Get the appropriate locale file for the current language - $localesPath = 'system/fields/calendar-locales/en.js'; - - if (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower($tag) . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . strtolower($tag) . '.js'; - } - elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . $tag . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . $tag . '.js'; - } - elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'; - } - $extraData = array( 'value' => $this->value, 'maxLength' => $this->maxlength, @@ -323,10 +307,12 @@ protected function getLayoutData() 'timeformat' => $this->timeformat, 'singleheader' => ($this->singleheader === 'true') ? 1 : 0, 'helperPath' => $helperPath, - 'localesPath' => $localesPath, 'minYear' => $this->minyear, 'maxYear' => $this->maxyear, 'direction' => $direction, + 'calendar' => $calendar, + 'firstday' => $lang->getFirstDay(), + 'weekend' => explode(',', $lang->getWeekEnd()), ); return array_merge($data, $extraData); diff --git a/libraries/src/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php index 9fd092f17cb..96ffbbbe365 100644 --- a/libraries/src/Form/Field/MediaField.php +++ b/libraries/src/Form/Field/MediaField.php @@ -372,7 +372,7 @@ public function getLayoutData() ',', ComponentHelper::getParams('com_media')->get( 'doc_extensions', - 'doc,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv' + 'doc,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv' ) ) ); diff --git a/libraries/src/Form/Rule/SubformRule.php b/libraries/src/Form/Rule/SubformRule.php index 5632b3e5e09..06b2b6b8032 100644 --- a/libraries/src/Form/Rule/SubformRule.php +++ b/libraries/src/Form/Rule/SubformRule.php @@ -47,6 +47,11 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry throw new \UnexpectedValueException(sprintf('%s is no subform field.', $element['name'])); } + if ($value === null) + { + return true; + } + $subForm = $field->loadSubForm(); // Multiple values: Validate every row. diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index 19bab224566..c37f5a47d5e 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -1121,34 +1121,20 @@ public static function tooltipText($title = '', $content = '', $translate = true */ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attribs = array()) { - $tag = Factory::getLanguage()->getTag(); - $calendar = Factory::getLanguage()->getCalendar(); - $direction = strtolower(Factory::getApplication()->getDocument()->getDirection()); + $app = Factory::getApplication(); + $lang = $app->getLanguage(); + $tag = $lang->getTag(); + $calendar = $lang->getCalendar(); + $direction = strtolower($app->getDocument()->getDirection()); // Get the appropriate file for the current language date helper $helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js'; - if (!empty($calendar) && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar))) + if ($calendar && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar))) { $helperPath = 'system/fields/calendar-locales/date/' . strtolower($calendar) . '/date-helper.min.js'; } - // Get the appropriate locale file for the current language - $localesPath = 'system/fields/calendar-locales/en.js'; - - if (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower($tag) . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . strtolower($tag) . '.js'; - } - elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . $tag . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . $tag . '.js'; - } - elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js')) - { - $localesPath = 'system/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'; - } - $readonly = isset($attribs['readonly']) && $attribs['readonly'] === 'readonly'; $disabled = isset($attribs['disabled']) && $attribs['disabled'] === 'disabled'; $autocomplete = isset($attribs['autocomplete']) && $attribs['autocomplete'] === ''; @@ -1207,13 +1193,15 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri 'singleheader' => $singleHeader, 'tag' => $tag, 'helperPath' => $helperPath, - 'localesPath' => $localesPath, 'direction' => $direction, 'onchange' => $onchange, 'minYear' => $minYear, 'maxYear' => $maxYear, 'dataAttribute' => '', 'dataAttributes' => '', + 'calendar' => $calendar, + 'firstday' => $lang->getFirstDay(), + 'weekend' => explode(',', $lang->getWeekEnd()), ); return LayoutHelper::render('joomla.form.field.calendar', $data, null, null); diff --git a/libraries/src/HTML/Helpers/UiTab.php b/libraries/src/HTML/Helpers/UiTab.php index 040daa8bc69..9235a3cae03 100644 --- a/libraries/src/HTML/Helpers/UiTab.php +++ b/libraries/src/HTML/Helpers/UiTab.php @@ -54,12 +54,16 @@ public static function startTabSet($selector = 'myTab', $params = array()) static::$loaded[__METHOD__][$selector]['active'] = $opt['active']; } - // @TODO echo the recall attribute correctly, now it's hardcoded!!! - $recall = !isset($params['recall']) ? '' : 'recall'; - $orientation = isset($params['orientation']) ? $params['orientation'] : 'horizontal'; + $recall = isset($params['recall']) ? 'recall' : ''; + $breakpoint = isset($params['breakpoint']) ? 'breakpoint="' . $params['breakpoint'] . '"' : ''; + + if (!isset($params['breakpoint']) && $breakpoint === '') + { + $breakpoint = 'breakpoint="768"'; + } - return ''; + return ''; } /** @@ -79,7 +83,7 @@ public static function endTabSet() * * @param string $selector Identifier of the panel. * @param string $id The ID of the div element - * @param string $title The title text for the new UL tab + * @param string $title The title text for the button * * @return string HTML to start a new panel * @@ -89,7 +93,7 @@ public static function addTab($selector, $id, $title) { $active = (static::$loaded[__CLASS__ . '::startTabSet'][$selector]['active'] == $id) ? ' active' : ''; - return '
'; + return ''; } @@ -102,6 +106,6 @@ public static function addTab($selector, $id, $title) */ public static function endTab() { - return '
'; + return ''; } } diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php index ac70f62faaa..525853b07d0 100644 --- a/libraries/src/Helper/MediaHelper.php +++ b/libraries/src/Helper/MediaHelper.php @@ -13,6 +13,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\File; +use Joomla\CMS\Filter\InputFilter; use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\PluginHelper; use Joomla\Registry\Registry; @@ -24,6 +25,20 @@ */ class MediaHelper { + /** + * A special list of blocked executable extensions, skipping executables that are + * typically executable in the webserver context as those are fetched from + * Joomla\CMS\Filter\InputFilter + * + * @var string[] + * @since 4.0.0 + */ + public const EXECUTABLES = array( + 'js', 'exe', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', + 'ins', 'isp', 'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb', + 'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh', 'html', 'htm', 'msi' + ); + /** * Checks if the file is an image * @@ -142,6 +157,47 @@ private function checkMimeType($mime, $component = 'com_media'): bool return true; } + /** + * Checks the file extension + * + * @param string $extension The extension to be checked + * @param string $component The optional name for the component storing the parameters + * + * @return boolean true if it passes the checks else false + * + * @since 4.0.0 + */ + public static function checkFileExtension($extension, $component = 'com_media', $allowedExecutables = array()): bool + { + $params = ComponentHelper::getParams($component); + + // Media file names should never have executable extensions buried in them. + $executables = array_merge(self::EXECUTABLES, InputFilter::FORBIDDEN_FILE_EXTENSIONS); + + // Remove allowed executables from array + if (count($allowedExecutables)) + { + $executables = array_diff($executables, $allowedExecutables); + } + + if (in_array($extension, $executables, true)) + { + return false; + } + + $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv'))); + $ignored = array_map('trim', explode(',', $params->get('ignore_extensions'))); + + if ($extension == '' || $extension == false || (!\in_array($extension, $allowable, true) && !\in_array($filetype, $ignored, true))) + { + return false; + } + + // We don't check mime at all or it passes the checks + return true; + } + + /** * Checks if the file can be uploaded * @@ -185,18 +241,15 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables = array_shift($filetypes); // Media file names should never have executable extensions buried in them. - $executable = array( - 'php', 'js', 'exe', 'phtml', 'java', 'perl', 'py', 'asp', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', 'ins', 'isp', - 'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb', 'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh', 'html', 'htm', - ); + $executables = array_merge(self::EXECUTABLES, InputFilter::FORBIDDEN_FILE_EXTENSIONS); // Remove allowed executables from array if (count($allowedExecutables)) { - $executable = array_diff($executable, $allowedExecutables); + $executable = array_diff($executables, $allowedExecutables); } - $check = array_intersect($filetypes, $executable); + $check = array_intersect($filetypes, $executables); if (!empty($check)) { @@ -207,7 +260,7 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables = $filetype = array_pop($filetypes); - $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions'))); + $allowable = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv'))); $ignored = array_map('trim', explode(',', $params->get('ignore_extensions'))); if ($filetype == '' || $filetype == false || (!\in_array($filetype, $allowable) && !\in_array($filetype, $ignored))) @@ -228,7 +281,7 @@ public function canUpload($file, $component = 'com_media', $allowedExecutables = if ($params->get('restrict_uploads', 1)) { - $allowedExtensions = array_map('trim', explode(',', $params->get('restrict_uploads_extensions'))); + $allowedExtensions = array_map('trim', explode(',', $params->get('restrict_uploads_extensions', 'bmp,gif,jpg,jpeg,png,webp,ico,mp3,m4a,mp4a,ogg,mp4,mp4v,mpeg,mov,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv'))); if (\in_array($filetype, $allowedExtensions)) { @@ -464,4 +517,25 @@ public static function isValidLocalDirectory($directory) return false; } + + /** + * Helper method get clean data for value stores in a Media form field by removing adapter information + * from the value if available (in this case, the value will have this format: + * images/headers/blue-flower.jpg#joomlaImage://local-images/headers/blue-flower.jpg?width=700&height=180) + * + * @param string $value + * + * @return string + * + * @since 4.0.0 + */ + public static function getCleanMediaFieldValue($value) + { + if ($pos = strpos($value, '#')) + { + return substr($value, 0, $pos); + } + + return $value; + } } diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php index 17873e9e498..dd7ed75f498 100644 --- a/libraries/src/Installer/Adapter/LibraryAdapter.php +++ b/libraries/src/Installer/Adapter/LibraryAdapter.php @@ -309,8 +309,13 @@ protected function removeExtensionFiles() // Delete empty vendor folders if (2 === \count($elementParts)) { - Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]); - Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]); + $folders = Folder::folders(JPATH_PLATFORM . '/' . $elementParts[0]); + + if (empty($folders)) + { + Folder::delete(JPATH_MANIFESTS . '/libraries/' . $elementParts[0]); + Folder::delete(JPATH_PLATFORM . '/' . $elementParts[0]); + } } } diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php index e72083ae55d..d6d8b81ae8b 100644 --- a/libraries/src/Installer/Adapter/PluginAdapter.php +++ b/libraries/src/Installer/Adapter/PluginAdapter.php @@ -232,7 +232,7 @@ protected function finaliseUninstall(): bool */ public function getElement($element = null) { - if (!$element) + if (!$element && $this->getManifest()) { // Backward Compatibility // @todo Deprecate in future version @@ -421,7 +421,10 @@ protected function setupUninstall() $this->parent->findManifest(); $this->setManifest($this->parent->getManifest()); - $this->group = (string) $this->getManifest()->attributes()->group; + if ($this->getManifest()) + { + $this->group = (string) $this->getManifest()->attributes()->group; + } // Attempt to load the language file; might have uninstall strings $this->loadLanguage($this->parent->getPath('source')); diff --git a/libraries/src/Language/Language.php b/libraries/src/Language/Language.php index 87d9a0df99b..6372405b3ff 100644 --- a/libraries/src/Language/Language.php +++ b/libraries/src/Language/Language.php @@ -388,19 +388,29 @@ public function _($string, $jsSafe = false, $interpretBackSlashes = true) */ public function transliterate($string) { - // Override custom and core transliterate method with native php function if enabled - if (function_exists('transliterator_transliterate') && function_exists('iconv')) - { - return iconv("UTF-8", "ASCII//TRANSLIT//IGNORE", transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $string)); - } - + // First check for transliterator provided by translation if ($this->transliterator !== null) { - return \call_user_func($this->transliterator, $string); + $string = \call_user_func($this->transliterator, $string); + + // Check if all symbols were transliterated (contains only ASCII), otherwise continue + if (!preg_match('/[\\x80-\\xff]/', $string)) + { + return $string; + } } + // Run our transliterator for common symbols, + // This need to be executed before native php transliterator, because it may not have all required transliterators $string = Transliterate::utf8_latin_to_ascii($string); + // Check if all symbols were transliterated (contains only ASCII), + // Otherwise try to use native php function if available + if (preg_match('/[\\x80-\\xff]/', $string) && function_exists('transliterator_transliterate') && function_exists('iconv')) + { + return iconv("UTF-8", "ASCII//TRANSLIT//IGNORE", transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $string)); + } + return StringHelper::strtolower($string); } diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php index 2a24ba9da58..d60ef39b87f 100644 --- a/libraries/src/Mail/MailTemplate.php +++ b/libraries/src/Mail/MailTemplate.php @@ -418,6 +418,7 @@ public static function createTemplate($key, $subject, $body, $tags, $htmlbody = $template->subject = $subject; $template->body = $body; $template->htmlbody = $htmlbody; + $template->attachments = ''; $params = new \stdClass; $params->tags = array($tags); $template->params = json_encode($params); @@ -495,6 +496,10 @@ protected function getAttachmentName(string $file, string $name): string return ''; } + // Replace any placeholders. + $name = $this->replaceTags($name, $this->data); + + // Get the file extension. $ext = File::getExt($file); // Strip off extension from $name and append extension of $file, if any diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php index 7b61934cb7c..25f81a057cf 100644 --- a/libraries/src/User/UserHelper.php +++ b/libraries/src/User/UserHelper.php @@ -24,7 +24,9 @@ use Joomla\CMS\Log\Log; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Plugin\PluginHelper; +use Joomla\CMS\Session\SessionManager; use Joomla\CMS\Uri\Uri; +use Joomla\Database\Exception\ExecutionFailureException; use Joomla\Database\ParameterType; use Joomla\Utilities\ArrayHelper; @@ -589,4 +591,89 @@ public static function checkSuperUserInUsers(array $userIds) return false; } + + /** + * Destroy all active session for a given user id + * + * @param int $userId Id of user + * @param boolean $keepCurrent Keep the session of the currently acting user + * @param int $clientId Application client id + * + * @return boolean + * + * @since 3.9.28 + */ + public static function destroyUserSessions($userId, $keepCurrent = false, $clientId = null) + { + // Destroy all sessions for the user account if able + if (!Factory::getApplication()->get('session_metadata', true)) + { + return false; + } + + $db = Factory::getDbo(); + + try + { + $userId = (int) $userId; + + $query = $db->getQuery(true) + ->select($db->quoteName('session_id')) + ->from($db->quoteName('#__session')) + ->where($db->quoteName('userid') . ' = :userid') + ->bind(':userid', $userId, ParameterType::INTEGER); + + if ($clientId !== null) + { + $clientId = (int) $clientId; + + $query->where($db->quoteName('client_id') . ' = :client_id') + ->bind(':client_id', $clientId, ParameterType::INTEGER); + } + + $sessionIds = $db->setQuery($query)->loadColumn(); + } + catch (ExecutionFailureException $e) + { + return false; + } + + // Convert PostgreSQL Session IDs into strings (see GitHub #33822) + foreach ($sessionIds as &$sessionId) + { + if (is_resource($sessionId) && get_resource_type($sessionId) === 'stream') + { + $sessionId = stream_get_contents($sessionId); + } + } + + // If true, removes the current session id from the purge list + if ($keepCurrent) + { + $sessionIds = array_diff($sessionIds, array(Factory::getSession()->getId())); + } + + // If there aren't any active sessions then there's nothing to do here + if (empty($sessionIds)) + { + return false; + } + + /** @var SessionManager $sessionManager */ + $sessionManager = Factory::getContainer()->get('session.manager'); + $sessionManager->destroySessions($sessionIds); + + try + { + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__session')) + ->whereIn($db->quoteName('session_id'), $sessionIds, ParameterType::LARGE_OBJECT) + )->execute(); + } + catch (ExecutionFailureException $e) + { + // No issue, let things go + } + } } diff --git a/libraries/src/Version.php b/libraries/src/Version.php index ea5a0c9c48b..8efce77eb2e 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '29-June-2021'; + const RELDATE = '10-August-2021'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '19:04'; + const RELTIME = '23:02'; /** * Release timezone. diff --git a/libraries/src/Workflow/WorkflowServiceInterface.php b/libraries/src/Workflow/WorkflowServiceInterface.php index 3e5f4c2f226..07f60519f59 100644 --- a/libraries/src/Workflow/WorkflowServiceInterface.php +++ b/libraries/src/Workflow/WorkflowServiceInterface.php @@ -97,7 +97,7 @@ public function getWorkflowContexts(): array; * * @return string|null * - * @since __DEPLOY_VERSION__ + * @since 4.0.0 */ public function getCategoryWorkflowContext(?string $section = null): string; } diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml index 6e831f6c884..2e4a8d7538e 100644 --- a/modules/mod_articles_archive/mod_articles_archive.xml +++ b/modules/mod_articles_archive/mod_articles_archive.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_archive.ini - en-GB.mod_articles_archive.sys.ini + language/en-GB/mod_articles_archive.ini + language/en-GB/mod_articles_archive.sys.ini diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml index bde5034ff45..6e3834dfbd8 100644 --- a/modules/mod_articles_categories/mod_articles_categories.xml +++ b/modules/mod_articles_categories/mod_articles_categories.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_categories.ini - en-GB.mod_articles_categories.sys.ini + language/en-GB/mod_articles_categories.ini + language/en-GB/mod_articles_categories.sys.ini diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml index 5dfecaa97cb..b06238f7a29 100644 --- a/modules/mod_articles_category/mod_articles_category.xml +++ b/modules/mod_articles_category/mod_articles_category.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_category.ini - en-GB.mod_articles_category.sys.ini + language/en-GB/mod_articles_category.ini + language/en-GB/mod_articles_category.sys.ini diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml index 17c1182a6a2..089f8004a89 100644 --- a/modules/mod_articles_latest/mod_articles_latest.xml +++ b/modules/mod_articles_latest/mod_articles_latest.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_latest.ini - en-GB.mod_articles_latest.sys.ini + language/en-GB/mod_articles_latest.ini + language/en-GB/mod_articles_latest.sys.ini diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml index 6d2e49fe787..768b285f4ca 100644 --- a/modules/mod_articles_news/mod_articles_news.xml +++ b/modules/mod_articles_news/mod_articles_news.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_news.ini - en-GB.mod_articles_news.sys.ini + language/en-GB/mod_articles_news.ini + language/en-GB/mod_articles_news.sys.ini diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml index 7943a69cdcd..c201552ae2f 100644 --- a/modules/mod_articles_popular/mod_articles_popular.xml +++ b/modules/mod_articles_popular/mod_articles_popular.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_articles_popular.ini - en-GB.mod_articles_popular.sys.ini + language/en-GB/mod_articles_popular.ini + language/en-GB/mod_articles_popular.sys.ini diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml index b5aea8e0885..95265593516 100644 --- a/modules/mod_banners/mod_banners.xml +++ b/modules/mod_banners/mod_banners.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_banners.ini - en-GB.mod_banners.sys.ini + language/en-GB/mod_banners.ini + language/en-GB/mod_banners.sys.ini diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml index fda486f77ba..183db1d7cc6 100644 --- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml +++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_breadcrumbs.ini - en-GB.mod_breadcrumbs.sys.ini + language/en-GB/mod_breadcrumbs.ini + language/en-GB/mod_breadcrumbs.sys.ini diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml index d4bb3097257..09ca1e6d9e0 100644 --- a/modules/mod_custom/mod_custom.xml +++ b/modules/mod_custom/mod_custom.xml @@ -17,8 +17,8 @@ tmpl - en-GB.mod_custom.ini - en-GB.mod_custom.sys.ini + language/en-GB/mod_custom.ini + language/en-GB/mod_custom.sys.ini diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml index 068e9879932..fe5e3647a8e 100644 --- a/modules/mod_feed/mod_feed.xml +++ b/modules/mod_feed/mod_feed.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_feed.ini - en-GB.mod_feed.sys.ini + language/en-GB/mod_feed.ini + language/en-GB/mod_feed.sys.ini diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml index 6fc424ca792..96817d86a1f 100644 --- a/modules/mod_footer/mod_footer.xml +++ b/modules/mod_footer/mod_footer.xml @@ -15,8 +15,8 @@ tmpl - en-GB.mod_footer.ini - en-GB.mod_footer.sys.ini + language/en-GB/mod_footer.ini + language/en-GB/mod_footer.sys.ini diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml index 8be9e125533..4aaaf00b0d8 100644 --- a/modules/mod_languages/mod_languages.xml +++ b/modules/mod_languages/mod_languages.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_languages.ini - en-GB.mod_languages.sys.ini + language/en-GB/mod_languages.ini + language/en-GB/mod_languages.sys.ini diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php index 79102332307..20ced923f9f 100644 --- a/modules/mod_languages/tmpl/default.php +++ b/modules/mod_languages/tmpl/default.php @@ -10,71 +10,80 @@ defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Uri\Uri; /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */ $wa = $app->getDocument()->getWebAssetManager(); $wa->registerAndUseStyle('mod_languages', 'mod_languages/template.css'); - ?>
+ +

-get('dropdown', 0) && !$params->get('dropdownimage', 1)) : ?> - - - -get('dropdown', 0) && $params->get('dropdownimage', 1)) : ?> +get('dropdown', 0)) : ?>
active) : ?> - - image) : ?> - image . '.gif', '', null, true); ?> + -
-
    +
      + + get('full_name') === 0) && ($params->get('image') === 0)) || (!$language->image)) + { + $lbl = 'aria-label="' . $language->title_native . '"'; + } + ?> active) : ?>
    • - + href="link, ENT_QUOTES, 'UTF-8'), ENT_NOQUOTES); ?>"> get('image', 1)) : ?> image) : ?> image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> @@ -89,18 +98,17 @@ get('show_active', 1)) : ?>
    • - - - get('image', 1)) : ?> - image) : ?> - image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> - - sef); ?> - - - get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?> - - + href=""> + get('image', 1)) : ?> + image) : ?> + image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> + + sef); ?> + + + get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?> + +
      • diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml index fdc194f71b1..3d8455c3948 100644 --- a/modules/mod_login/mod_login.xml +++ b/modules/mod_login/mod_login.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_login.ini - en-GB.mod_login.sys.ini + language/en-GB/mod_login.ini + language/en-GB/mod_login.sys.ini diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml index 3d63e13a5bf..44f1be13001 100644 --- a/modules/mod_menu/mod_menu.xml +++ b/modules/mod_menu/mod_menu.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_menu.ini - en-GB.mod_menu.sys.ini + language/en-GB/mod_menu.ini + language/en-GB/mod_menu.sys.ini diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml index 6f3e6d819e3..e9c756ac033 100644 --- a/modules/mod_random_image/mod_random_image.xml +++ b/modules/mod_random_image/mod_random_image.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_random_image.ini - en-GB.mod_random_image.sys.ini + language/en-GB/mod_random_image.ini + language/en-GB/mod_random_image.sys.ini diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml index 618d49efc1e..9c6a14dcc9c 100644 --- a/modules/mod_related_items/mod_related_items.xml +++ b/modules/mod_related_items/mod_related_items.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_related_items.ini - en-GB.mod_related_items.sys.ini + language/en-GB/mod_related_items.ini + language/en-GB/mod_related_items.sys.ini diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml index 3643de6b1ab..6931f04e2ea 100644 --- a/modules/mod_stats/mod_stats.xml +++ b/modules/mod_stats/mod_stats.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_stats.ini - en-GB.mod_stats.sys.ini + language/en-GB/mod_stats.ini + language/en-GB/mod_stats.sys.ini diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml index f7217c35c67..4201f71eabb 100644 --- a/modules/mod_syndicate/mod_syndicate.xml +++ b/modules/mod_syndicate/mod_syndicate.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_syndicate.ini - en-GB.mod_syndicate.sys.ini + language/en-GB/mod_syndicate.ini + language/en-GB/mod_syndicate.sys.ini diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml index 5f17fd81aae..37fbbd6be26 100644 --- a/modules/mod_tags_popular/mod_tags_popular.xml +++ b/modules/mod_tags_popular/mod_tags_popular.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_tags_popular.ini - en-GB.mod_tags_popular.sys.ini + language/en-GB/mod_tags_popular.ini + language/en-GB/mod_tags_popular.sys.ini diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml index a47c0103bf2..81ad3666ec3 100644 --- a/modules/mod_tags_similar/mod_tags_similar.xml +++ b/modules/mod_tags_similar/mod_tags_similar.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_tags_similar.ini - en-GB.mod_tags_similar.sys.ini + language/en-GB/mod_tags_similar.ini + language/en-GB/mod_tags_similar.sys.ini diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml index 0043c7ff338..6d011ed8957 100644 --- a/modules/mod_users_latest/mod_users_latest.xml +++ b/modules/mod_users_latest/mod_users_latest.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_users_latest.ini - en-GB.mod_users_latest.sys.ini + language/en-GB/mod_users_latest.ini + language/en-GB/mod_users_latest.sys.ini diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml index 07e99203646..ed4c09cb9d1 100644 --- a/modules/mod_whosonline/mod_whosonline.xml +++ b/modules/mod_whosonline/mod_whosonline.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_whosonline.ini - en-GB.mod_whosonline.sys.ini + language/en-GB/mod_whosonline.ini + language/en-GB/mod_whosonline.sys.ini diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml index 149e6d3bbe1..5e9ec4c38fe 100644 --- a/modules/mod_wrapper/mod_wrapper.xml +++ b/modules/mod_wrapper/mod_wrapper.xml @@ -16,8 +16,8 @@ tmpl - en-GB.mod_wrapper.ini - en-GB.mod_wrapper.sys.ini + language/en-GB/mod_wrapper.ini + language/en-GB/mod_wrapper.sys.ini diff --git a/package-lock.json b/package-lock.json index aea89d96d4d..43f0dd0a63b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9925 +1,8 @@ { "name": "joomla", "version": "4.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "joomla", - "version": "4.0.0", - "hasInstallScript": true, - "license": "GPL-2.0-or-later", - "dependencies": { - "@claviska/jquery-minicolors": "^2.3.5", - "@fortawesome/fontawesome-free": "^5.15.3", - "@popperjs/core": "^2.9.2", - "@webcomponents/webcomponentsjs": "^2.5.0", - "accessibility": "^3.0.10", - "awesomplete": "1.1.5", - "bootstrap": "^5.0.2", - "choices.js": "^9.0.1", - "chosen-js": "^1.8.7", - "codemirror": "^5.62.0", - "cropperjs": "^1.5.11", - "diff": "^4.0.2", - "dragula": "3.7.2", - "focus-visible": "^5.2.0", - "joomla-ui-custom-elements": "0.0.42", - "jquery": "^3.6.0", - "jquery-migrate": "^3.3.2", - "mark.js": "^8.11.1", - "mediaelement": "^4.2.16", - "metismenujs": "^1.2.1", - "punycode": "^2.1.1", - "qrcode-generator": "^1.4.4", - "roboto-fontface": "^0.10.0", - "short-and-sweet": "^1.0.2", - "skipto": "^4.1.0", - "tinymce": "^5.8.2", - "vue": "^3.1.2", - "vuex": "^4.0.2", - "vuex-persistedstate": "^4.0.0-beta.3" - }, - "devDependencies": { - "@babel/core": "^7.14.0", - "@babel/plugin-transform-classes": "^7.13.0", - "@babel/plugin-transform-runtime": "^7.13.15", - "@babel/preset-env": "^7.14.1", - "@dgrammatiko/compress": "^1.0.4", - "@rollup/plugin-babel": "^5.3.0", - "@rollup/plugin-commonjs": "^17.1.0", - "@rollup/plugin-node-resolve": "^11.2.0", - "@rollup/plugin-replace": "^2.4.1", - "@vue/compiler-sfc": "^3.1.2", - "autoprefixer": "^9.8.6", - "babel-plugin-add-header-comment": "^1.0.3", - "commander": "^5.1.0", - "core-js": "^3.12.0", - "crypto": "^1.0.1", - "cssnano": "^4.1.11", - "eslint": "^7.25.0", - "eslint-config-airbnb-base": "^14.2.1", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-vue": "^7.9.0", - "fs-extra": "^9.1.0", - "ini": "^1.3.8", - "jasmine-core": "^3.7.1", - "karma": "^5.2.3", - "karma-coverage": "^2.0.3", - "karma-firefox-launcher": "^1.3.0", - "karma-fixture": "^0.2.6", - "karma-html2js-preprocessor": "^1.1.0", - "karma-jasmine": "^3.3.1", - "karma-jasmine-ajax": "^0.1.13", - "karma-json-fixtures-preprocessor": "0.0.6", - "karma-verbose-reporter": "^0.0.6", - "postcss": "^7.0.35", - "recursive-readdir": "^2.2.2", - "rimraf": "^3.0.2", - "rollup": "^2.52.3", - "rollup-plugin-vue": "^6.0.0", - "sass": "^1.32.12", - "selenium-standalone": "6.23.0", - "stylelint": "^13.13.1", - "stylelint-config-standard": "^20.0.0", - "stylelint-order": "^4.1.0", - "stylelint-scss": "^3.19.0", - "terser": "^5.7.0", - "watch": "^1.0.2" - }, - "engines": { - "node": ">=12.0", - "npm": ">=6.13.4" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", - "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.12.13" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz", - "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==", - "dev": true - }, - "node_modules/@babel/core": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz", - "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", - "dev": true - }, - "node_modules/@babel/core/node_modules/@babel/generator": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz", - "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.14.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.13.15", - "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", - "semver": "^6.3.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/helper-module-transforms": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz", - "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/core/node_modules/@babel/helpers": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz", - "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==", - "dev": true, - "dependencies": { - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/parser": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz", - "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/traverse": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz", - "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.0", - "@babel/types": "^7.14.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/generator": { - "version": "7.13.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz", - "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.13.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz", - "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz", - "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==", - "dev": true, - "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.12.13", - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.13.13", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz", - "integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.13.12", - "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", - "semver": "^6.3.0" - } - }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz", - "integrity": "sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13" - } - }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz", - "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "regexpu-core": "^4.7.1" - } - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz", - "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==", - "dev": true, - "dependencies": { - "@babel/helper-compilation-targets": "^7.13.0", - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/traverse": "^7.13.0", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - } - }, - "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz", - "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.13.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz", - "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==", - "dev": true, - "dependencies": { - "@babel/helper-get-function-arity": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz", - "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz", - "integrity": "sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==", - "dev": true, - "dependencies": { - "@babel/traverse": "^7.13.15", - "@babel/types": "^7.13.16" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/generator": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz", - "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.14.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/parser": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz", - "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/traverse": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz", - "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.0", - "@babel/types": "^7.14.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz", - "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.13.12" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz", - "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.13.12" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz", - "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.12.11", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.13.13", - "@babel/types": "^7.13.14" - } - }, - "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz", - "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz", - "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==", - "dev": true - }, - "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz", - "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-wrap-function": "^7.13.0", - "@babel/types": "^7.13.0" - } - }, - "node_modules/@babel/helper-replace-supers": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz", - "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==", - "dev": true, - "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.12" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz", - "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.13.12" - } - }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", - "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.1" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz", - "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==" - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.12.17", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz", - "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==", - "dev": true - }, - "node_modules/@babel/helper-wrap-function": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz", - "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==", - "dev": true, - "dependencies": { - "@babel/helper-function-name": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.13.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz", - "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.13.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz", - "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz", - "integrity": "sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.13.12" - } - }, - "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz", - "integrity": "sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0", - "@babel/plugin-syntax-async-generators": "^7.8.4" - } - }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz", - "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.13.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz", - "integrity": "sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-class-static-block": "^7.12.13" - } - }, - "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz", - "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz", - "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz", - "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-json-strings": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz", - "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz", - "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz", - "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz", - "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.13.8", - "@babel/helper-compilation-targets": "^7.13.8", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.13.0" - } - }, - "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz", - "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.13.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz", - "integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz", - "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz", - "integrity": "sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-create-class-features-plugin": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0" - } - }, - "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz", - "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz", - "integrity": "sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz", - "integrity": "sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz", - "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz", - "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz", - "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz", - "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz", - "integrity": "sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz", - "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-replace-supers": "^7.13.0", - "@babel/helper-split-export-declaration": "^7.12.13", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz", - "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.13.17", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz", - "integrity": "sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz", - "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz", - "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz", - "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==", - "dev": true, - "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz", - "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz", - "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==", - "dev": true, - "dependencies": { - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz", - "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz", - "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz", - "integrity": "sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/generator": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz", - "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.14.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-module-transforms": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz", - "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/parser": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz", - "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/traverse": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz", - "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.0", - "@babel/types": "^7.14.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz", - "integrity": "sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-simple-access": "^7.13.12", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/generator": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz", - "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.14.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-module-transforms": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz", - "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/parser": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz", - "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/traverse": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz", - "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.0", - "@babel/types": "^7.14.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz", - "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==", - "dev": true, - "dependencies": { - "@babel/helper-hoist-variables": "^7.13.0", - "@babel/helper-module-transforms": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-identifier": "^7.12.11", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz", - "integrity": "sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==", - "dev": true, - "dependencies": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/generator": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz", - "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.14.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-module-transforms": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz", - "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/parser": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz", - "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/traverse": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz", - "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.0", - "@babel/types": "^7.14.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz", - "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-new-target": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz", - "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-object-super": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz", - "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13", - "@babel/helper-replace-supers": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz", - "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz", - "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz", - "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==", - "dev": true, - "dependencies": { - "regenerator-transform": "^0.14.2" - } - }, - "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz", - "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-runtime": { - "version": "7.13.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz", - "integrity": "sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-plugin-utils": "^7.13.0", - "babel-plugin-polyfill-corejs2": "^0.2.0", - "babel-plugin-polyfill-corejs3": "^0.2.0", - "babel-plugin-polyfill-regenerator": "^0.2.0", - "semver": "^6.3.0" - } - }, - "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz", - "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-spread": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz", - "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" - } - }, - "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz", - "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz", - "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" - } - }, - "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz", - "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz", - "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz", - "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==", - "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "node_modules/@babel/preset-env": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.1.tgz", - "integrity": "sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.14.0", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-option": "^7.12.17", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-async-generator-functions": "^7.13.15", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-class-static-block": "^7.13.11", - "@babel/plugin-proposal-dynamic-import": "^7.13.8", - "@babel/plugin-proposal-export-namespace-from": "^7.12.13", - "@babel/plugin-proposal-json-strings": "^7.13.8", - "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", - "@babel/plugin-proposal-numeric-separator": "^7.12.13", - "@babel/plugin-proposal-object-rest-spread": "^7.13.8", - "@babel/plugin-proposal-optional-catch-binding": "^7.13.8", - "@babel/plugin-proposal-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-private-methods": "^7.13.0", - "@babel/plugin-proposal-private-property-in-object": "^7.14.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.12.13", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.12.13", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0", - "@babel/plugin-syntax-top-level-await": "^7.12.13", - "@babel/plugin-transform-arrow-functions": "^7.13.0", - "@babel/plugin-transform-async-to-generator": "^7.13.0", - "@babel/plugin-transform-block-scoped-functions": "^7.12.13", - "@babel/plugin-transform-block-scoping": "^7.14.1", - "@babel/plugin-transform-classes": "^7.13.0", - "@babel/plugin-transform-computed-properties": "^7.13.0", - "@babel/plugin-transform-destructuring": "^7.13.17", - "@babel/plugin-transform-dotall-regex": "^7.12.13", - "@babel/plugin-transform-duplicate-keys": "^7.12.13", - "@babel/plugin-transform-exponentiation-operator": "^7.12.13", - "@babel/plugin-transform-for-of": "^7.13.0", - "@babel/plugin-transform-function-name": "^7.12.13", - "@babel/plugin-transform-literals": "^7.12.13", - "@babel/plugin-transform-member-expression-literals": "^7.12.13", - "@babel/plugin-transform-modules-amd": "^7.14.0", - "@babel/plugin-transform-modules-commonjs": "^7.14.0", - "@babel/plugin-transform-modules-systemjs": "^7.13.8", - "@babel/plugin-transform-modules-umd": "^7.14.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13", - "@babel/plugin-transform-new-target": "^7.12.13", - "@babel/plugin-transform-object-super": "^7.12.13", - "@babel/plugin-transform-parameters": "^7.13.0", - "@babel/plugin-transform-property-literals": "^7.12.13", - "@babel/plugin-transform-regenerator": "^7.13.15", - "@babel/plugin-transform-reserved-words": "^7.12.13", - "@babel/plugin-transform-shorthand-properties": "^7.12.13", - "@babel/plugin-transform-spread": "^7.13.0", - "@babel/plugin-transform-sticky-regex": "^7.12.13", - "@babel/plugin-transform-template-literals": "^7.13.0", - "@babel/plugin-transform-typeof-symbol": "^7.12.13", - "@babel/plugin-transform-unicode-escapes": "^7.12.13", - "@babel/plugin-transform-unicode-regex": "^7.12.13", - "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.1", - "babel-plugin-polyfill-corejs2": "^0.2.0", - "babel-plugin-polyfill-corejs3": "^0.2.0", - "babel-plugin-polyfill-regenerator": "^0.2.0", - "core-js-compat": "^3.9.0", - "semver": "^6.3.0" - } - }, - "node_modules/@babel/preset-env/node_modules/@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", - "dev": true - }, - "node_modules/@babel/preset-env/node_modules/@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.13.15", - "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", - "semver": "^6.3.0" - } - }, - "node_modules/@babel/preset-env/node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", - "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", - "dev": true - }, - "node_modules/@babel/preset-env/node_modules/@babel/types": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", - "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@babel/preset-modules": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", - "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - } - }, - "node_modules/@babel/runtime": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", - "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", - "dev": true, - "dependencies": { - "regenerator-runtime": "^0.13.4" - } - }, - "node_modules/@babel/template": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", - "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/parser": "^7.12.13", - "@babel/types": "^7.12.13" - } - }, - "node_modules/@babel/traverse": { - "version": "7.13.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz", - "integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.13.9", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.13.13", - "@babel/types": "^7.13.13", - "debug": "^4.1.0", - "globals": "^11.1.0" - } - }, - "node_modules/@babel/types": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz", - "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==", - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - }, - "node_modules/@claviska/jquery-minicolors": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.5.tgz", - "integrity": "sha512-LpiN8hyqRPYB2tEzFD4lI54GxKHQXhzrJMnKnsumElYxjkjbdAPmiIm+1k/Mkfn92HepL7t9uaK5iQSFP/19aw==" - }, - "node_modules/@dgrammatiko/compress": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@dgrammatiko/compress/-/compress-1.0.4.tgz", - "integrity": "sha512-6wHmScQSlTYyh6E5hGarAYdTY6MseAwZbPnQ0Blkeno9MHv+ZIGECOIQRZwY1JFyrx85DIK2zdep+fefbXeo3A==", - "dev": true, - "bin": { - "compress": "index.js" - }, - "engines": { - "node": "^10.16.0 || >=11.7.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz", - "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^12.1.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", - "dev": true, - "dependencies": { - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@eslint/eslintrc/node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@eslint/eslintrc/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "5.15.3", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz", - "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.4", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.4", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" - }, - "node_modules/@rollup/plugin-babel": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz", - "integrity": "sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.10.4", - "@rollup/pluginutils": "^3.1.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@rollup/plugin-commonjs": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz", - "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "commondir": "^1.0.1", - "estree-walker": "^2.0.1", - "glob": "^7.1.6", - "is-reference": "^1.2.1", - "magic-string": "^0.25.7", - "resolve": "^1.17.0" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/@rollup/plugin-node-resolve": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz", - "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "@types/resolve": "1.17.1", - "builtin-modules": "^3.1.0", - "deepmerge": "^4.2.2", - "is-module": "^1.0.0", - "resolve": "^1.19.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@rollup/plugin-replace": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz", - "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" - } - }, - "node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", - "dev": true, - "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/@rollup/pluginutils/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "node_modules/@sindresorhus/is": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz", - "integrity": "sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/@stylelint/postcss-css-in-js": { - "version": "0.37.2", - "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz", - "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==", - "dev": true, - "dependencies": { - "@babel/core": ">=7.9.0" - } - }, - "node_modules/@stylelint/postcss-markdown": { - "version": "0.36.2", - "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz", - "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==", - "dev": true, - "dependencies": { - "remark": "^13.0.0", - "unist-util-find-all-after": "^3.0.2" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz", - "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==", - "dev": true, - "dependencies": { - "defer-to-connect": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@types/cacheable-request": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz", - "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==", - "dev": true, - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "*", - "@types/node": "*", - "@types/responselike": "*" - } - }, - "node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz", - "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==", - "dev": true - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, - "node_modules/@types/keyv": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz", - "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/mdast": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz", - "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==", - "dev": true, - "dependencies": { - "@types/unist": "*" - } - }, - "node_modules/@types/minimist": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", - "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", - "dev": true - }, - "node_modules/@types/node": { - "version": "14.14.37", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz", - "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==", - "dev": true - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", - "dev": true - }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "node_modules/@types/q": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", - "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==", - "dev": true - }, - "node_modules/@types/resolve": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", - "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/responselike": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", - "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/unist": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", - "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==", - "dev": true - }, - "node_modules/@vue/compiler-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz", - "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==", - "dependencies": { - "@babel/parser": "^7.12.0", - "@babel/types": "^7.12.0", - "@vue/shared": "3.1.2", - "estree-walker": "^2.0.1", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-core/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@vue/compiler-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz", - "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==", - "dependencies": { - "@vue/compiler-core": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/compiler-sfc": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.1.2.tgz", - "integrity": "sha512-SeG/2+DvwejQ7oAiSx8BrDh5qOdqCYHGClPiTvVIHTfSIHiS2JjMbCANdDCjHkTOh/O7WZzo2JhdKm98bRBxTw==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.13.9", - "@babel/types": "^7.13.0", - "@types/estree": "^0.0.48", - "@vue/compiler-core": "3.1.2", - "@vue/compiler-dom": "3.1.2", - "@vue/compiler-ssr": "3.1.2", - "@vue/shared": "3.1.2", - "consolidate": "^0.16.0", - "estree-walker": "^2.0.1", - "hash-sum": "^2.0.0", - "lru-cache": "^5.1.1", - "magic-string": "^0.25.7", - "merge-source-map": "^1.1.0", - "postcss": "^8.1.10", - "postcss-modules": "^4.0.0", - "postcss-selector-parser": "^6.0.4", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/@types/estree": { - "version": "0.0.48", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz", - "integrity": "sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==", - "dev": true - }, - "node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz", - "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.12.0", - "@babel/types": "^7.12.0", - "@vue/shared": "3.1.2", - "estree-walker": "^2.0.1", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz", - "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==", - "dev": true, - "dependencies": { - "@vue/compiler-core": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz", - "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==", - "dev": true - }, - "node_modules/@vue/compiler-sfc/node_modules/postcss": { - "version": "8.3.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz", - "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==", - "dev": true, - "dependencies": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", - "source-map-js": "^0.6.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/@vue/compiler-sfc/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@vue/compiler-ssr": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.1.2.tgz", - "integrity": "sha512-BwXo9LFk5OSWdMyZQ4bX1ELHX0Z/9F+ld/OaVnpUPzAZCHslBYLvyKUVDwv2C/lpLjRffpC2DOUEdl1+RP1aGg==", - "dev": true, - "dependencies": { - "@vue/compiler-dom": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/compiler-ssr/node_modules/@vue/compiler-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz", - "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.12.0", - "@babel/types": "^7.12.0", - "@vue/shared": "3.1.2", - "estree-walker": "^2.0.1", - "source-map": "^0.6.1" - } - }, - "node_modules/@vue/compiler-ssr/node_modules/@vue/compiler-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz", - "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==", - "dev": true, - "dependencies": { - "@vue/compiler-core": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz", - "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==", - "dev": true - }, - "node_modules/@vue/compiler-ssr/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@vue/devtools-api": { - "version": "6.0.0-beta.14", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.14.tgz", - "integrity": "sha512-44fPrrN1cqcs6bFkT0C+yxTM6PZXLbR+ESh1U1j8UD22yO04gXvxH62HApMjLbS3WqJO/iCNC+CYT+evPQh2EQ==" - }, - "node_modules/@vue/reactivity": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.2.tgz", - "integrity": "sha512-glJzJoN2xE7I2lRvwKM5u1BHRPTd1yc8iaf//Lai/78/uYAvE5DXp5HzWRFOwMlbRvMGJHIQjOqoxj87cDAaag==", - "dependencies": { - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/runtime-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.1.2.tgz", - "integrity": "sha512-gsPZG4dRIkixuuKmoj4P9IHgfT0yaFLcqWOM5F/bCk0nxQn1XtxH8oUehWuET726KhbukvDoJfe9G2CKviy80w==", - "dependencies": { - "@vue/reactivity": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/@vue/runtime-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.1.2.tgz", - "integrity": "sha512-QvINxjLucEZFzp5f0NVu7JqWYCv5TKQfkH2FDs/N6QNE4iKcYtKrWdT0HKfABnVXG28Znqv6rIH0dH4ZAOwxpA==", - "dependencies": { - "@vue/runtime-core": "3.1.2", - "@vue/shared": "3.1.2", - "csstype": "^2.6.8" - } - }, - "node_modules/@vue/shared": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz", - "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==" - }, - "node_modules/@webcomponents/webcomponentsjs": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.5.0.tgz", - "integrity": "sha512-C0l51MWQZ9kLzcxOZtniOMohpIFdCLZum7/TEHv3XWFc1Fvt5HCpbSX84x8ltka/JuNKcuiDnxXFkiB2gaePcg==" - }, - "node_modules/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, - "dependencies": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/accessibility": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.13.tgz", - "integrity": "sha512-8nF6xjBCCCEw2x9zzK/sPNA/OGiBDjNDn6KhCKuMblPd/RwXfEe3fEUaMaJp+KuCr64RLTpceuqQ9ozam0aQWg==" - }, - "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true - }, - "node_modules/after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "node_modules/alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, - "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/array-includes": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", - "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "get-intrinsic": "^1.1.1", - "is-string": "^1.0.5" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/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 - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/atoa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz", - "integrity": "sha1-DMDpGkgOc4+SPrwQNnZHF3mzSkk=" - }, - "node_modules/autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "dev": true, - "dependencies": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" - } - }, - "node_modules/awesomplete": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/awesomplete/-/awesomplete-1.1.5.tgz", - "integrity": "sha512-UFw1mPW8NaSECDSTC36HbAOTpF9JK2wBUJcNn4MSvlNtK7SZ9N72gB+ajHtA6D1abYXRcszZnBA4nHBwvFwzHw==" - }, - "node_modules/babel-plugin-add-header-comment": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz", - "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw=", - "dev": true - }, - "node_modules/babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", - "dev": true, - "dependencies": { - "object.assign": "^4.1.0" - } - }, - "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz", - "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.0", - "semver": "^6.1.1" - } - }, - "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz", - "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.0", - "core-js-compat": "^3.9.1" - } - }, - "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz", - "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==", - "dev": true, - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.0" - } - }, - "node_modules/backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, - "node_modules/bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", - "dev": true - }, - "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "node_modules/base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "node_modules/base64id": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", - "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", - "dev": true, - "engines": { - "node": "^4.5.0 || >= 5.9" - } - }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/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 - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "node_modules/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dev": true, - "dependencies": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "node_modules/bootstrap": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.2.tgz", - "integrity": "sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.16.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", - "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", - "dev": true, - "dependencies": { - "caniuse-lite": "^1.0.30001219", - "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.723", - "escalade": "^3.1.1", - "node-releases": "^1.1.71" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "node_modules/builtin-modules": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz", - "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "dev": true, - "engines": { - "node": ">=10.6.0" - } - }, - "node_modules/cacheable-request": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz", - "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==", - "dev": true, - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cacheable-request/node_modules/normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "node_modules/caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, - "dependencies": { - "callsites": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, - "dependencies": { - "caller-callsite": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, - "dependencies": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/camelcase-keys/node_modules/quick-lru": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", - "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "dependencies": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001232", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz", - "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==", - "dev": true - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true - }, - "node_modules/character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true - }, - "node_modules/character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", - "dev": true - }, - "node_modules/choices.js": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-9.0.1.tgz", - "integrity": "sha512-JgpeDY0Tmg7tqY6jaW/druSklJSt7W68tXFJIw0GSGWmO37SDAL8o60eICNGbzIODjj02VNNtf5h6TgoHDtCsA==", - "dependencies": { - "deepmerge": "^4.2.0", - "fuse.js": "^3.4.5", - "redux": "^4.0.4" - } - }, - "node_modules/chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.1" - } - }, - "node_modules/chosen-js": { - "version": "1.8.7", - "resolved": "https://registry.npmjs.org/chosen-js/-/chosen-js-1.8.7.tgz", - "integrity": "sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==" - }, - "node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "node_modules/clone-regexp": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", - "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", - "dev": true, - "dependencies": { - "is-regexp": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "dependencies": { - "mimic-response": "^1.0.0" - } - }, - "node_modules/coa": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", - "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, - "dependencies": { - "@types/q": "^1.5.1", - "chalk": "^2.4.1", - "q": "^1.1.2" - }, - "engines": { - "node": ">= 4.0" - } - }, - "node_modules/codemirror": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.0.tgz", - "integrity": "sha512-Xnl3304iCc8nyVZuRkzDVVwc794uc9QNX0UcPGeNic1fbzkSrO4l4GVXho9tRNKBgPYZXgocUqXyfIv3BILhCQ==" - }, - "node_modules/color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", - "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.1", - "color-string": "^1.5.4" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/color-string": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", - "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", - "dev": true, - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "node_modules/component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, - "node_modules/component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "node_modules/confusing-browser-globals": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz", - "integrity": "sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==", - "dev": true - }, - "node_modules/connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", - "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/connect/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/connect/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/consolidate": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz", - "integrity": "sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==", - "dev": true, - "dependencies": { - "bluebird": "^3.7.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/contra": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/contra/-/contra-1.9.4.tgz", - "integrity": "sha1-9TveQtfltZhcrk2ZqNYQUm3o8o0=", - "dependencies": { - "atoa": "1.0.0", - "ticky": "1.0.1" - } - }, - "node_modules/convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.1" - } - }, - "node_modules/cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/core-js": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.12.0.tgz", - "integrity": "sha512-SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw==", - "dev": true, - "hasInstallScript": true - }, - "node_modules/core-js-compat": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.12.0.tgz", - "integrity": "sha512-vvaN8EOvYBEjrr+MN3vCKrMNc/xdYZI+Rt/uPMROi4T5Hj8Fz6TiPQm2mrB9aZoQVW1lCFHYmMrv99aUct9mkg==", - "dev": true, - "dependencies": { - "browserslist": "^4.16.6", - "semver": "7.0.0" - } - }, - "node_modules/core-js-compat/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true, - "dependencies": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cropperjs": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.11.tgz", - "integrity": "sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA==" - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crossvent": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/crossvent/-/crossvent-1.5.4.tgz", - "integrity": "sha1-2ixPj0DJR4JRe/K+7BBEFIGUq5I=", - "dependencies": { - "custom-event": "1.0.0" - } - }, - "node_modules/crypto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz", - "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==", - "dev": true - }, - "node_modules/css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/css-declaration-sorter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", - "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", - "dev": true, - "dependencies": { - "postcss": "^7.0.1", - "timsort": "^0.3.0" - }, - "engines": { - "node": ">4" - } - }, - "node_modules/css-select": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", - "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^3.2.1", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" - } - }, - "node_modules/css-select-base-adapter": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true - }, - "node_modules/css-tree": { - "version": "1.0.0-alpha.37", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", - "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.4", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/css-tree/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/css-what": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", - "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cssnano": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", - "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==", - "dev": true, - "dependencies": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.8", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/cssnano-preset-default": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz", - "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==", - "dev": true, - "dependencies": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^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.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "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.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.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.3", - "postcss-unique-selectors": "^4.0.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/cssnano-util-get-arguments": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", - "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/cssnano-util-get-match": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", - "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/cssnano-util-raw-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", - "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/cssnano-util-same-parent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", - "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/csso": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, - "dependencies": { - "css-tree": "^1.1.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/csso/node_modules/css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/csso/node_modules/mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true - }, - "node_modules/csso/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/csstype": { - "version": "2.6.17", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.17.tgz", - "integrity": "sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==" - }, - "node_modules/custom-event": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.0.tgz", - "integrity": "sha1-LkYovhncSyFLXAJjDFlx6BFhgGI=" - }, - "node_modules/date-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", - "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dir-glob/node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "dependencies": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" - } - }, - "node_modules/dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, - "dependencies": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - } - }, - "node_modules/dom-serializer/node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true - }, - "node_modules/dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" - }, - "node_modules/domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true - }, - "node_modules/domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "dev": true, - "dependencies": { - "domelementtype": "1" - } - }, - "node_modules/domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, - "dependencies": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "node_modules/dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dragula": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/dragula/-/dragula-3.7.2.tgz", - "integrity": "sha1-SjXJ05gf+sGpScKcpyhQWOhzk84=", - "dependencies": { - "contra": "1.9.4", - "crossvent": "1.5.4" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "node_modules/electron-to-chromium": { - "version": "1.3.743", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz", - "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/engine.io": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz", - "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==", - "dev": true, - "dependencies": { - "accepts": "~1.3.4", - "base64id": "2.0.0", - "cookie": "~0.4.1", - "debug": "~4.1.0", - "engine.io-parser": "~2.2.0", - "ws": "~7.4.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/engine.io-client": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", - "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", - "dev": true, - "dependencies": { - "component-emitter": "~1.3.0", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.2.0", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.6.2", - "yeast": "0.1.2" - } - }, - "node_modules/engine.io-client/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/engine.io-client/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/engine.io-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", - "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", - "dev": true, - "dependencies": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.4", - "blob": "0.0.5", - "has-binary2": "~1.0.2" - } - }, - "node_modules/engine.io/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/eslint": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz", - "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash": "^4.17.21", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.4", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/eslint-config-airbnb-base": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz", - "integrity": "sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==", - "dev": true, - "dependencies": { - "confusing-browser-globals": "^1.0.10", - "object.assign": "^4.1.2", - "object.entries": "^1.1.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", - "dev": true, - "dependencies": { - "debug": "^2.6.9", - "resolve": "^1.13.1" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/eslint-module-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", - "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", - "dev": true, - "dependencies": { - "debug": "^2.6.9", - "pkg-dir": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/eslint-module-utils/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/eslint-plugin-import": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", - "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.1", - "array.prototype.flat": "^1.2.3", - "contains-path": "^0.1.0", - "debug": "^2.6.9", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.0", - "has": "^1.0.3", - "minimatch": "^3.0.4", - "object.values": "^1.1.1", - "read-pkg-up": "^2.0.0", - "resolve": "^1.17.0", - "tsconfig-paths": "^3.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", - "dev": true, - "dependencies": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/eslint-plugin-import/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/eslint-plugin-vue": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz", - "integrity": "sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.1.0", - "natural-compare": "^1.4.0", - "semver": "^7.3.2", - "vue-eslint-parser": "^7.6.0" - }, - "engines": { - "node": ">=8.10" - } - }, - "node_modules/eslint-plugin-vue/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint-plugin-vue/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint-plugin-vue/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", - "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/eslint/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", - "dev": true, - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/esquery": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", - "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true - }, - "node_modules/exec-sh": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz", - "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", - "dev": true, - "dependencies": { - "merge": "^1.2.0" - } - }, - "node_modules/execall": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", - "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", - "dev": true, - "dependencies": { - "clone-regexp": "^2.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/fastest-levenshtein": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dev": true, - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", - "dev": true - }, - "node_modules/focus-visible": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.2.0.tgz", - "integrity": "sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==" - }, - "node_modules/follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "node_modules/fuse.js": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz", - "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/generic-names": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz", - "integrity": "sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==", - "dev": true, - "dependencies": { - "loader-utils": "^1.1.0" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dependencies": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, - "node_modules/global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "dependencies": { - "global-prefix": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "dependencies": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/globby/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/globjoin": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", - "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", - "dev": true - }, - "node_modules/gonzales-pe": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz", - "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "gonzales": "bin/gonzales.js" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/got": { - "version": "11.8.2", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", - "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==", - "dev": true, - "dependencies": { - "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", - "@types/cacheable-request": "^6.0.1", - "@types/responselike": "^1.0.0", - "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.1", - "decompress-response": "^6.0.0", - "http2-wrapper": "^1.0.0-beta.5.2", - "lowercase-keys": "^2.0.0", - "p-cancelable": "^2.0.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", - "dev": true - }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true - }, - "node_modules/has-binary2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", - "dev": true, - "dependencies": { - "isarray": "2.0.1" - } - }, - "node_modules/has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true - }, - "node_modules/hex-color-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", - "dev": true - }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/hsl-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=", - "dev": true - }, - "node_modules/hsla-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", - "dev": true - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/html-tags": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz", - "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "dev": true, - "dependencies": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - } - }, - "node_modules/htmlparser2/node_modules/entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", - "dev": true - }, - "node_modules/http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dev": true, - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/http-errors/node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "node_modules/http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "dependencies": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dev": true, - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "node_modules/icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >= 14" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, - "dependencies": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "node_modules/indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true - }, - "node_modules/is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, - "dependencies": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "node_modules/is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", - "dev": true - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-color-stop": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", - "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "dev": true, - "dependencies": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" - } - }, - "node_modules/is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - } - }, - "node_modules/is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true - }, - "node_modules/is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-docker": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", - "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", - "dev": true - }, - "node_modules/is-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", - "dev": true - }, - "node_modules/is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-reference": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", - "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", - "dev": true, - "dependencies": { - "@types/estree": "*" - } - }, - "node_modules/is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-regexp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", - "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "node_modules/is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - }, - "node_modules/isbinaryfile": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz", - "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==", - "dev": true, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, - "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-report/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-report/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/istanbul-reports": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", - "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", - "dev": true, - "dependencies": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/jasmine-ajax": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jasmine-ajax/-/jasmine-ajax-3.4.0.tgz", - "integrity": "sha512-LIVNVCmx5ou+IG6wgX7j73YYzvE2e3aqFWMjOhvAHWTnLICOYSobIH+PG/gOwtP20X0u2SkD3NXT/j5X8rMGOA==", - "dev": true - }, - "node_modules/jasmine-core": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.1.tgz", - "integrity": "sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==", - "dev": true - }, - "node_modules/joomla-ui-custom-elements": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/joomla-ui-custom-elements/-/joomla-ui-custom-elements-0.0.42.tgz", - "integrity": "sha512-a2vC/V35VkrztR40rG7aa09ivh+F5sG51GfPrCdXU5jPk1TPIUk2YkZHB9dpzCYnqZTf5aX4ziN0RK1ySi3ygw==" - }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" - }, - "node_modules/jquery-migrate": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.2.tgz", - "integrity": "sha512-L3gYhr7yEtLUSAeqXSicVa0vRD4aGwjw/bWY8YzrO2o/qDY1BaMyP3oB3bZf5Auy3Hu9ynliio0CTyDWCBPVDw==" - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "node_modules/karma": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz", - "integrity": "sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==", - "dev": true, - "dependencies": { - "body-parser": "^1.19.0", - "braces": "^3.0.2", - "chokidar": "^3.4.2", - "colors": "^1.4.0", - "connect": "^3.7.0", - "di": "^0.0.1", - "dom-serialize": "^2.2.1", - "glob": "^7.1.6", - "graceful-fs": "^4.2.4", - "http-proxy": "^1.18.1", - "isbinaryfile": "^4.0.6", - "lodash": "^4.17.19", - "log4js": "^6.2.1", - "mime": "^2.4.5", - "minimatch": "^3.0.4", - "qjobs": "^1.2.0", - "range-parser": "^1.2.1", - "rimraf": "^3.0.2", - "socket.io": "^2.3.0", - "source-map": "^0.6.1", - "tmp": "0.2.1", - "ua-parser-js": "0.7.22", - "yargs": "^15.3.1" - }, - "bin": { - "karma": "bin/karma" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/karma-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.0.3.tgz", - "integrity": "sha512-atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.1", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.0", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/karma-firefox-launcher": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz", - "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==", - "dev": true, - "dependencies": { - "is-wsl": "^2.1.0" - } - }, - "node_modules/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 - }, - "node_modules/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 - }, - "node_modules/karma-jasmine": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.3.1.tgz", - "integrity": "sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==", - "dev": true, - "dependencies": { - "jasmine-core": "^3.5.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/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, - "dependencies": { - "jasmine-ajax": "^3.0.0" - } - }, - "node_modules/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 - }, - "node_modules/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, - "dependencies": { - "colors": ">=1.0" - } - }, - "node_modules/karma/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/keyv": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz", - "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/known-css-properties": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz", - "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==", - "dev": true - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "node_modules/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, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "dependencies": { - "error-ex": "^1.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/loader-utils/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "node_modules/lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, - "node_modules/lodash.mapvalues": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", - "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", - "dev": true - }, - "node_modules/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 - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, - "node_modules/lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/log-symbols/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/log-symbols/node_modules/chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/log-symbols/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/log-symbols/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/log-symbols/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/log-symbols/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/log4js": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.3.0.tgz", - "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==", - "dev": true, - "dependencies": { - "date-format": "^3.0.0", - "debug": "^4.1.1", - "flatted": "^2.0.1", - "rfdc": "^1.1.4", - "streamroller": "^2.2.4" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/log4js/node_modules/flatted": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - }, - "node_modules/longest-streak": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", - "dev": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/magic-string": { - "version": "0.25.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", - "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", - "dev": true, - "dependencies": { - "sourcemap-codec": "^1.4.4" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/mark.js": { - "version": "8.11.1", - "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz", - "integrity": "sha1-GA8fnr74sOY45BZq1S24eb6y/8U=" - }, - "node_modules/mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", - "dev": true - }, - "node_modules/mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", - "dev": true, - "dependencies": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, - "node_modules/mdast-util-to-markdown": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" - } - }, - "node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", - "dev": true - }, - "node_modules/mdn-data": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", - "dev": true - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mediaelement": { - "version": "4.2.16", - "resolved": "https://registry.npmjs.org/mediaelement/-/mediaelement-4.2.16.tgz", - "integrity": "sha512-5GinxsRpVA36w6tAD6nTqVSiZ0LzIhqUrzD8wzOAtZPPM7NOwOBtz6Oa85VemS+3Jvoo38jM1RvNqwKYJBBxtQ==", - "dependencies": { - "global": "^4.3.1" - } - }, - "node_modules/meow": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", - "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", - "dev": true, - "dependencies": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize": "^1.2.0", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/normalize-package-data": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", - "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "resolve": "^1.20.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/meow/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/meow/node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/meow/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/meow/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==", - "dev": true - }, - "node_modules/merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, - "dependencies": { - "source-map": "^0.6.1" - } - }, - "node_modules/merge-source-map/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/metismenujs": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/metismenujs/-/metismenujs-1.2.1.tgz", - "integrity": "sha512-v7b3sjCSPmivYVBrmC3cs0ylgM/wPpZezG+i0rKUJJfLafANzBnSwA5gKaTXfJihdRJu+CQ0c66bNs4pf9Om/Q==", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", - "dev": true, - "dependencies": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, - "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", - "dev": true, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", - "dev": true, - "dependencies": { - "mime-db": "1.46.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "dependencies": { - "dom-walk": "^0.1.0" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/minimist-options/node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/nanoid": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", - "dev": true - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", - "dev": true - }, - "node_modules/normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, - "dependencies": { - "boolbase": "~1.0.0" - } - }, - "node_modules/num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "node_modules/object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", - "dev": true - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.getownpropertydescriptors": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", - "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/object.values": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", - "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2", - "has": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-cancelable": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz", - "integrity": "sha512-HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "dependencies": { - "p-try": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "dependencies": { - "p-limit": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parent-module/node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "dependencies": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, - "node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "node_modules/parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", - "dev": true - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/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=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "node_modules/path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "dependencies": { - "pify": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "dependencies": { - "find-up": "^2.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-calc": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", - "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", - "dev": true, - "dependencies": { - "postcss": "^7.0.27", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" - } - }, - "node_modules/postcss-colormin": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", - "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", - "dev": true, - "dependencies": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-colormin/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-convert-values": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", - "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-convert-values/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-discard-comments": { - "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, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-discard-duplicates": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", - "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-discard-empty": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", - "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-discard-overridden": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", - "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-html": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz", - "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==", - "dev": true, - "dependencies": { - "htmlparser2": "^3.10.0" - } - }, - "node_modules/postcss-less": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz", - "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==", - "dev": true, - "dependencies": { - "postcss": "^7.0.14" - }, - "engines": { - "node": ">=6.14.4" - } - }, - "node_modules/postcss-media-query-parser": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", - "dev": true - }, - "node_modules/postcss-merge-longhand": { - "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, - "dependencies": { - "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-merge-rules": { - "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, - "dependencies": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-merge-rules/node_modules/postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "dependencies": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/postcss-minify-font-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", - "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-minify-gradients": { - "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, - "dependencies": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-minify-params": { - "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, - "dependencies": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-minify-params/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-minify-selectors": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", - "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", - "dev": true, - "dependencies": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-minify-selectors/node_modules/postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "dependencies": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/postcss-modules": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.1.3.tgz", - "integrity": "sha512-dBT39hrXe4OAVYJe/2ZuIZ9BzYhOe7t+IhedYeQ2OxKwDpAGlkEN/fR0fGnrbx4BvgbMReRX4hCubYK9cE/pJQ==", - "dev": true, - "dependencies": { - "generic-names": "^2.0.1", - "icss-replace-symbols": "^1.1.0", - "lodash.camelcase": "^4.3.0", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "string-hash": "^1.1.1" - } - }, - "node_modules/postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >= 14" - } - }, - "node_modules/postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", - "dev": true, - "dependencies": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - } - }, - "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", - "dev": true, - "dependencies": { - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - } - }, - "node_modules/postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "dev": true, - "dependencies": { - "icss-utils": "^5.0.0" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - } - }, - "node_modules/postcss-normalize-charset": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", - "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-display-values": { - "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, - "dependencies": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-positions": { - "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, - "dependencies": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-repeat-style": { - "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, - "dependencies": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-string": { - "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, - "dependencies": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-timing-functions": { - "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, - "dependencies": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-unicode": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", - "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "dev": true, - "dependencies": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-url": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", - "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", - "dev": true, - "dependencies": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-normalize-whitespace": { - "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, - "dependencies": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-ordered-values": { - "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, - "dependencies": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-reduce-initial": { - "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, - "dependencies": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-reduce-transforms": { - "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, - "dependencies": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=", - "dev": true - }, - "node_modules/postcss-safe-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz", - "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", - "dev": true, - "dependencies": { - "postcss": "^7.0.26" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-sass": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz", - "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==", - "dev": true, - "dependencies": { - "gonzales-pe": "^4.3.0", - "postcss": "^7.0.21" - } - }, - "node_modules/postcss-scss": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz", - "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==", - "dev": true, - "dependencies": { - "postcss": "^7.0.6" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", - "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-sorting": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz", - "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14", - "postcss": "^7.0.17" - }, - "engines": { - "node": ">=8.7.0" - } - }, - "node_modules/postcss-svgo": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz", - "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==", - "dev": true, - "dependencies": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-svgo/node_modules/postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "node_modules/postcss-syntax": { - "version": "0.36.2", - "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz", - "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==", - "dev": true - }, - "node_modules/postcss-unique-selectors": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", - "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", - "dev": true, - "dependencies": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true - }, - "node_modules/postcss/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postcss/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/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, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true, - "engines": { - "node": ">=0.6.0", - "teleport": ">=0.2.0" - } - }, - "node_modules/qjobs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz", - "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", - "dev": true, - "engines": { - "node": ">=0.9" - } - }, - "node_modules/qrcode-generator": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz", - "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==" - }, - "node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dev": true, - "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "dependencies": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "dependencies": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", - "dev": true, - "dependencies": { - "minimatch": "3.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, - "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/redux": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz", - "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", - "dependencies": { - "loose-envify": "^1.4.0", - "symbol-observable": "^1.2.0" - } - }, - "node_modules/regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true - }, - "node_modules/regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", - "dev": true, - "dependencies": { - "regenerate": "^1.4.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true - }, - "node_modules/regenerator-transform": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", - "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.8.4" - } - }, - "node_modules/regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/regexpu-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", - "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", - "dev": true, - "dependencies": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/regjsgen": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", - "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", - "dev": true - }, - "node_modules/regjsparser": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", - "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", - "dev": true, - "dependencies": { - "jsesc": "~0.5.0" - }, - "bin": { - "regjsparser": "bin/parser" - } - }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, - "node_modules/remark": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz", - "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==", - "dev": true, - "dependencies": { - "remark-parse": "^9.0.0", - "remark-stringify": "^9.0.0", - "unified": "^9.1.0" - } - }, - "node_modules/remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "dependencies": { - "mdast-util-from-markdown": "^0.8.0" - } - }, - "node_modules/remark-stringify": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz", - "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==", - "dev": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", - "dev": true, - "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" - } - }, - "node_modules/resolve-alpn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz", - "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==", - "dev": true - }, - "node_modules/resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/responselike": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", - "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", - "dev": true, - "dependencies": { - "lowercase-keys": "^2.0.0" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", - "dev": true - }, - "node_modules/rgb-regex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=", - "dev": true - }, - "node_modules/rgba-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", - "dev": true - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/roboto-fontface": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz", - "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==" - }, - "node_modules/rollup": { - "version": "2.52.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.3.tgz", - "integrity": "sha512-QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg==", - "dev": true, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=10.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/rollup-plugin-vue": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-vue/-/rollup-plugin-vue-6.0.0.tgz", - "integrity": "sha512-oVvUd84d5u73M2HYM3XsMDLtZRIA/tw2U0dmHlXU2UWP5JARYHzh/U9vcxaN/x/9MrepY7VH3pHFeOhrWpxs/Q==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "hash-sum": "^2.0.0", - "rollup-pluginutils": "^2.8.2" - } - }, - "node_modules/rollup-pluginutils": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", - "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", - "dev": true, - "dependencies": { - "estree-walker": "^0.6.1" - } - }, - "node_modules/rollup-pluginutils/node_modules/estree-walker": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", - "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/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==", - "dev": true - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/sass": { - "version": "1.32.12", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz", - "integrity": "sha512-zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==", - "dev": true, - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=8.9.0" - } - }, - "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, - "node_modules/selenium-standalone": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-6.23.0.tgz", - "integrity": "sha512-6dVLSEvbixd/MRSEmrcRQD8dmABrzNsxRqroKFQY+RVzm1JVPgGHIlo6qJzG6akfjc2V8SadHslE6lN4BFVM3w==", - "dev": true, - "dependencies": { - "commander": "^2.20.3", - "cross-spawn": "^7.0.3", - "debug": "^4.3.1", - "got": "^11.8.0", - "lodash.mapvalues": "^4.6.0", - "lodash.merge": "^4.6.2", - "minimist": "^1.2.5", - "mkdirp": "^1.0.4", - "progress": "2.0.3", - "tar-stream": "2.1.4", - "which": "^2.0.2", - "yauzl": "^2.10.0" - }, - "bin": { - "selenium-standalone": "bin/selenium-standalone", - "start-selenium": "bin/start-selenium" - } - }, - "node_modules/selenium-standalone/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/short-and-sweet": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/short-and-sweet/-/short-and-sweet-1.0.2.tgz", - "integrity": "sha512-uGGsxoTZvFHlrWo9OySSiK2og6qgSYkXLfcgziA5OvHBtsCsU+Yi7mnxN3KOEytYPzC0RyiWv+iZg/zzAqU6YA==" - }, - "node_modules/shvl": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.2.tgz", - "integrity": "sha512-G3KkIXPza3dgkt6Bo8zIl5K/KvAAhbG6o9KfAjhPvrIIzzAhnfc2ztv1i+iPTbNNM43MaBUqIaZwqVjkSgY/rw==" - }, - "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true - }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/simple-swizzle/node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true - }, - "node_modules/skipto": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/skipto/-/skipto-4.1.0.tgz", - "integrity": "sha512-y1tJWLhUZ9hSngBYRKzeO1zpV+//4L7I5lyGrvdUDLbTvTViD2i3FYY7bGkAxkVV/PLdcE+yuL0iQSWcVn32wQ==", - "engines": { - "node": ">=6" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/slice-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/socket.io": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz", - "integrity": "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==", - "dev": true, - "dependencies": { - "debug": "~4.1.0", - "engine.io": "~3.5.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.4.0", - "socket.io-parser": "~3.4.0" - } - }, - "node_modules/socket.io-adapter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", - "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", - "dev": true - }, - "node_modules/socket.io-client": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", - "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", - "dev": true, - "dependencies": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "engine.io-client": "~3.5.0", - "has-binary2": "~1.0.2", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "socket.io-parser": "~3.3.0", - "to-array": "0.1.4" - } - }, - "node_modules/socket.io-client/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/socket.io-client/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/socket.io-client/node_modules/socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", - "dev": true, - "dependencies": { - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "isarray": "2.0.1" - } - }, - "node_modules/socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", - "dev": true, - "dependencies": { - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "isarray": "2.0.1" - } - }, - "node_modules/socket.io-parser/node_modules/component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "node_modules/socket.io-parser/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/socket.io/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", - "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/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, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "dev": true - }, - "node_modules/spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", - "dev": true - }, - "node_modules/specificity": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", - "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", - "dev": true, - "bin": { - "specificity": "bin/specificity" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true - }, - "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/streamroller": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz", - "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==", - "dev": true, - "dependencies": { - "date-format": "^2.1.0", - "debug": "^4.1.1", - "fs-extra": "^8.1.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/streamroller/node_modules/date-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/streamroller/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/streamroller/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/streamroller/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "node_modules/string-hash": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz", - "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=", - "dev": true - }, - "node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/style-search": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", - "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=", - "dev": true - }, - "node_modules/stylehacks": { - "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, - "dependencies": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/stylehacks/node_modules/postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "dependencies": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint": { - "version": "13.13.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz", - "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==", - "dev": true, - "dependencies": { - "@stylelint/postcss-css-in-js": "^0.37.2", - "@stylelint/postcss-markdown": "^0.36.2", - "autoprefixer": "^9.8.6", - "balanced-match": "^2.0.0", - "chalk": "^4.1.1", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", - "execall": "^2.0.0", - "fast-glob": "^3.2.5", - "fastest-levenshtein": "^1.0.12", - "file-entry-cache": "^6.0.1", - "get-stdin": "^8.0.0", - "global-modules": "^2.0.0", - "globby": "^11.0.3", - "globjoin": "^0.1.4", - "html-tags": "^3.1.0", - "ignore": "^5.1.8", - "import-lazy": "^4.0.0", - "imurmurhash": "^0.1.4", - "known-css-properties": "^0.21.0", - "lodash": "^4.17.21", - "log-symbols": "^4.1.0", - "mathml-tag-names": "^2.1.3", - "meow": "^9.0.0", - "micromatch": "^4.0.4", - "normalize-selector": "^0.2.0", - "postcss": "^7.0.35", - "postcss-html": "^0.36.0", - "postcss-less": "^3.1.4", - "postcss-media-query-parser": "^0.2.3", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^4.0.2", - "postcss-sass": "^0.4.4", - "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.5", - "postcss-syntax": "^0.36.2", - "postcss-value-parser": "^4.1.0", - "resolve-from": "^5.0.0", - "slash": "^3.0.0", - "specificity": "^0.4.1", - "string-width": "^4.2.2", - "strip-ansi": "^6.0.0", - "style-search": "^0.1.0", - "sugarss": "^2.0.0", - "svg-tags": "^1.0.0", - "table": "^6.6.0", - "v8-compile-cache": "^2.3.0", - "write-file-atomic": "^3.0.3" - }, - "bin": { - "stylelint": "bin/stylelint.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/stylelint-config-recommended": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz", - "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==", - "dev": true - }, - "node_modules/stylelint-config-standard": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz", - "integrity": "sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==", - "dev": true, - "dependencies": { - "stylelint-config-recommended": "^3.0.0" - } - }, - "node_modules/stylelint-order": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz", - "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15", - "postcss": "^7.0.31", - "postcss-sorting": "^5.0.1" - } - }, - "node_modules/stylelint-scss": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz", - "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.15", - "postcss-media-query-parser": "^0.2.3", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", - "dev": true - }, - "node_modules/stylelint/node_modules/chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/stylelint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/stylelint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/stylelint/node_modules/cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", - "dev": true, - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/stylelint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/stylelint/node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/stylelint/node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint/node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/postcss-selector-parser": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz", - "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/stylelint/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/stylelint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sugarss": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", - "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==", - "dev": true, - "dependencies": { - "postcss": "^7.0.2" - } - }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", - "dev": true - }, - "node_modules/svgo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", - "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "dev": true, - "dependencies": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.37", - "csso": "^4.0.2", - "js-yaml": "^3.13.1", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" - }, - "bin": { - "svgo": "bin/svgo" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/svgo/node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/table": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz", - "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==", - "dev": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz", - "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/tar-stream": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz", - "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/terser": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz", - "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==", - "dev": true, - "dependencies": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/terser/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "node_modules/ticky": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ticky/-/ticky-1.0.1.tgz", - "integrity": "sha1-t8+nHnaPHJAAxJe5FRswlHxQ5G0=" - }, - "node_modules/timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, - "node_modules/tinymce": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.8.2.tgz", - "integrity": "sha512-qfWThBrSzbj4DoUk+lgGeDoP2GzLDSWrfvVUxf40HZhTzsG15X2nZ4N49IFqwaVgRl5AyFDtuWiEH/lCmiAcRA==" - }, - "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "dependencies": { - "rimraf": "^3.0.0" - }, - "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/trim-newlines": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", - "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", - "dev": true - }, - "node_modules/tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.0", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/ua-parser-js": { - "version": "0.7.22", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz", - "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", - "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.1", - "has-symbols": "^1.0.2", - "which-boxed-primitive": "^1.0.2" - } - }, - "node_modules/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", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", - "dev": true, - "dependencies": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unicode-property-aliases-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", - "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unified": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz", - "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==", - "dev": true, - "dependencies": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - } - }, - "node_modules/uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "node_modules/uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, - "node_modules/unist-util-find-all-after": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz", - "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==", - "dev": true, - "dependencies": { - "unist-util-is": "^4.0.0" - } - }, - "node_modules/unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true - }, - "node_modules/unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.2" - } - }, - "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/unquote": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "node_modules/util.promisify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", - "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.2", - "has-symbols": "^1.0.1", - "object.getownpropertydescriptors": "^2.1.0" - } - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/vendors": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", - "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", - "dev": true - }, - "node_modules/vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - } - }, - "node_modules/vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, - "node_modules/void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/vue": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.1.2.tgz", - "integrity": "sha512-q/rbKpb7aofax4ugqu2k/uj7BYuNPcd6Z5/qJtfkJQsE0NkwVoCyeSh7IZGH61hChwYn3CEkh4bHolvUPxlQ+w==", - "dependencies": { - "@vue/compiler-dom": "3.1.2", - "@vue/runtime-dom": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "node_modules/vue-eslint-parser": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz", - "integrity": "sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "eslint-scope": "^5.0.0", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.2.1", - "esquery": "^1.4.0", - "lodash": "^4.17.15" - }, - "engines": { - "node": ">=8.10" - } - }, - "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/vue-eslint-parser/node_modules/espree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", - "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/vuex": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", - "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", - "dependencies": { - "@vue/devtools-api": "^6.0.0-beta.11" - } - }, - "node_modules/vuex-persistedstate": { - "version": "4.0.0-beta.3", - "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.0.0-beta.3.tgz", - "integrity": "sha512-T4IRD27qoUWh+8qr6T6zVp15xO7x/nPgnU13OD0C2uUwA7U9PhGozrj6lvVmMYDyRgc36J0msMXn3GvwHjkIhA==", - "dependencies": { - "deepmerge": "^4.2.2", - "shvl": "^2.0.2" - } - }, - "node_modules/watch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz", - "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=", - "dev": true, - "dependencies": { - "exec-sh": "^0.2.0", - "minimist": "^1.2.0" - }, - "bin": { - "watch": "cli.js" - }, - "engines": { - "node": ">=0.1.95" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "node_modules/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 - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/ws": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", - "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", - "dev": true, - "engines": { - "node": ">=8.3.0" - } - }, - "node_modules/xmlhttprequest-ssl": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", - "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", - "dev": true - }, - "node_modules/zwitch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", - "dev": true - } - }, "dependencies": { "@babel/code-frame": { "version": "7.12.13", @@ -11573,6 +1656,24 @@ "@types/responselike": "*" } }, + "@types/component-emitter": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", + "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==", + "dev": true + }, + "@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", + "dev": true + }, + "@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", + "dev": true + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -11722,35 +1823,6 @@ "integrity": "sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==", "dev": true }, - "@vue/compiler-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz", - "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==", - "dev": true, - "requires": { - "@babel/parser": "^7.12.0", - "@babel/types": "^7.12.0", - "@vue/shared": "3.1.2", - "estree-walker": "^2.0.1", - "source-map": "^0.6.1" - } - }, - "@vue/compiler-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz", - "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==", - "dev": true, - "requires": { - "@vue/compiler-core": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "@vue/shared": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz", - "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==", - "dev": true - }, "postcss": { "version": "8.3.5", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz", @@ -11772,49 +1844,12 @@ }, "@vue/compiler-ssr": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.1.2.tgz", - "integrity": "sha512-BwXo9LFk5OSWdMyZQ4bX1ELHX0Z/9F+ld/OaVnpUPzAZCHslBYLvyKUVDwv2C/lpLjRffpC2DOUEdl1+RP1aGg==", - "dev": true, - "requires": { - "@vue/compiler-dom": "3.1.2", - "@vue/shared": "3.1.2" - }, - "dependencies": { - "@vue/compiler-core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz", - "integrity": "sha512-nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q==", - "dev": true, - "requires": { - "@babel/parser": "^7.12.0", - "@babel/types": "^7.12.0", - "@vue/shared": "3.1.2", - "estree-walker": "^2.0.1", - "source-map": "^0.6.1" - } - }, - "@vue/compiler-dom": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz", - "integrity": "sha512-k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg==", - "dev": true, - "requires": { - "@vue/compiler-core": "3.1.2", - "@vue/shared": "3.1.2" - } - }, - "@vue/shared": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz", - "integrity": "sha512-EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg==", - "dev": true - }, - "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 - } + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.1.2.tgz", + "integrity": "sha512-BwXo9LFk5OSWdMyZQ4bX1ELHX0Z/9F+ld/OaVnpUPzAZCHslBYLvyKUVDwv2C/lpLjRffpC2DOUEdl1+RP1aGg==", + "dev": true, + "requires": { + "@vue/compiler-dom": "3.1.2", + "@vue/shared": "3.1.2" } }, "@vue/devtools-api": { @@ -11886,12 +1921,6 @@ "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -11980,12 +2009,6 @@ "es-abstract": "^1.18.0-next.1" } }, - "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 - }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -12074,12 +2097,6 @@ "@babel/helper-define-polyfill-provider": "^0.2.0" } }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, "bail": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", @@ -12133,12 +2150,6 @@ "readable-stream": "^3.4.0" } }, - "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 - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -12279,9 +2290,9 @@ }, "dependencies": { "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", "dev": true } } @@ -12424,14 +2435,14 @@ "integrity": "sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==" }, "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "wrap-ansi": "^7.0.0" } }, "clone-regexp": { @@ -12464,9 +2475,9 @@ } }, "codemirror": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.0.tgz", - "integrity": "sha512-Xnl3304iCc8nyVZuRkzDVVwc794uc9QNX0UcPGeNic1fbzkSrO4l4GVXho9tRNKBgPYZXgocUqXyfIv3BILhCQ==" + "version": "5.62.2", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz", + "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw==" }, "color": { "version": "3.1.3", @@ -12527,24 +2538,12 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -12655,6 +2654,16 @@ } } }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", @@ -13124,77 +3133,27 @@ } }, "engine.io": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz", - "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz", + "integrity": "sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w==", "dev": true, "requires": { "accepts": "~1.3.4", "base64id": "2.0.0", "cookie": "~0.4.1", - "debug": "~4.1.0", - "engine.io-parser": "~2.2.0", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~4.0.0", "ws": "~7.4.2" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "engine.io-client": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", - "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", - "dev": true, - "requires": { - "component-emitter": "~1.3.0", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.2.0", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.6.2", - "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.2.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", - "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", + "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", "dev": true, "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.4", - "blob": "0.0.5", - "has-binary2": "~1.0.2" + "base64-arraybuffer": "0.1.4" } }, "enquirer": { @@ -13974,9 +3933,9 @@ } }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -14125,21 +4084,6 @@ "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", "dev": true }, - "has-binary2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", - "dev": true, - "requires": { - "isarray": "2.0.1" - } - }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -14331,12 +4275,6 @@ "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "dev": true }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -14600,16 +4538,10 @@ "is-docker": "^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 - }, "isbinaryfile": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz", - "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", + "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", "dev": true }, "isexe": { @@ -14706,9 +4638,9 @@ "dev": true }, "joomla-ui-custom-elements": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/joomla-ui-custom-elements/-/joomla-ui-custom-elements-0.0.42.tgz", - "integrity": "sha512-a2vC/V35VkrztR40rG7aa09ivh+F5sG51GfPrCdXU5jPk1TPIUk2YkZHB9dpzCYnqZTf5aX4ziN0RK1ySi3ygw==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/joomla-ui-custom-elements/-/joomla-ui-custom-elements-0.2.0.tgz", + "integrity": "sha512-Rgm5yjvYn3C9juR9QMU/8H4mBXtpayb6zfgA5uIx7EHgGjGQzk3njCykatC7mrcrIjp3Fei5hghP5nHpQxlbGg==" }, "jquery": { "version": "3.6.0", @@ -14791,34 +4723,34 @@ } }, "karma": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz", - "integrity": "sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==", + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.4.tgz", + "integrity": "sha512-hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q==", "dev": true, "requires": { "body-parser": "^1.19.0", "braces": "^3.0.2", - "chokidar": "^3.4.2", + "chokidar": "^3.5.1", "colors": "^1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", - "glob": "^7.1.6", - "graceful-fs": "^4.2.4", + "glob": "^7.1.7", + "graceful-fs": "^4.2.6", "http-proxy": "^1.18.1", - "isbinaryfile": "^4.0.6", - "lodash": "^4.17.19", - "log4js": "^6.2.1", - "mime": "^2.4.5", + "isbinaryfile": "^4.0.8", + "lodash": "^4.17.21", + "log4js": "^6.3.0", + "mime": "^2.5.2", "minimatch": "^3.0.4", "qjobs": "^1.2.0", "range-parser": "^1.2.1", "rimraf": "^3.0.2", - "socket.io": "^2.3.0", + "socket.io": "^3.1.0", "source-map": "^0.6.1", - "tmp": "0.2.1", - "ua-parser-js": "0.7.22", - "yargs": "^15.3.1" + "tmp": "^0.2.1", + "ua-parser-js": "^0.7.28", + "yargs": "^16.1.1" }, "dependencies": { "source-map": { @@ -14844,12 +4776,13 @@ } }, "karma-firefox-launcher": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz", - "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.1.tgz", + "integrity": "sha512-VzDMgPseXak9DtfyE1O5bB2BwsMy1zzO1kUxVW1rP0yhC4tDNJ0p3JoFdzvrK4QqVzdqUMa9Rx9YzkdFp8hz3Q==", "dev": true, "requires": { - "is-wsl": "^2.1.0" + "is-wsl": "^2.2.0", + "which": "^2.0.1" } }, "karma-fixture": { @@ -14865,12 +4798,12 @@ "dev": true }, "karma-jasmine": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.3.1.tgz", - "integrity": "sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz", + "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==", "dev": true, "requires": { - "jasmine-core": "^3.5.0" + "jasmine-core": "^3.6.0" } }, "karma-jasmine-ajax": { @@ -15679,6 +5612,12 @@ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, "object-inspect": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", @@ -15841,18 +5780,6 @@ "json-parse-better-errors": "^1.0.1" } }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", - "dev": true - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -15920,9 +5847,9 @@ } }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -16826,12 +6753,6 @@ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -17014,12 +6935,6 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -17042,9 +6957,9 @@ "dev": true }, "short-and-sweet": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/short-and-sweet/-/short-and-sweet-1.0.2.tgz", - "integrity": "sha512-uGGsxoTZvFHlrWo9OySSiK2og6qgSYkXLfcgziA5OvHBtsCsU+Yi7mnxN3KOEytYPzC0RyiWv+iZg/zzAqU6YA==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/short-and-sweet/-/short-and-sweet-1.0.4.tgz", + "integrity": "sha512-Nvh+ChQgW81p4SC0D6sK2w7ibkp9vI5Cs8OtYBjEQ8m3gCCXdaOSHTcVcG23GYvFEzkZZRFGq4Ti6tl/Hvf6kw==" }, "shvl": { "version": "2.0.2", @@ -17123,109 +7038,37 @@ } }, "socket.io": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz", - "integrity": "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz", + "integrity": "sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==", "dev": true, "requires": { - "debug": "~4.1.0", - "engine.io": "~3.5.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.4.0", - "socket.io-parser": "~3.4.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } + "@types/cookie": "^0.4.0", + "@types/cors": "^2.8.8", + "@types/node": ">=10.0.0", + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "debug": "~4.3.1", + "engine.io": "~4.1.0", + "socket.io-adapter": "~2.1.0", + "socket.io-parser": "~4.0.3" } }, "socket.io-adapter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", - "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz", + "integrity": "sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==", "dev": true }, - "socket.io-client": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", - "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", - "dev": true, - "requires": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "engine.io-client": "~3.5.0", - "has-binary2": "~1.0.2", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "socket.io-parser": "~3.3.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.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", - "dev": true, - "requires": { - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "isarray": "2.0.1" - } - } - } - }, "socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", + "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } + "@types/component-emitter": "^1.2.10", + "component-emitter": "~1.3.0", + "debug": "~4.3.1" } }, "source-map": { @@ -17365,23 +7208,6 @@ } } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, "string-hash": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz", @@ -17419,6 +7245,23 @@ "define-properties": "^1.1.3" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } + } + }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -17867,12 +7710,6 @@ "rimraf": "^3.0.0" } }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -17894,9 +7731,9 @@ "dev": true }, "trim-newlines": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", - "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true }, "trough": { @@ -17968,9 +7805,9 @@ } }, "ua-parser-js": { - "version": "0.7.22", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz", - "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==", + "version": "0.7.28", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", + "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==", "dev": true }, "unbox-primitive": { @@ -18130,6 +7967,12 @@ "spdx-expression-parse": "^3.0.0" } }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, "vendors": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", @@ -18256,12 +8099,6 @@ "is-symbol": "^1.0.3" } }, - "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 - }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -18269,9 +8106,9 @@ "dev": true }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { "ansi-styles": "^4.0.0", @@ -18324,21 +8161,15 @@ } }, "ws": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", - "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", - "dev": true - }, - "xmlhttprequest-ssl": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", - "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true }, "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, "yallist": { @@ -18354,83 +8185,18 @@ "dev": true }, "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } }, "yargs-parser": { @@ -18449,12 +8215,6 @@ "fd-slicer": "~1.1.0" } }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", - "dev": true - }, "zwitch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", diff --git a/package.json b/package.json index ba19dc8d3a0..24fabf3e81a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "diff": "^4.0.2", "dragula": "3.7.2", "focus-visible": "^5.2.0", - "joomla-ui-custom-elements": "0.0.42", + "joomla-ui-custom-elements": "0.2.0", "jquery": "^3.6.0", "jquery-migrate": "^3.3.2", "mark.js": "^8.11.1", @@ -54,7 +54,7 @@ "punycode": "^2.1.1", "qrcode-generator": "^1.4.4", "roboto-fontface": "^0.10.0", - "short-and-sweet": "^1.0.2", + "short-and-sweet": "^1.0.4", "skipto": "^4.1.0", "tinymce": "^5.8.2", "vue": "^3.1.2", @@ -85,12 +85,12 @@ "fs-extra": "^9.1.0", "ini": "^1.3.8", "jasmine-core": "^3.7.1", - "karma": "^5.2.3", + "karma": "^6.3.4", "karma-coverage": "^2.0.3", - "karma-firefox-launcher": "^1.3.0", + "karma-firefox-launcher": "^2.1.1", "karma-fixture": "^0.2.6", "karma-html2js-preprocessor": "^1.1.0", - "karma-jasmine": "^3.3.1", + "karma-jasmine": "^4.0.1", "karma-jasmine-ajax": "^0.1.13", "karma-json-fixtures-preprocessor": "0.0.6", "karma-verbose-reporter": "^0.0.6", diff --git a/plugins/actionlog/joomla/joomla.xml b/plugins/actionlog/joomla/joomla.xml index a3d90ccb0c5..9d74f28b241 100644 --- a/plugins/actionlog/joomla/joomla.xml +++ b/plugins/actionlog/joomla/joomla.xml @@ -13,7 +13,7 @@ joomla.php - en-GB.plg_actionlog_joomla.ini - en-GB.plg_actionlog_joomla.sys.ini + language/en-GB/plg_actionlog_joomla.ini + language/en-GB/plg_actionlog_joomla.sys.ini diff --git a/plugins/api-authentication/basic/basic.xml b/plugins/api-authentication/basic/basic.xml index 00dc33f04d7..349cf4d6c37 100644 --- a/plugins/api-authentication/basic/basic.xml +++ b/plugins/api-authentication/basic/basic.xml @@ -13,7 +13,7 @@ basic.php - en-GB.plg_authentication_api_basic.ini - en-GB.plg_authentication_api_basic.sys.ini + language/en-GB/plg_authentication_api_basic.ini + language/en-GB/plg_authentication_api_basic.sys.ini diff --git a/plugins/api-authentication/token/token.xml b/plugins/api-authentication/token/token.xml index 2930564bc7c..e4ce33b6dd3 100644 --- a/plugins/api-authentication/token/token.xml +++ b/plugins/api-authentication/token/token.xml @@ -13,7 +13,7 @@ token.php - en-GB.plg_api-authentication_token.ini - en-GB.plg_api-authentication_token.sys.ini + language/en-GB/plg_api-authentication_token.ini + language/en-GB/plg_api-authentication_token.sys.ini diff --git a/plugins/authentication/cookie/cookie.xml b/plugins/authentication/cookie/cookie.xml index ad481973434..634aab8950f 100644 --- a/plugins/authentication/cookie/cookie.xml +++ b/plugins/authentication/cookie/cookie.xml @@ -13,8 +13,8 @@ cookie.php - en-GB.plg_authentication_cookie.ini - en-GB.plg_authentication_cookie.sys.ini + language/en-GB/plg_authentication_cookie.ini + language/en-GB/plg_authentication_cookie.sys.ini diff --git a/plugins/authentication/joomla/joomla.xml b/plugins/authentication/joomla/joomla.xml index f49f1753554..246db7ecd5b 100644 --- a/plugins/authentication/joomla/joomla.xml +++ b/plugins/authentication/joomla/joomla.xml @@ -13,7 +13,7 @@ joomla.php - en-GB.plg_authentication_joomla.ini - en-GB.plg_authentication_joomla.sys.ini + language/en-GB/plg_authentication_joomla.ini + language/en-GB/plg_authentication_joomla.sys.ini diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml index 91fb868f16b..b66c6bc64c5 100644 --- a/plugins/authentication/ldap/ldap.xml +++ b/plugins/authentication/ldap/ldap.xml @@ -13,8 +13,8 @@ ldap.php - en-GB.plg_authentication_ldap.ini - en-GB.plg_authentication_ldap.sys.ini + language/en-GB/plg_authentication_ldap.ini + language/en-GB/plg_authentication_ldap.sys.ini diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml index 4ce621f8c1f..3db6247ed24 100644 --- a/plugins/captcha/recaptcha/recaptcha.xml +++ b/plugins/captcha/recaptcha/recaptcha.xml @@ -13,8 +13,8 @@ recaptcha.php - en-GB.plg_captcha_recaptcha.ini - en-GB.plg_captcha_recaptcha.sys.ini + language/en-GB/plg_captcha_recaptcha.ini + language/en-GB/plg_captcha_recaptcha.sys.ini diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml index 7a9dc4096f5..b54ad7dc5d7 100644 --- a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml +++ b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.xml @@ -13,8 +13,8 @@ recaptcha_invisible.php - en-GB.plg_captcha_recaptcha_invisible.ini - en-GB.plg_captcha_recaptcha_invisible.sys.ini + language/en-GB/plg_captcha_recaptcha_invisible.ini + language/en-GB/plg_captcha_recaptcha_invisible.sys.ini diff --git a/plugins/content/confirmconsent/confirmconsent.xml b/plugins/content/confirmconsent/confirmconsent.xml index f6cf6e0da4f..4cd0f8d3218 100644 --- a/plugins/content/confirmconsent/confirmconsent.xml +++ b/plugins/content/confirmconsent/confirmconsent.xml @@ -15,8 +15,8 @@ src - en-GB.plg_content_confirmconsent.ini - en-GB.plg_content_confirmconsent.sys.ini + language/en-GB/plg_content_confirmconsent.ini + language/en-GB/plg_content_confirmconsent.sys.ini diff --git a/plugins/content/contact/contact.xml b/plugins/content/contact/contact.xml index 9d3d2dfb51a..53042976e55 100644 --- a/plugins/content/contact/contact.xml +++ b/plugins/content/contact/contact.xml @@ -13,8 +13,8 @@ contact.php - en-GB.plg_content_contact.ini - en-GB.plg_content_contact.sys.ini + language/en-GB/plg_content_contact.ini + language/en-GB/plg_content_contact.sys.ini diff --git a/plugins/content/emailcloak/emailcloak.xml b/plugins/content/emailcloak/emailcloak.xml index e3361f1ac8a..0b093516127 100644 --- a/plugins/content/emailcloak/emailcloak.xml +++ b/plugins/content/emailcloak/emailcloak.xml @@ -13,8 +13,8 @@ emailcloak.php - en-GB.plg_content_emailcloak.ini - en-GB.plg_content_emailcloak.sys.ini + language/en-GB/plg_content_emailcloak.ini + language/en-GB/plg_content_emailcloak.sys.ini diff --git a/plugins/content/fields/fields.xml b/plugins/content/fields/fields.xml index 9c0838d2b2a..59d4f9c3123 100644 --- a/plugins/content/fields/fields.xml +++ b/plugins/content/fields/fields.xml @@ -13,8 +13,8 @@ fields.php - en-GB.plg_content_fields.ini - en-GB.plg_content_fields.sys.ini + language/en-GB/plg_content_fields.ini + language/en-GB/plg_content_fields.sys.ini diff --git a/plugins/content/finder/finder.xml b/plugins/content/finder/finder.xml index e328145df08..eaf52aecdad 100644 --- a/plugins/content/finder/finder.xml +++ b/plugins/content/finder/finder.xml @@ -14,8 +14,8 @@ finder.php - en-GB.plg_content_finder.ini - en-GB.plg_content_finder.sys.ini + language/en-GB/plg_content_finder.ini + language/en-GB/plg_content_finder.sys.ini diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml index 753bf3cc0e6..f171f5c814d 100644 --- a/plugins/content/joomla/joomla.xml +++ b/plugins/content/joomla/joomla.xml @@ -13,8 +13,8 @@ joomla.php - en-GB.plg_content_joomla.ini - en-GB.plg_content_joomla.sys.ini + language/en-GB/plg_content_joomla.ini + language/en-GB/plg_content_joomla.sys.ini diff --git a/plugins/content/loadmodule/loadmodule.xml b/plugins/content/loadmodule/loadmodule.xml index 03ac852e2ba..4ef46a62232 100644 --- a/plugins/content/loadmodule/loadmodule.xml +++ b/plugins/content/loadmodule/loadmodule.xml @@ -13,8 +13,8 @@ loadmodule.php - en-GB.plg_content_loadmodule.ini - en-GB.plg_content_loadmodule.sys.ini + language/en-GB/plg_content_loadmodule.ini + language/en-GB/plg_content_loadmodule.sys.ini diff --git a/plugins/content/pagebreak/pagebreak.php b/plugins/content/pagebreak/pagebreak.php index 67fd752d2c1..ca244f91d36 100644 --- a/plugins/content/pagebreak/pagebreak.php +++ b/plugins/content/pagebreak/pagebreak.php @@ -221,7 +221,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0) if ($style === 'tabs') { - $t[] = (string) HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'article' . $row->id . '-' . $style . '0')); + $t[] = (string) HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'article' . $row->id . '-' . $style . '0', 'view' => 'tabs']); } else { diff --git a/plugins/content/pagebreak/pagebreak.xml b/plugins/content/pagebreak/pagebreak.xml index 0a9270f153a..94e074f9c12 100644 --- a/plugins/content/pagebreak/pagebreak.xml +++ b/plugins/content/pagebreak/pagebreak.xml @@ -13,8 +13,8 @@ pagebreak.php - en-GB.plg_content_pagebreak.ini - en-GB.plg_content_pagebreak.sys.ini + language/en-GB/plg_content_pagebreak.ini + language/en-GB/plg_content_pagebreak.sys.ini diff --git a/plugins/content/pagenavigation/pagenavigation.xml b/plugins/content/pagenavigation/pagenavigation.xml index c38a4696244..aaebd1ddada 100644 --- a/plugins/content/pagenavigation/pagenavigation.xml +++ b/plugins/content/pagenavigation/pagenavigation.xml @@ -14,8 +14,8 @@ tmpl - en-GB.plg_content_pagenavigation.ini - en-GB.plg_content_pagenavigation.sys.ini + language/en-GB/plg_content_pagenavigation.ini + language/en-GB/plg_content_pagenavigation.sys.ini diff --git a/plugins/content/vote/vote.xml b/plugins/content/vote/vote.xml index d73d35fa6d8..25c9cd61044 100644 --- a/plugins/content/vote/vote.xml +++ b/plugins/content/vote/vote.xml @@ -14,8 +14,8 @@ tmpl - en-GB.plg_content_vote.ini - en-GB.plg_content_vote.sys.ini + language/en-GB/plg_content_vote.ini + language/en-GB/plg_content_vote.sys.ini diff --git a/plugins/editors-xtd/article/article.xml b/plugins/editors-xtd/article/article.xml index 0c99aad64bc..d0be16df71c 100644 --- a/plugins/editors-xtd/article/article.xml +++ b/plugins/editors-xtd/article/article.xml @@ -13,7 +13,7 @@ article.php - en-GB.plg_editors-xtd_article.ini - en-GB.plg_editors-xtd_article.sys.ini + language/en-GB/plg_editors-xtd_article.ini + language/en-GB/plg_editors-xtd_article.sys.ini diff --git a/plugins/editors-xtd/contact/contact.xml b/plugins/editors-xtd/contact/contact.xml index 15fc74307e3..c757398db44 100644 --- a/plugins/editors-xtd/contact/contact.xml +++ b/plugins/editors-xtd/contact/contact.xml @@ -13,7 +13,7 @@ contact.php - en-GB.plg_editors-xtd_contact.ini - en-GB.plg_editors-xtd_contact.sys.ini + language/en-GB/plg_editors-xtd_contact.ini + language/en-GB/plg_editors-xtd_contact.sys.ini diff --git a/plugins/editors-xtd/fields/fields.xml b/plugins/editors-xtd/fields/fields.xml index 1ed690395d0..d53439a977b 100644 --- a/plugins/editors-xtd/fields/fields.xml +++ b/plugins/editors-xtd/fields/fields.xml @@ -13,7 +13,7 @@ fields.php - en-GB.plg_editors-xtd_fields.ini - en-GB.plg_editors-xtd_fields.sys.ini + language/en-GB/plg_editors-xtd_fields.ini + language/en-GB/plg_editors-xtd_fields.sys.ini diff --git a/plugins/editors-xtd/image/image.php b/plugins/editors-xtd/image/image.php index 5acad94413d..fdf16941b8b 100644 --- a/plugins/editors-xtd/image/image.php +++ b/plugins/editors-xtd/image/image.php @@ -49,7 +49,8 @@ public function onDisplay($name, $asset, $author) $extension = $app->input->get('option'); // For categories we check the extension (ex: component.section) - if ($extension === 'com_categories') { + if ($extension === 'com_categories') + { $parts = explode('.', $app->input->get('extension', 'com_content')); $extension = $parts[0]; } @@ -63,7 +64,8 @@ public function onDisplay($name, $asset, $author) || ($user->authorise('core.edit.own', $asset) && $author === $user->id) || (count($user->getAuthorisedCategories($extension, 'core.edit')) > 0) || (count($user->getAuthorisedCategories($extension, 'core.edit.own')) > 0 && $author === $user->id) - ) { + ) + { $doc->getWebAssetManager() ->useScript('webcomponent.media-select') ->useScript('webcomponent.field-media') @@ -73,7 +75,8 @@ public function onDisplay($name, $asset, $author) $name . '_ImageModal', ]); - if (count($doc->getScriptOptions('media-picker')) === 0) { + if (count($doc->getScriptOptions('media-picker')) === 0) + { $imagesExt = array_map( 'trim', explode( @@ -110,7 +113,7 @@ public function onDisplay($name, $asset, $author) ',', ComponentHelper::getParams('com_media')->get( 'doc_extensions', - 'doc,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv' + 'doc,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv' ) ) ); diff --git a/plugins/editors-xtd/image/image.xml b/plugins/editors-xtd/image/image.xml index 0c74f8ad8b0..ec46d45aa7f 100644 --- a/plugins/editors-xtd/image/image.xml +++ b/plugins/editors-xtd/image/image.xml @@ -13,7 +13,7 @@ image.php - en-GB.plg_editors-xtd_image.ini - en-GB.plg_editors-xtd_image.sys.ini + language/en-GB/plg_editors-xtd_image.ini + language/en-GB/plg_editors-xtd_image.sys.ini diff --git a/plugins/editors-xtd/menu/menu.xml b/plugins/editors-xtd/menu/menu.xml index 07c19a89c4d..029d8ecf145 100644 --- a/plugins/editors-xtd/menu/menu.xml +++ b/plugins/editors-xtd/menu/menu.xml @@ -13,7 +13,7 @@ menu.php - en-GB.plg_editors-xtd_menu.ini - en-GB.plg_editors-xtd_menu.sys.ini + language/en-GB/plg_editors-xtd_menu.ini + language/en-GB/plg_editors-xtd_menu.sys.ini diff --git a/plugins/editors-xtd/module/module.xml b/plugins/editors-xtd/module/module.xml index de80282a0ef..9c95dead9e2 100644 --- a/plugins/editors-xtd/module/module.xml +++ b/plugins/editors-xtd/module/module.xml @@ -13,7 +13,7 @@ module.php - en-GB.plg_editors-xtd_module.ini - en-GB.plg_editors-xtd_module.sys.ini + language/en-GB/plg_editors-xtd_module.ini + language/en-GB/plg_editors-xtd_module.sys.ini diff --git a/plugins/editors-xtd/pagebreak/pagebreak.xml b/plugins/editors-xtd/pagebreak/pagebreak.xml index c2d4db485c9..317e179b2d7 100644 --- a/plugins/editors-xtd/pagebreak/pagebreak.xml +++ b/plugins/editors-xtd/pagebreak/pagebreak.xml @@ -13,7 +13,7 @@ pagebreak.php - en-GB.plg_editors-xtd_pagebreak.ini - en-GB.plg_editors-xtd_pagebreak.sys.ini + language/en-GB/plg_editors-xtd_pagebreak.ini + language/en-GB/plg_editors-xtd_pagebreak.sys.ini diff --git a/plugins/editors-xtd/readmore/readmore.xml b/plugins/editors-xtd/readmore/readmore.xml index e60bcd49252..9cea296d03e 100644 --- a/plugins/editors-xtd/readmore/readmore.xml +++ b/plugins/editors-xtd/readmore/readmore.xml @@ -13,7 +13,7 @@ readmore.php - en-GB.plg_editors-xtd_readmore.ini - en-GB.plg_editors-xtd_readmore.sys.ini + language/en-GB/plg_editors-xtd_readmore.ini + language/en-GB/plg_editors-xtd_readmore.sys.ini diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml index 0cf265185ca..16c79594594 100644 --- a/plugins/editors/codemirror/codemirror.xml +++ b/plugins/editors/codemirror/codemirror.xml @@ -1,7 +1,7 @@ plg_editors_codemirror - 5.62.0 + 5.62.2 28 March 2011 Marijn Haverbeke marijnh@gmail.com @@ -18,8 +18,8 @@ - en-GB.plg_editors_codemirror.ini - en-GB.plg_editors_codemirror.sys.ini + language/en-GB/plg_editors_codemirror.ini + language/en-GB/plg_editors_codemirror.sys.ini diff --git a/plugins/editors/none/none.xml b/plugins/editors/none/none.xml index 51ba4bfb9b6..4f62eae765a 100644 --- a/plugins/editors/none/none.xml +++ b/plugins/editors/none/none.xml @@ -13,7 +13,7 @@ none.php - en-GB.plg_editors_none.ini - en-GB.plg_editors_none.sys.ini + language/en-GB/plg_editors_none.ini + language/en-GB/plg_editors_none.sys.ini diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml index fd84d67440d..b1bc7dcef82 100644 --- a/plugins/editors/tinymce/tinymce.xml +++ b/plugins/editors/tinymce/tinymce.xml @@ -19,8 +19,8 @@ tinymce - en-GB.plg_editors_tinymce.ini - en-GB.plg_editors_tinymce.sys.ini + language/en-GB/plg_editors_tinymce.ini + language/en-GB/plg_editors_tinymce.sys.ini diff --git a/plugins/extension/finder/finder.xml b/plugins/extension/finder/finder.xml index 5e3d88d4e8e..a21de037fa9 100644 --- a/plugins/extension/finder/finder.xml +++ b/plugins/extension/finder/finder.xml @@ -13,7 +13,7 @@ finder.php - en-GB.plg_extension_finder.ini - en-GB.plg_extension_finder.sys.ini + language/en-GB/plg_extension_finder.ini + language/en-GB/plg_extension_finder.sys.ini diff --git a/plugins/extension/joomla/joomla.php b/plugins/extension/joomla/joomla.php index 1bdf77f0baa..0bfa9797a88 100644 --- a/plugins/extension/joomla/joomla.php +++ b/plugins/extension/joomla/joomla.php @@ -291,7 +291,7 @@ private function processUpdateSites() foreach ($children as $child) { $attrs = $child->attributes(); - $this->addUpdateSite($attrs['name'], $attrs['type'], trim($child), true, $this->installer->extraQuery); + $this->addUpdateSite((string) $attrs['name'], (string) $attrs['type'], trim($child), true, $this->installer->extraQuery); } } else diff --git a/plugins/extension/joomla/joomla.xml b/plugins/extension/joomla/joomla.xml index 4ebd59811de..c794244a0d7 100644 --- a/plugins/extension/joomla/joomla.xml +++ b/plugins/extension/joomla/joomla.xml @@ -13,7 +13,7 @@ joomla.php - en-GB.plg_extension_joomla.ini - en-GB.plg_extension_joomla.sys.ini + language/en-GB/plg_extension_joomla.ini + language/en-GB/plg_extension_joomla.sys.ini diff --git a/plugins/extension/namespacemap/namespacemap.xml b/plugins/extension/namespacemap/namespacemap.xml index 51789854b12..055ce408c91 100644 --- a/plugins/extension/namespacemap/namespacemap.xml +++ b/plugins/extension/namespacemap/namespacemap.xml @@ -13,7 +13,7 @@ namespacemap.php - en-GB.plg_extension_namespacemap.ini - en-GB.plg_extension_namespacemap.sys.ini + language/en-GB/plg_extension_namespacemap.ini + language/en-GB/plg_extension_namespacemap.sys.ini diff --git a/plugins/fields/calendar/calendar.xml b/plugins/fields/calendar/calendar.xml index 1ce6cbcba53..8b9384b5e92 100644 --- a/plugins/fields/calendar/calendar.xml +++ b/plugins/fields/calendar/calendar.xml @@ -15,7 +15,7 @@ tmpl - en-GB.plg_fields_calendar.ini - en-GB.plg_fields_calendar.sys.ini + language/en-GB/plg_fields_calendar.ini + language/en-GB/plg_fields_calendar.sys.ini diff --git a/plugins/fields/checkboxes/checkboxes.xml b/plugins/fields/checkboxes/checkboxes.xml index 6dc4f97ecd4..ce21b41abb8 100644 --- a/plugins/fields/checkboxes/checkboxes.xml +++ b/plugins/fields/checkboxes/checkboxes.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_checkboxes.ini - en-GB.plg_fields_checkboxes.sys.ini + language/en-GB/plg_fields_checkboxes.ini + language/en-GB/plg_fields_checkboxes.sys.ini diff --git a/plugins/fields/color/color.xml b/plugins/fields/color/color.xml index 7a13af18084..7eba1251ac1 100644 --- a/plugins/fields/color/color.xml +++ b/plugins/fields/color/color.xml @@ -14,7 +14,7 @@ tmpl - en-GB.plg_fields_color.ini - en-GB.plg_fields_color.sys.ini + language/en-GB/plg_fields_color.ini + language/en-GB/plg_fields_color.sys.ini diff --git a/plugins/fields/editor/editor.xml b/plugins/fields/editor/editor.xml index 69f8c3bb916..bafba10f43c 100644 --- a/plugins/fields/editor/editor.xml +++ b/plugins/fields/editor/editor.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_editor.ini - en-GB.plg_fields_editor.sys.ini + language/en-GB/plg_fields_editor.ini + language/en-GB/plg_fields_editor.sys.ini diff --git a/plugins/fields/imagelist/imagelist.xml b/plugins/fields/imagelist/imagelist.xml index 60f27418bd7..318c40e99cc 100644 --- a/plugins/fields/imagelist/imagelist.xml +++ b/plugins/fields/imagelist/imagelist.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_imagelist.ini - en-GB.plg_fields_imagelist.sys.ini + language/en-GB/plg_fields_imagelist.ini + language/en-GB/plg_fields_imagelist.sys.ini diff --git a/plugins/fields/integer/integer.xml b/plugins/fields/integer/integer.xml index 5ed59a14888..243f5accecd 100644 --- a/plugins/fields/integer/integer.xml +++ b/plugins/fields/integer/integer.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_integer.ini - en-GB.plg_fields_integer.sys.ini + language/en-GB/plg_fields_integer.ini + language/en-GB/plg_fields_integer.sys.ini diff --git a/plugins/fields/list/list.xml b/plugins/fields/list/list.xml index 7cf68d2f132..b3518962ac3 100644 --- a/plugins/fields/list/list.xml +++ b/plugins/fields/list/list.xml @@ -13,8 +13,8 @@ list.php - en-GB.plg_fields_list.ini - en-GB.plg_fields_list.sys.ini + language/en-GB/plg_fields_list.ini + language/en-GB/plg_fields_list.sys.ini diff --git a/plugins/fields/media/media.xml b/plugins/fields/media/media.xml index 3aa3d878870..be30d2de50c 100644 --- a/plugins/fields/media/media.xml +++ b/plugins/fields/media/media.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_media.ini - en-GB.plg_fields_media.sys.ini + language/en-GB/plg_fields_media.ini + language/en-GB/plg_fields_media.sys.ini diff --git a/plugins/fields/media/tmpl/media.php b/plugins/fields/media/tmpl/media.php index 74dc9b78439..e4e7ed6ed2a 100644 --- a/plugins/fields/media/tmpl/media.php +++ b/plugins/fields/media/tmpl/media.php @@ -30,27 +30,24 @@ $imgUrl = htmlentities($img->url, ENT_COMPAT, 'UTF-8', true); $alt = empty($value['alt_text']) && empty($value['alt_empty']) ? '' : ' alt="' . htmlspecialchars($value['alt_text'], ENT_COMPAT, 'UTF-8') . '"'; - if (file_exists($img->url)) + if ($img->attributes['width'] > 0 && $img->attributes['height'] > 0) { - if ($img->attributes['width'] > 0 && $img->attributes['height'] > 0) - { - $buffer = sprintf('', - $img->attributes['width'], - $img->attributes['height'], - $imgUrl, - $class, - $alt - ); - } - else - { - $buffer = sprintf('', - $imgUrl, - $class, - $alt - ); - } - - echo $buffer; + $buffer = sprintf('', + $img->attributes['width'], + $img->attributes['height'], + $imgUrl, + $class, + $alt + ); } + else + { + $buffer = sprintf('', + $imgUrl, + $class, + $alt + ); + } + + echo $buffer; } diff --git a/plugins/fields/radio/radio.xml b/plugins/fields/radio/radio.xml index 7634721f0a6..1310889ad7b 100644 --- a/plugins/fields/radio/radio.xml +++ b/plugins/fields/radio/radio.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_radio.ini - en-GB.plg_fields_radio.sys.ini + language/en-GB/plg_fields_radio.ini + language/en-GB/plg_fields_radio.sys.ini diff --git a/plugins/fields/sql/sql.xml b/plugins/fields/sql/sql.xml index cbf8bf29add..fb13682d54f 100644 --- a/plugins/fields/sql/sql.xml +++ b/plugins/fields/sql/sql.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_sql.ini - en-GB.plg_fields_sql.sys.ini + language/en-GB/plg_fields_sql.ini + language/en-GB/plg_fields_sql.sys.ini diff --git a/plugins/fields/subform/subform.xml b/plugins/fields/subform/subform.xml index e02fa306a00..a3ad2d862b9 100644 --- a/plugins/fields/subform/subform.xml +++ b/plugins/fields/subform/subform.xml @@ -13,7 +13,7 @@ subform.php - en-GB.plg_fields_subform.ini - en-GB.plg_fields_subform.sys.ini + language/en-GB/plg_fields_subform.ini + language/en-GB/plg_fields_subform.sys.ini diff --git a/plugins/fields/text/text.xml b/plugins/fields/text/text.xml index df4b1933fb2..67f77ad04db 100644 --- a/plugins/fields/text/text.xml +++ b/plugins/fields/text/text.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_text.ini - en-GB.plg_fields_text.sys.ini + language/en-GB/plg_fields_text.ini + language/en-GB/plg_fields_text.sys.ini diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml index 8e9518fb524..e6d4eb46f20 100644 --- a/plugins/fields/textarea/textarea.xml +++ b/plugins/fields/textarea/textarea.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_textarea.ini - en-GB.plg_fields_textarea.sys.ini + language/en-GB/plg_fields_textarea.ini + language/en-GB/plg_fields_textarea.sys.ini diff --git a/plugins/fields/url/url.xml b/plugins/fields/url/url.xml index afd3e4d8fc4..8f3729df22f 100644 --- a/plugins/fields/url/url.xml +++ b/plugins/fields/url/url.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_url.ini - en-GB.plg_fields_url.sys.ini + language/en-GB/plg_fields_url.ini + language/en-GB/plg_fields_url.sys.ini diff --git a/plugins/fields/user/user.xml b/plugins/fields/user/user.xml index ad91c823008..2b70ddbb12d 100644 --- a/plugins/fields/user/user.xml +++ b/plugins/fields/user/user.xml @@ -14,7 +14,7 @@ tmpl - en-GB.plg_fields_user.ini - en-GB.plg_fields_user.sys.ini + language/en-GB/plg_fields_user.ini + language/en-GB/plg_fields_user.sys.ini diff --git a/plugins/fields/usergrouplist/usergrouplist.xml b/plugins/fields/usergrouplist/usergrouplist.xml index 41734080dae..2a674d40018 100644 --- a/plugins/fields/usergrouplist/usergrouplist.xml +++ b/plugins/fields/usergrouplist/usergrouplist.xml @@ -15,8 +15,8 @@ tmpl - en-GB.plg_fields_usergrouplist.ini - en-GB.plg_fields_usergrouplist.sys.ini + language/en-GB/plg_fields_usergrouplist.ini + language/en-GB/plg_fields_usergrouplist.sys.ini diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php index 50a7532781c..068b6ce37a1 100644 --- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php +++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php @@ -593,6 +593,11 @@ private function moveFile(string $sourcePath, string $destinationPath, bool $for $destinationPath = $destinationPath . '/' . $this->getFileName($sourcePath); } + if (!MediaHelper::checkFileExtension(pathinfo($destinationPath, PATHINFO_EXTENSION))) + { + throw new \Exception('Move file is not possible as the extension is invalid'); + } + if (file_exists($destinationPath) && !$force) { throw new \Exception('Move file is not possible as destination file already exists'); @@ -734,22 +739,6 @@ private function rglob(string $pattern, int $flags = 0): array return $files; } - /** - * Returns a temporary url for the given path. - * This is used internally in media manager - * - * @param string $path The path to file - * - * @return string - * - * @since 4.0.0 - * @throws FileNotFoundException - */ - public function getTemporaryUrl(string $path): string - { - return $this->getUrl($path); - } - /** * Replace spaces on a path with %20 * diff --git a/plugins/installer/folderinstaller/folderinstaller.xml b/plugins/installer/folderinstaller/folderinstaller.xml index ed2ad863764..ff01c2a2289 100644 --- a/plugins/installer/folderinstaller/folderinstaller.xml +++ b/plugins/installer/folderinstaller/folderinstaller.xml @@ -15,7 +15,7 @@ - en-GB.plg_installer_folderinstaller.ini - en-GB.plg_installer_folderinstaller.sys.ini + language/en-GB/plg_installer_folderinstaller.ini + language/en-GB/plg_installer_folderinstaller.sys.ini diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php index 39b134f5ae0..66cf94fdad9 100644 --- a/plugins/installer/override/override.php +++ b/plugins/installer/override/override.php @@ -386,6 +386,7 @@ private function saveOverrides($pks) $bindArray = $insertQuery->bindArray( [ $pk->template, + $pk->id, $pk->action, $createdDate, $modifiedDate, @@ -396,7 +397,6 @@ private function saveOverrides($pks) $bindArray, $insertQuery->bindArray( [ - $pk->id, $pk->extension_id, 0, (int) $pk->client, diff --git a/plugins/installer/override/override.xml b/plugins/installer/override/override.xml index 63547d31065..98fcd592d24 100644 --- a/plugins/installer/override/override.xml +++ b/plugins/installer/override/override.xml @@ -13,7 +13,7 @@ override.php - en-GB.plg_installer_override.ini - en-GB.plg_installer_override.sys.ini + language/en-GB/plg_installer_override.ini + language/en-GB/plg_installer_override.sys.ini diff --git a/plugins/installer/packageinstaller/packageinstaller.xml b/plugins/installer/packageinstaller/packageinstaller.xml index 127905a01d9..651322a17bb 100644 --- a/plugins/installer/packageinstaller/packageinstaller.xml +++ b/plugins/installer/packageinstaller/packageinstaller.xml @@ -15,7 +15,7 @@ - en-GB.plg_installer_packageinstaller.ini - en-GB.plg_installer_packageinstaller.sys.ini + language/en-GB/plg_installer_packageinstaller.ini + language/en-GB/plg_installer_packageinstaller.sys.ini diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php index fb922684f81..42d8ff881cc 100644 --- a/plugins/installer/packageinstaller/tmpl/default.php +++ b/plugins/installer/packageinstaller/tmpl/default.php @@ -44,8 +44,8 @@

      -
      -
      +
      -
      -
      +
      +

      diff --git a/plugins/installer/urlinstaller/urlinstaller.xml b/plugins/installer/urlinstaller/urlinstaller.xml index 3b93892668e..215b92851c0 100644 --- a/plugins/installer/urlinstaller/urlinstaller.xml +++ b/plugins/installer/urlinstaller/urlinstaller.xml @@ -15,7 +15,7 @@ - en-GB.plg_installer_urlinstaller.ini - en-GB.plg_installer_urlinstaller.sys.ini + language/en-GB/plg_installer_urlinstaller.ini + language/en-GB/plg_installer_urlinstaller.sys.ini diff --git a/plugins/installer/webinstaller/webinstaller.xml b/plugins/installer/webinstaller/webinstaller.xml index a91d0d90032..a0ec930928b 100644 --- a/plugins/installer/webinstaller/webinstaller.xml +++ b/plugins/installer/webinstaller/webinstaller.xml @@ -7,15 +7,14 @@ https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL admin@joomla.org www.joomla.org - 1.1.1 + 4.0.0 PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION - webinstaller.php - en-GB.plg_installer_webinstaller.ini - en-GB.plg_installer_webinstaller.sys.ini + language/en-GB/plg_installer_webinstaller.ini + language/en-GB/plg_installer_webinstaller.sys.ini diff --git a/plugins/media-action/crop/crop.xml b/plugins/media-action/crop/crop.xml index 213f0406fb6..b764a0a1820 100644 --- a/plugins/media-action/crop/crop.xml +++ b/plugins/media-action/crop/crop.xml @@ -14,7 +14,7 @@ form - en-GB.plg_media-action_crop.ini - en-GB.plg_media-action_crop.sys.ini + language/en-GB/plg_media-action_crop.ini + language/en-GB/plg_media-action_crop.sys.ini diff --git a/plugins/media-action/resize/resize.xml b/plugins/media-action/resize/resize.xml index 51125446eb4..f1be6858ce6 100644 --- a/plugins/media-action/resize/resize.xml +++ b/plugins/media-action/resize/resize.xml @@ -14,8 +14,8 @@ form - en-GB.plg_media-action_resize.ini - en-GB.plg_media-action_resize.sys.ini + language/en-GB/plg_media-action_resize.ini + language/en-GB/plg_media-action_resize.sys.ini diff --git a/plugins/media-action/rotate/rotate.xml b/plugins/media-action/rotate/rotate.xml index 0cc15ea0339..ce122e458ab 100644 --- a/plugins/media-action/rotate/rotate.xml +++ b/plugins/media-action/rotate/rotate.xml @@ -14,7 +14,7 @@ form - en-GB.plg_media-action_rotate.ini - en-GB.plg_media-action_rotate.sys.ini + language/en-GB/plg_media-action_rotate.ini + language/en-GB/plg_media-action_rotate.sys.ini diff --git a/plugins/privacy/actionlogs/actionlogs.xml b/plugins/privacy/actionlogs/actionlogs.xml index b1f23ed0185..e2cdfebe023 100644 --- a/plugins/privacy/actionlogs/actionlogs.xml +++ b/plugins/privacy/actionlogs/actionlogs.xml @@ -13,7 +13,7 @@ actionlogs.php - en-GB.plg_privacy_actionlogs.ini - en-GB.plg_privacy_actionlogs.sys.ini + language/en-GB/plg_privacy_actionlogs.ini + language/en-GB/plg_privacy_actionlogs.sys.ini diff --git a/plugins/privacy/consents/consents.xml b/plugins/privacy/consents/consents.xml index 62aafda7c5e..cb64ced1e0e 100644 --- a/plugins/privacy/consents/consents.xml +++ b/plugins/privacy/consents/consents.xml @@ -13,7 +13,7 @@ consents.php - en-GB.plg_privacy_consents.ini - en-GB.plg_privacy_consents.sys.ini + language/en-GB/plg_privacy_consents.ini + language/en-GB/plg_privacy_consents.sys.ini diff --git a/plugins/privacy/contact/contact.xml b/plugins/privacy/contact/contact.xml index 5c547e71117..9c842c0607f 100644 --- a/plugins/privacy/contact/contact.xml +++ b/plugins/privacy/contact/contact.xml @@ -13,7 +13,7 @@ contact.php - en-GB.plg_privacy_contact.ini - en-GB.plg_privacy_contact.sys.ini + language/en-GB/plg_privacy_contact.ini + language/en-GB/plg_privacy_contact.sys.ini diff --git a/plugins/privacy/content/content.xml b/plugins/privacy/content/content.xml index 0a07d4fb26b..4277603ef8d 100644 --- a/plugins/privacy/content/content.xml +++ b/plugins/privacy/content/content.xml @@ -13,7 +13,7 @@ content.php - en-GB.plg_privacy_content.ini - en-GB.plg_privacy_content.sys.ini + language/en-GB/plg_privacy_content.ini + language/en-GB/plg_privacy_content.sys.ini diff --git a/plugins/privacy/message/message.xml b/plugins/privacy/message/message.xml index 61d4da92e85..3c2a1534a7d 100644 --- a/plugins/privacy/message/message.xml +++ b/plugins/privacy/message/message.xml @@ -13,7 +13,7 @@ message.php - en-GB.plg_privacy_message.ini - en-GB.plg_privacy_message.sys.ini + language/en-GB/plg_privacy_message.ini + language/en-GB/plg_privacy_message.sys.ini diff --git a/plugins/privacy/user/user.php b/plugins/privacy/user/user.php index 7ad9cc82731..27f38cae4a8 100644 --- a/plugins/privacy/user/user.php +++ b/plugins/privacy/user/user.php @@ -10,12 +10,10 @@ defined('_JEXEC') or die; use Joomla\CMS\Application\CMSApplicationInterface; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Session\SessionManager; -use Joomla\Database\Exception\ExecutionFailureException; use Joomla\CMS\Table\User as JTableUser; use Joomla\CMS\User\User; +use Joomla\CMS\User\UserHelper; use Joomla\Component\Privacy\Administrator\Plugin\PrivacyPlugin; use Joomla\Component\Privacy\Administrator\Removal\Status; use Joomla\Component\Privacy\Administrator\Table\RequestTable; @@ -124,8 +122,6 @@ public function onPrivacyRemoveData(RequestTable $request, User $user = null) return; } - $db = $this->db; - $pseudoanonymisedData = [ 'name' => 'User ID ' . $user->id, 'username' => bin2hex(random_bytes(12)), @@ -137,51 +133,8 @@ public function onPrivacyRemoveData(RequestTable $request, User $user = null) $user->save(); - // Destroy all sessions for the user account if able - if (!$this->app->get('session_metadata', true)) - { - return; - } - - try - { - $userId = (int) $user->id; - - $sessionIds = $this->db->setQuery( - $this->db->getQuery(true) - ->select($this->db->quoteName('session_id')) - ->from($this->db->quoteName('#__session')) - ->where($this->db->quoteName('userid') . ' = :userid') - ->bind(':userid', $userId, ParameterType::INTEGER) - )->loadColumn(); - } - catch (ExecutionFailureException $e) - { - return; - } - - // If there aren't any active sessions then there's nothing to do here - if (empty($sessionIds)) - { - return; - } - - /** @var SessionManager $sessionManager */ - $sessionManager = Factory::getContainer()->get('session.manager'); - $sessionManager->destroySessions($sessionIds); - - try - { - $this->db->setQuery( - $this->db->getQuery(true) - ->delete($this->db->quoteName('#__session')) - ->whereIn($this->db->quoteName('session_id'), $sessionIds, ParameterType::LARGE_OBJECT) - )->execute(); - } - catch (ExecutionFailureException $e) - { - // No issue, let things go - } + // Destroy all sessions for the user account + UserHelper::destroyUserSessions($user->id); } /** diff --git a/plugins/privacy/user/user.xml b/plugins/privacy/user/user.xml index d1c5ae56231..0bd16eda6b8 100644 --- a/plugins/privacy/user/user.xml +++ b/plugins/privacy/user/user.xml @@ -13,7 +13,7 @@ user.php - en-GB.plg_privacy_user.ini - en-GB.plg_privacy_user.sys.ini + language/en-GB/plg_privacy_user.ini + language/en-GB/plg_privacy_user.sys.ini diff --git a/plugins/quickicon/downloadkey/downloadkey.xml b/plugins/quickicon/downloadkey/downloadkey.xml index 6f255edc2d6..47b32131f26 100644 --- a/plugins/quickicon/downloadkey/downloadkey.xml +++ b/plugins/quickicon/downloadkey/downloadkey.xml @@ -13,8 +13,8 @@ downloadkey.php - en-GB.plg_quickicon_downloadkey.ini - en-GB.plg_quickicon_downloadkey.sys.ini + language/en-GB/plg_quickicon_downloadkey.ini + language/en-GB/plg_quickicon_downloadkey.sys.ini diff --git a/plugins/quickicon/extensionupdate/extensionupdate.xml b/plugins/quickicon/extensionupdate/extensionupdate.xml index 126a038fb94..930be5cf142 100644 --- a/plugins/quickicon/extensionupdate/extensionupdate.xml +++ b/plugins/quickicon/extensionupdate/extensionupdate.xml @@ -13,13 +13,13 @@ extensionupdate.php - en-GB.plg_quickicon_extensionupdate.ini - en-GB.plg_quickicon_extensionupdate.sys.ini + language/en-GB/plg_quickicon_extensionupdate.ini + language/en-GB/plg_quickicon_extensionupdate.sys.ini

      - src - en-GB.plg_quickicon_joomlaupdate.ini - en-GB.plg_quickicon_joomlaupdate.sys.ini + language/en-GB/plg_quickicon_joomlaupdate.ini + language/en-GB/plg_quickicon_joomlaupdate.sys.ini diff --git a/plugins/quickicon/overridecheck/overridecheck.xml b/plugins/quickicon/overridecheck/overridecheck.xml index 54cf55447b1..df970901631 100644 --- a/plugins/quickicon/overridecheck/overridecheck.xml +++ b/plugins/quickicon/overridecheck/overridecheck.xml @@ -13,8 +13,8 @@ overridecheck.php - en-GB.plg_quickicon_overridecheck.ini - en-GB.plg_quickicon_overridecheck.sys.ini + language/en-GB/plg_quickicon_overridecheck.ini + language/en-GB/plg_quickicon_overridecheck.sys.ini diff --git a/plugins/quickicon/phpversioncheck/phpversioncheck.xml b/plugins/quickicon/phpversioncheck/phpversioncheck.xml index 47be455d6db..3d151c2fb11 100644 --- a/plugins/quickicon/phpversioncheck/phpversioncheck.xml +++ b/plugins/quickicon/phpversioncheck/phpversioncheck.xml @@ -13,7 +13,7 @@ phpversioncheck.php - en-GB.plg_quickicon_phpversioncheck.ini - en-GB.plg_quickicon_phpversioncheck.sys.ini + language/en-GB/plg_quickicon_phpversioncheck.ini + language/en-GB/plg_quickicon_phpversioncheck.sys.ini diff --git a/plugins/quickicon/privacycheck/privacycheck.xml b/plugins/quickicon/privacycheck/privacycheck.xml index d0d18588910..4c632e9042d 100644 --- a/plugins/quickicon/privacycheck/privacycheck.xml +++ b/plugins/quickicon/privacycheck/privacycheck.xml @@ -13,8 +13,8 @@ privacycheck.php - en-GB.plg_quickicon_privacycheck.ini - en-GB.plg_quickicon_privacycheck.sys.ini + language/en-GB/plg_quickicon_privacycheck.ini + language/en-GB/plg_quickicon_privacycheck.sys.ini diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index 31ea7f86859..fddb53d509b 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -12,7 +12,6 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Extension\ExtensionHelper; -use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; diff --git a/plugins/sampledata/blog/blog.xml b/plugins/sampledata/blog/blog.xml index 63893b8f9ba..edfd3ba85b0 100644 --- a/plugins/sampledata/blog/blog.xml +++ b/plugins/sampledata/blog/blog.xml @@ -13,8 +13,8 @@ blog.php - en-GB.plg_sampledata_blog.ini - en-GB.plg_sampledata_blog.sys.ini + language/en-GB/plg_sampledata_blog.ini + language/en-GB/plg_sampledata_blog.sys.ini diff --git a/plugins/sampledata/multilang/multilang.xml b/plugins/sampledata/multilang/multilang.xml index 2e02d4e420f..09b140234ac 100644 --- a/plugins/sampledata/multilang/multilang.xml +++ b/plugins/sampledata/multilang/multilang.xml @@ -13,8 +13,8 @@ multilang.php - en-GB.plg_sampledata_multilang.ini - en-GB.plg_sampledata_multilang.sys.ini + language/en-GB/plg_sampledata_multilang.ini + language/en-GB/plg_sampledata_multilang.sys.ini diff --git a/plugins/system/actionlogs/actionlogs.xml b/plugins/system/actionlogs/actionlogs.xml index 701941963e8..52edc0a124d 100644 --- a/plugins/system/actionlogs/actionlogs.xml +++ b/plugins/system/actionlogs/actionlogs.xml @@ -14,8 +14,8 @@ forms - en-GB.plg_system_actionlogs.ini - en-GB.plg_system_actionlogs.sys.ini + language/en-GB/plg_system_actionlogs.ini + language/en-GB/plg_system_actionlogs.sys.ini diff --git a/plugins/system/cache/cache.xml b/plugins/system/cache/cache.xml index d57c7fa769b..c98637478de 100644 --- a/plugins/system/cache/cache.xml +++ b/plugins/system/cache/cache.xml @@ -13,8 +13,8 @@ cache.php - en-GB.plg_system_cache.ini - en-GB.plg_system_cache.sys.ini + language/en-GB/plg_system_cache.ini + language/en-GB/plg_system_cache.sys.ini diff --git a/plugins/system/debug/debug.xml b/plugins/system/debug/debug.xml index 2b40bd5c68c..45c1dff42e9 100644 --- a/plugins/system/debug/debug.xml +++ b/plugins/system/debug/debug.xml @@ -15,8 +15,8 @@ src - en-GB.plg_system_debug.ini - en-GB.plg_system_debug.sys.ini + language/en-GB/plg_system_debug.ini + language/en-GB/plg_system_debug.sys.ini diff --git a/plugins/system/fields/fields.xml b/plugins/system/fields/fields.xml index 793e8a31613..a2f086be116 100644 --- a/plugins/system/fields/fields.xml +++ b/plugins/system/fields/fields.xml @@ -13,7 +13,7 @@ fields.php - en-GB.plg_system_fields.ini - en-GB.plg_system_fields.sys.ini + language/en-GB/plg_system_fields.ini + language/en-GB/plg_system_fields.sys.ini diff --git a/plugins/system/httpheaders/httpheaders.xml b/plugins/system/httpheaders/httpheaders.xml index 45ce6830d30..1a8c4d2daf3 100644 --- a/plugins/system/httpheaders/httpheaders.xml +++ b/plugins/system/httpheaders/httpheaders.xml @@ -319,7 +319,7 @@ - en-GB.plg_system_httpheaders.ini - en-GB.plg_system_httpheaders.sys.ini + language/en-GB/plg_system_httpheaders.ini + language/en-GB/plg_system_httpheaders.sys.ini diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml index 807a3067979..a012b079287 100644 --- a/plugins/system/languagefilter/languagefilter.xml +++ b/plugins/system/languagefilter/languagefilter.xml @@ -13,8 +13,8 @@ languagefilter.php - en-GB.plg_system_languagefilter.ini - en-GB.plg_system_languagefilter.sys.ini + language/en-GB/plg_system_languagefilter.ini + language/en-GB/plg_system_languagefilter.sys.ini diff --git a/plugins/system/log/log.xml b/plugins/system/log/log.xml index bff6fa43bc1..00fb7b69be7 100644 --- a/plugins/system/log/log.xml +++ b/plugins/system/log/log.xml @@ -13,8 +13,8 @@ log.php - en-GB.plg_system_log.ini - en-GB.plg_system_log.sys.ini + language/en-GB/plg_system_log.ini + language/en-GB/plg_system_log.sys.ini diff --git a/plugins/system/logout/logout.xml b/plugins/system/logout/logout.xml index fd165741e36..d1b46000547 100644 --- a/plugins/system/logout/logout.xml +++ b/plugins/system/logout/logout.xml @@ -13,7 +13,7 @@ logout.php - en-GB.plg_system_logout.ini - en-GB.plg_system_logout.sys.ini + language/en-GB/plg_system_logout.ini + language/en-GB/plg_system_logout.sys.ini diff --git a/plugins/system/logrotation/logrotation.xml b/plugins/system/logrotation/logrotation.xml index 1880f5989cb..6be6165929e 100644 --- a/plugins/system/logrotation/logrotation.xml +++ b/plugins/system/logrotation/logrotation.xml @@ -13,8 +13,8 @@ logrotation.php - en-GB.plg_system_logrotation.ini - en-GB.plg_system_logrotation.sys.ini + language/en-GB/plg_system_logrotation.ini + language/en-GB/plg_system_logrotation.sys.ini diff --git a/plugins/system/privacyconsent/privacyconsent.xml b/plugins/system/privacyconsent/privacyconsent.xml index ec76afe6986..bd807a92d11 100644 --- a/plugins/system/privacyconsent/privacyconsent.xml +++ b/plugins/system/privacyconsent/privacyconsent.xml @@ -16,8 +16,8 @@ src - en-GB.plg_system_privacyconsent.ini - en-GB.plg_system_privacyconsent.sys.ini + language/en-GB/plg_system_privacyconsent.ini + language/en-GB/plg_system_privacyconsent.sys.ini diff --git a/plugins/system/redirect/redirect.xml b/plugins/system/redirect/redirect.xml index 300236f0223..c28c5e4fd9d 100644 --- a/plugins/system/redirect/redirect.xml +++ b/plugins/system/redirect/redirect.xml @@ -14,8 +14,8 @@ redirect.php - en-GB.plg_system_redirect.ini - en-GB.plg_system_redirect.sys.ini + language/en-GB/plg_system_redirect.ini + language/en-GB/plg_system_redirect.sys.ini diff --git a/plugins/system/remember/remember.php b/plugins/system/remember/remember.php index e5f7e65d2ad..2e539d1a73b 100644 --- a/plugins/system/remember/remember.php +++ b/plugins/system/remember/remember.php @@ -9,10 +9,10 @@ defined('_JEXEC') or die; +use Joomla\CMS\Log\Log; use Joomla\CMS\Plugin\CMSPlugin; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\User\UserHelper; -use Joomla\CMS\Log\Log; /** * Joomla! System Remember Me Plugin diff --git a/plugins/system/remember/remember.xml b/plugins/system/remember/remember.xml index 23ce6e1c617..f8e50445233 100644 --- a/plugins/system/remember/remember.xml +++ b/plugins/system/remember/remember.xml @@ -13,7 +13,7 @@ remember.php - en-GB.plg_system_remember.ini - en-GB.plg_system_remember.sys.ini + language/en-GB/plg_system_remember.ini + language/en-GB/plg_system_remember.sys.ini diff --git a/plugins/system/sef/sef.xml b/plugins/system/sef/sef.xml index 7906c2706b6..03de440a633 100644 --- a/plugins/system/sef/sef.xml +++ b/plugins/system/sef/sef.xml @@ -13,8 +13,8 @@ sef.php - en-GB.plg_system_sef.ini - en-GB.plg_system_sef.sys.ini + language/en-GB/plg_system_sef.ini + language/en-GB/plg_system_sef.sys.ini diff --git a/plugins/system/stats/layouts/message.php b/plugins/system/stats/layouts/message.php index 7eea180dcef..7a4d420520f 100644 --- a/plugins/system/stats/layouts/message.php +++ b/plugins/system/stats/layouts/message.php @@ -23,7 +23,7 @@ */ ?> -