diff --git a/.rubocop.yml b/.rubocop.yml index 261eecb4..96666783 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,6 +5,7 @@ AllCops: - app/models/regions_table.rb - app/models/locations_table.rb - 'node_modules/**/*' + NewCops: enable # Customize rules Layout/LineLength: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c6b6bfd..6b795c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ # Changes to the UKHPI app by version and date +## 1.5.9 - 2020-10-02 (Ian) + +- Additional fixes to the Welsh language localisation, including some + corrections to Welsh mutations +- added Welsh version of accessibility statement + +## 1.5.8 - 2020-09-29 (Ian) + +- Update Rails and JS dependencies +- Various additional Welsh translation fixes, including support for + consonant mutations (nb: this is a retrospective entry for the + previous PR) + +## 1.5.7 - 2020-09-24 (Ian) + +- Fix problem `$t is not defined`, GH-263 + +## 1.5.6 - 2020-09-23 (Ian) + +- Added accessibility statement + +## 1.5.5 - 2020-09-22 (Ian) + +- Fix WCAG colour contrast issue, and improve visual consistency by + picking dark blue as the primary action colour + +## 1.5.4 - 2020-09-22 (Ian) + +- added skip-to-main-content link + ## 1.5.3 - 2020-09-18 (Ian) Updates to Welsh localization based on testing diff --git a/Gemfile.lock b/Gemfile.lock index 2ba1835d..2f78aa0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,56 +10,56 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.2) - actionpack (= 6.0.3.2) + actioncable (6.0.3.3) + actionpack (= 6.0.3.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actionmailbox (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) mail (>= 2.7.1) - actionmailer (6.0.3.2) - actionpack (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) + actionmailer (6.0.3.3) + actionpack (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.2) - actionview (= 6.0.3.2) - activesupport (= 6.0.3.2) + actionpack (6.0.3.3) + actionview (= 6.0.3.3) + activesupport (= 6.0.3.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.2) - actionpack (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + actiontext (6.0.3.3) + actionpack (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) nokogiri (>= 1.8.5) - actionview (6.0.3.2) - activesupport (= 6.0.3.2) + actionview (6.0.3.3) + activesupport (= 6.0.3.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.2) - activesupport (= 6.0.3.2) + activejob (6.0.3.3) + activesupport (= 6.0.3.3) globalid (>= 0.3.6) - activemodel (6.0.3.2) - activesupport (= 6.0.3.2) - activerecord (6.0.3.2) - activemodel (= 6.0.3.2) - activesupport (= 6.0.3.2) - activestorage (6.0.3.2) - actionpack (= 6.0.3.2) - activejob (= 6.0.3.2) - activerecord (= 6.0.3.2) + activemodel (6.0.3.3) + activesupport (= 6.0.3.3) + activerecord (6.0.3.3) + activemodel (= 6.0.3.3) + activesupport (= 6.0.3.3) + activestorage (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) marcel (~> 0.3.1) - activesupport (6.0.3.2) + activesupport (6.0.3.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -84,11 +84,13 @@ GEM capybara (>= 2) minitest (>= 4) childprocess (3.0.0) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) crass (1.0.6) docile (1.3.2) - ebnf (1.2.0) + ebnf (2.1.1) + htmlentities (~> 4.3) rdf (~> 3.1) + scanf (~> 1.0) sxp (~> 1.1) erubi (1.9.0) erubis (2.7.0) @@ -134,6 +136,7 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) + htmlentities (4.3.4) http_accept_language (2.1.1) i18n (1.8.5) concurrent-ruby (~> 1.0) @@ -143,7 +146,7 @@ GEM json (2.3.1) json_expressions (0.9.0) link_header (0.0.8) - loofah (2.6.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) m (1.5.1) @@ -157,7 +160,7 @@ GEM mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) minitest-rails (6.0.1) minitest (~> 5.10) railties (~> 6.0.0) @@ -168,44 +171,44 @@ GEM ruby-progressbar mocha (1.11.2) multipart-post (2.1.1) - nio4r (2.5.2) - nokogiri (1.10.9) + nio4r (2.5.4) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - oj (3.10.6) + oj (3.10.14) parallel (1.19.2) - parser (2.7.1.4) + parser (2.7.1.5) ast (~> 2.4.1) - public_suffix (4.0.5) - puma (4.3.5) + public_suffix (4.0.6) + puma (5.0.2) nio4r (~> 2.0) rack (2.2.3) rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.2) - actioncable (= 6.0.3.2) - actionmailbox (= 6.0.3.2) - actionmailer (= 6.0.3.2) - actionpack (= 6.0.3.2) - actiontext (= 6.0.3.2) - actionview (= 6.0.3.2) - activejob (= 6.0.3.2) - activemodel (= 6.0.3.2) - activerecord (= 6.0.3.2) - activestorage (= 6.0.3.2) - activesupport (= 6.0.3.2) + rails (6.0.3.3) + actioncable (= 6.0.3.3) + actionmailbox (= 6.0.3.3) + actionmailer (= 6.0.3.3) + actionpack (= 6.0.3.3) + actiontext (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) + activemodel (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) bundler (>= 1.3.0) - railties (= 6.0.3.2) + railties (= 6.0.3.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.2) - actionpack (= 6.0.3.2) - activesupport (= 6.0.3.2) + railties (6.0.3.3) + actionpack (= 6.0.3.3) + activesupport (= 6.0.3.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -214,31 +217,31 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdf (3.1.4) + rdf (3.1.6) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-turtle (3.1.1) - ebnf (~> 1.2) + rdf-turtle (3.1.2) + ebnf (~> 2.0) rdf (~> 3.1, >= 3.1.2) - regexp_parser (1.7.1) + regexp_parser (1.8.1) rexml (3.2.4) - rubocop (0.88.0) + rubocop (0.92.0) parallel (~> 1.10) - parser (>= 2.7.1.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.1.0, < 1.0) + rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.2.0) - parser (>= 2.7.0.1) - rubocop-rails (2.7.1) + rubocop-ast (0.7.1) + parser (>= 2.7.1.5) + rubocop-rails (2.8.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.87.0) ruby-progressbar (1.10.1) - ruby_parser (3.14.2) + ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyzip (2.3.0) sass (3.7.4) @@ -256,22 +259,23 @@ GEM sprockets (> 3.0) sprockets-rails tilt + scanf (1.0.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic_range (2.3.0) - sentry-raven (3.0.0) + sentry-raven (3.1.1) faraday (>= 1.0) - sexp_processor (4.15.0) - simplecov (0.18.5) + sexp_processor (4.15.1) + simplecov (0.19.0) docile (~> 1.1) simplecov-html (~> 0.11) - simplecov-html (0.12.2) - spring (2.1.0) + simplecov-html (0.12.3) + spring (2.1.1) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -290,17 +294,17 @@ GEM execjs (>= 0.3.0, < 3) unicode-display_width (1.7.0) vcr (6.0.0) - web-console (4.0.3) + web-console (4.0.4) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webpacker (5.1.1) + webpacker (5.2.1) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.2) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) diff --git a/app/assets/stylesheets/_data-view-download.scss b/app/assets/stylesheets/_data-view-download.scss index 0eb7ed0c..c8e09e53 100644 --- a/app/assets/stylesheets/_data-view-download.scss +++ b/app/assets/stylesheets/_data-view-download.scss @@ -13,12 +13,14 @@ text-decoration: none; } - &__button, &__button:visited, &__button:link { + &__button, &__button:visited, &__button:link, &__button:focus, &__button:link:focus { color: white; + background-color: $dark-blue; } } .c-compare__download-link { @extend .button; + background-color: $dark-blue; font-size: 1.5rem; } diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index a8e529a4..7b9e5db5 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -23,3 +23,35 @@ word-break: normal; -ms-word-break: normal; } + +.el-button--default { + background-color: $grey-8; +} + +.el-button--primary { + background-color: $dark-blue; +} + +.el-date-editor { + color: $black; +} + +table.el-month-table { + td .cell { + color: $black; + } + + td.current .cell { + color: $black; + background-color: $yellow-50; + } + + td.current .cell:not(.disabled) { + color: $black; + } +} + +.el-select-dropdown__item.selected { + background-color: $dark-blue; + color: white; +} \ No newline at end of file diff --git a/app/assets/stylesheets/_gov_uk.scss b/app/assets/stylesheets/_gov_uk.scss index 581ce84b..a1be390f 100644 --- a/app/assets/stylesheets/_gov_uk.scss +++ b/app/assets/stylesheets/_gov_uk.scss @@ -18,6 +18,7 @@ @import "elements/helpers"; // Helper functions and classes $grey-8: #f0f0f0; +$dark-blue: #003078; @import "elements/govuk-template-base"; // HTML elements, set by the GOV.UK template diff --git a/app/assets/stylesheets/_skip_to_main.scss b/app/assets/stylesheets/_skip_to_main.scss new file mode 100644 index 00000000..52549069 --- /dev/null +++ b/app/assets/stylesheets/_skip_to_main.scss @@ -0,0 +1,22 @@ +.u-off-canvas { + position: absolute; + left: -999rem; + top: -999rem; + + @media print { + display: none; + } +} + +.u-off-canvas--focusable { + &:focus { + left: 0; + top: 0; + } +} + +.c-skip-to-main { + background: white; + padding: 1rem; + z-index: 9999; +} diff --git a/app/assets/stylesheets/_ukhpi-typography.scss b/app/assets/stylesheets/_ukhpi-typography.scss index 15d6cdee..8cf0d1cb 100644 --- a/app/assets/stylesheets/_ukhpi-typography.scss +++ b/app/assets/stylesheets/_ukhpi-typography.scss @@ -26,5 +26,5 @@ } p { - word-break: break-word; + word-break: break-word !important; } \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 06f6ba6a..6f76f8a1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -22,4 +22,5 @@ 'compare', 'landing', 'ukhpi-location-select', - 'actions'; + 'actions', + 'skip_to_main'; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e4f5e1f6..f1c7e22b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -18,6 +18,6 @@ def set_locale params['lang'] || http_accept_language.compatible_language_from(I18n.available_locales) - I18n.locale = user_locale if user_locale + I18n.locale = user_locale if Rails.application.config.welsh_language_enabled end end diff --git a/app/javascript/components/compare-locations.vue b/app/javascript/components/compare-locations.vue index 67a946bd..38d0bd51 100644 --- a/app/javascript/components/compare-locations.vue +++ b/app/javascript/components/compare-locations.vue @@ -49,12 +49,12 @@

@@ -101,6 +101,8 @@ import bus from '../lib/event-bus'; const MAX_RESULTS = 10; export default { + name: 'select-location', + components: { FocusTrap }, @@ -313,13 +315,11 @@ export default { this.searchInput = event.target.innerText; this.onSearchInput(this.searchInput); }, - }, - filters: { - locationTypeLabel(location) { + locationTypeLabel (location) { const typeName = locationIndexType(location); - return typeName === 'la' ? 'local authority' : typeName; - }, + return this.$t(`js.location.type.${typeName}`) + } }, mounted() { diff --git a/app/javascript/lang/welsh-name-mutations.js b/app/javascript/lang/welsh-name-mutations.js new file mode 100644 index 00000000..7b0ced64 --- /dev/null +++ b/app/javascript/lang/welsh-name-mutations.js @@ -0,0 +1,66 @@ +/** + * A subset of Welsh consonant mutations where we assume we're + * dealing with proper nouns, like months or locations. + */ + +const MUTATIONS = { + yn: [ + [/^B(.*)/, 'M$1', 'ym'], + [/^P(.*)/, 'Mh$1', 'ym'], + [/^G(.*)/, 'Ng$1', 'yng'], + [/^T(.*)/, 'Nh$1', 'yn'], + [/^C(.*)/, 'Ngh$1', 'yng'], + [/^D(.*)/, 'N$1', 'yn'], + [/^M(.*)/, 'M$1', 'ym'] + ], + i: [ + [/^M(.*)/, 'F$1', 'i'], + [/^G(.*)/, '$1', 'i'], + [/^T(.*)/, 'D$1', 'i'], + [/^Rh(.*)/, 'R$1', 'i'], + [/^B(.*)/, 'F$1', 'i'], + [/^C(.*)/, 'G$1', 'i'], + [/^D(.*)/, 'Dd$1', 'i'], + [/^Ll(.*)/, '$1', 'i'], + [/^P(.*)/, 'B$1', 'i'] + ], + o: [ + [/^M(.*)/, 'F$1', 'o'], + [/^G(.*)/, '$1', 'o'], + [/^T(.*)/, 'D$1', 'o'], + [/^Rh(.*)/, 'R$1', 'o'], + [/^B(.*)/, 'F$1', 'o'], + [/^C(.*)/, 'G$1', 'o'], + [/^D(.*)/, 'Dd$1', 'o'], + [/^Ll(.*)/, '$1', 'o'], + [/^P(.*)/, 'B$1', 'o'] + ] +} + +function mutateWelshName (name, preposition) { + return mutate(name, preposition, MUTATIONS[preposition] || []) +} + +function mutate (name, preposition, mutations) { + for (const rule of mutations) { + if (name.match(rule[0])) { + return { + name: + name + .replace(rule[0], rule[1]) + .replace(/^\w/, char => char.toLocaleUpperCase()), + preposition: rule[2] + } + } + } + + return { name, preposition } +} + +export function mutateName (name, preposition, locale) { + if (locale !== 'cy') { + return { name, preposition } + } + + return mutateWelshName(name, preposition) +} diff --git a/app/lib/grammar_action.rb b/app/lib/grammar_action.rb index 78074c54..673a3a94 100644 --- a/app/lib/grammar_action.rb +++ b/app/lib/grammar_action.rb @@ -12,6 +12,10 @@ def initialize(options, result, prefix: nil, suffix: nil) end def self.identity_action(options) - GrammarAction.new(options, options[:source]) + GrammarAction.new( + options, + options[:source], + prefix: options[:prefix] || options[:assuming_prefix] + ) end end diff --git a/app/lib/mutation.rb b/app/lib/mutation.rb index 5084d87e..4e6f3b26 100644 --- a/app/lib/mutation.rb +++ b/app/lib/mutation.rb @@ -2,21 +2,59 @@ # Denotes a consonant mutation in Welsh class Mutation - attr_reader :pattern, :replacement + attr_reader :pattern, :replacement_pattern, :new_prefix - def initialize(pattern, replacement) + def initialize(pattern, replacement, new_prefix = nil) @pattern = pattern - @replacement = replacement + @replacement_pattern = replacement + @new_prefix = new_prefix end def match?(options) - options[:source]&.match?(pattern) + options[:source]&.match?(prefixed_pattern(options[:prefix])) end - def apply(options) - GrammarAction.new( - options, - options[:source]&.sub(pattern, replacement) + # We assume that `apply` is only invoked if `match?` has + # already returned `true` + def apply(options, prefix = nil) + result = case_preserving_replace(options[:source], prefix) + prefix = new_prefix || options[:prefix] || options[:assuming_prefix] + + GrammarAction.new(options, result, prefix: prefix) + end + + def case_preserving_replace(source, prefix) + # post-condition: there will be two capture-groups in `match`: the + # first for the whole of `pattern`, and the second for the replacement + # fragment from inside `pattern` + match = source.match(prefixed_pattern(prefix)) + + leading_upper = leading_uppercase_char?(match[1]) + replacement = replacement_pattern.sub('\1', match[2]) + replacement_corrected_case = replacement_with_correct_case(replacement, leading_upper) + + source.sub( + prefixed_pattern(prefix), + "#{replacement_prefix(prefix)}#{replacement_corrected_case}" ) end + + def prefixed_pattern(prefix) + prefix ? /#{prefix} (#{pattern})/ : /\A(#{pattern})/ + end + + def leading_uppercase_char?(str) + str.match?(/\A\p{Upper}/) + end + + def replacement_with_correct_case(replacement, leading_upper) + replacement_first_char = leading_upper ? replacement.chr.upcase : replacement.chr.downcase + replacement.sub(/.(.*)/, "#{replacement_first_char}\\1") + end + + def replacement_prefix(prefix) + return '' unless prefix + + "#{new_prefix || prefix} " + end end diff --git a/app/lib/version.rb b/app/lib/version.rb index 2662f022..d2c6e813 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,6 +3,6 @@ module Version MAJOR = '1' MINOR = '5' - REVISION = '3' + REVISION = '9' VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}" end diff --git a/app/lib/welsh_grammar.rb b/app/lib/welsh_grammar.rb index 77250455..48216f0e 100644 --- a/app/lib/welsh_grammar.rb +++ b/app/lib/welsh_grammar.rb @@ -1,15 +1,39 @@ # frozen_string_literal: true MUTATIONS = { + 'yn' => + [ + Mutation.new(/b(.*)/i, 'm\1', 'ym'), + Mutation.new(/p(.*)/i, 'mh\1', 'ym'), + Mutation.new(/g(.*)/i, 'ng\1', 'yng'), + Mutation.new(/t(.*)/i, 'nh\1'), + Mutation.new(/c(.*)/i, 'ngh\1', 'yng'), + Mutation.new(/d(.*)/i, 'n\1'), + Mutation.new(/m(.*)/i, 'm\1', 'ym') + ], 'o' => [ - Mutation.new(/Mawrth/, 'Fawrth'), - Mutation.new(/Mai/, 'Fai'), - Mutation.new(/Mehefin/, 'Fehefin'), - Mutation.new(/Gorffennaf/, 'Orffennaf'), - Mutation.new(/Medi/, 'Fedi'), - Mutation.new(/Tachwedd/, 'Dachwedd'), - Mutation.new(/Rhagfyr/, 'Ragfyr') + Mutation.new(/m(.*)/i, 'f\1'), + Mutation.new(/g(.*)/i, '\1'), + Mutation.new(/t(.*)/i, 'd\1'), + Mutation.new(/rh(.*)/i, 'r\1'), + Mutation.new(/b(.*)/i, 'f\1'), + Mutation.new(/c(.*)/i, 'g\1'), + Mutation.new(/d(.*)/i, 'dd\1'), + Mutation.new(/ll(.*)/i, '\1'), + Mutation.new(/p(.*)/i, 'b\1') + ], + 'i' => + [ + Mutation.new(/m(.*)/i, 'f\1'), + Mutation.new(/g(.*)/i, '\1'), + Mutation.new(/t(.*)/i, 'd\1'), + Mutation.new(/rh(.*)/i, 'r\1'), + Mutation.new(/b(.*)/i, 'f\1'), + Mutation.new(/c(.*)/i, 'g\1'), + Mutation.new(/d(.*)/i, 'dd\1'), + Mutation.new(/ll(.*)/i, '\1'), + Mutation.new(/p(.*)/i, 'b\1') ] }.freeze @@ -20,20 +44,24 @@ def self.apply(options) end def self.mutate(options) - result = nil - - if I18n.locale == :cy - result = mutate_prefix(options[:assuming_prefix], options) if options[:assuming_prefix] - end + result = apply_mutations(options) if I18n.locale == :cy result || GrammarAction.identity_action(options) end + def self.apply_mutations(options) + if options[:assuming_prefix] + mutate_prefix(options[:assuming_prefix], options) + elsif options[:prefix] + mutate_prefix(options[:prefix], options) + end + end + def self.mutate_prefix(prefix, options) return nil unless (mutations = MUTATIONS[prefix]) mutations .find { |mutation| mutation.match?(options) } - &.apply(options) + &.apply(options, options[:prefix]) end end diff --git a/app/models/data_view.rb b/app/models/data_view.rb index d4010dbb..e84b082e 100644 --- a/app/models/data_view.rb +++ b/app/models/data_view.rb @@ -95,29 +95,37 @@ def node_id def title_with_indicator change_path = edit_browse_path(user_selections.params) + title_location_translated = title_location <<~TITLE #{indicator.label} #{I18n.t('preposition.by')} #{theme.label.downcase} - #{I18n.t('preposition.in')} - #{title_location} + #{title_location_translated[:preposition]} + #{title_location_translated[:html]} TITLE .html_safe # rubocop:disable Rails/OutputSafety end def title_without_indicator change_path = edit_browse_path(user_selections.params) + title_location_translated = title_location <<~TITLE #{indicator.label} - #{I18n.t('preposition.in')} - #{title_location} + #{title_location_translated[:preposition]} + #{title_location_translated[:html]} TITLE .html_safe # rubocop:disable Rails/OutputSafety end def title_location icon = "" - "#{location.label} #{icon}" + mut_label = WelshGrammar + .apply(source: location.label, assuming_prefix: I18n.t('preposition.in')) + + { + html: "#{mut_label.result} #{icon}", + preposition: mut_label.prefix + } end def title_key diff --git a/app/presenters/compare_locations_presenter.rb b/app/presenters/compare_locations_presenter.rb index 24288a6a..2c061c7f 100644 --- a/app/presenters/compare_locations_presenter.rb +++ b/app/presenters/compare_locations_presenter.rb @@ -30,12 +30,13 @@ def headline_summary # rubocop:disable Metrics/AbcSize stat = I18n.t("statistic.#{statistic.label_key}").downcase from = I18n.l(user_compare_selections.from_date, format: '%b %Y') to = I18n.l(user_compare_selections.to_date, format: '%b %Y') + to_mutated = WelshGrammar.mutate(source: to, assuming_prefix: I18n.t('preposition.to')) <<~HEADLINE #{ind} #{I18n.t('preposition.for')} #{stat}, - #{from} #{I18n.t('preposition.to')} #{to} + #{from} #{I18n.t('preposition.to')} #{to_mutated.result} HEADLINE .html_safe end diff --git a/app/presenters/download_column.rb b/app/presenters/download_column.rb index 4097f9a1..7fcdd52b 100644 --- a/app/presenters/download_column.rb +++ b/app/presenters/download_column.rb @@ -9,7 +9,7 @@ def initialize(options) @options = options end - def label # rubocop:disable Metrics/AbcSize + def label return options[:label] if options[:label] ind_key = "indicator.#{options[:ind]&.slug}" diff --git a/app/presenters/landing_state.rb b/app/presenters/landing_state.rb index 892ba762..765c91de 100644 --- a/app/presenters/landing_state.rb +++ b/app/presenters/landing_state.rb @@ -75,7 +75,7 @@ def to_value(val) def format_percentage(change) if change == 'unknown' change - elsif change == 0.0 + elsif change.zero? I18n.t('landing.change.same') elsif change.positive? format('%s %.1f%%', I18n.t('landing.change.risen'), change.abs) diff --git a/app/views/browse/_data_view.html.haml b/app/views/browse/_data_view.html.haml index 21f88995..8b8ffda4 100644 --- a/app/views/browse/_data_view.html.haml +++ b/app/views/browse/_data_view.html.haml @@ -19,7 +19,7 @@ = l(data_view.from_date, format: '%b %Y') = t('preposition.to') - = l(data_view.to_date, format: '%b %Y') + = WelshGrammar.mutate(source: l(data_view.to_date, format: '%b %Y'), prefix: t('preposition.to')).result = link_to(t('action.change'), edit_browse_path(data_view.user_selections.params)) diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml index 613d9a42..bdcb692d 100644 --- a/app/views/changelog/_changelog_cy.html.haml +++ b/app/views/changelog/_changelog_cy.html.haml @@ -1,134 +1,140 @@ %section#main.c-changelog - %h1.heading-large [TODO Welsh translation] UK House Price Index: change history + %h1.heading-large Mynegai Prisiau Tai y DU: hanes newid - %h2.heading-medium April 2020 – Changes to local authority geograph in England and Scotland + %h2.heading-medium Ebrill 2020 – Newidiadau i ddaearyddiaeth awdurdod lleol yn Lloegr a’r Alban %p - The Office for National Statistics (ONS) will make the following - changes to local authority geography in England and Scotland. + Bydd y Swyddfa Ystadegau Gwladol (ONS) yn gwneud y newidiadau canlynol i + ddaearyddiaeth awdurdodau lleol yn Lloegr a’r Alban. %table.u-documentation-table %thead %tr %th - Former local authorities + Cyn-awdurdodau lleol %th - New structure and geography code + Strwythur a chod daearyddiaeth newydd %th - Data and publication date + Data a dyddiad cyhoeddi %tbody %tr %td Bournemouth (E06000028), Christchurch (E07000048), Poole (E06000029) %td - Bournemouth, Christchurch and Poole (E06000058) + Bournemouth, Christchurch a Poole (E06000058) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - East Dorset (E07000049), North Dorset (E07000050), Purbeck (E07000051), West Dorset (E07000052), Weymouth and Portland (E07000053) + Dwyrain Dorset (E07000049), Gogledd Dorset (E07000050), Purbeck (E07000051), Gorllewin Dorset (E07000052), Weymouth a Portland (E07000053) %td Dorset (E06000059) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - Taunton Deane (E07000190), West Somerset (E07000191) + Taunton Deane (E07000190), Gorllewin Gwlad yr Haf (E07000191) %td - Somerset West and Taunton (E07000246) + Gorllewin Gwlad yr Haf a Taunton (E07000246) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td Forest Heath (E07000201), St Edmundsbury (E07000204) %td - West Suffolk (E07000245) + Gorllewin Suffolk (E07000245) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - Suffolk Coastal (E07000205), Waveney (E07000206) + Arfordir Suffolk (E07000205), Waveney (E07000206) %td - East Suffolk (E07000244) + Dwyrain Suffolk (E07000244) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - City of Glasgow (S12000046) + Dinas Glasgow (S12000046) %td - City of Glasgow* (S12000049) + Dinas Glasgow* (S12000049) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - North Lanarkshire (S12000044) + Gogledd Swydd Lanark (S12000044) %td - North Lanarkshire* (S12000050) + Gogledd Swydd Lanark* (S12000050) %td - February 2020 (to be published on 22 April 2020) + Chwefror 2020 (i’w gyhoeddi ar 22 Ebrill 2020) %tr %td - Aylesbury Vale (E07000004), Chiltern (E07000005), South Bucks (E07000006), Wycombe (E07000007) + Dyffryn Aylesbury (E07000004), Chiltern (E07000005), De Bucks (E07000006), Wycombe (E07000007) %td - Buckinghamshire (E06000060) + Swydd Buckingham (E06000060) %td - April 2020 (to be published on 17 June 2020) + Ebrill 2020 (i’w gyhoeddi ar 17 Mehefin 2020) - %h2.heading-medium April 2019 – UK and Scotland changes + %h2.heading-medium Ebrill 2019 – Newidiadau y Deyrnas Unedig a’r Alban %p - One of the England regions has officially changed name, and two of the Scotland - regions have changed ONS GSS code since this service was first set up. While - users of the app will see the new name reflected in the location search - and the map selector, users who utilise the SPARQL query function should - be aware that the data URI for a re-named area has not changed. + Mae un o ranbarthau Lloegr wedi newid ei enw yn swyddogol, ac mae dau + o ranbarthau’r Alban wedi newid cod ONS GSS ers i’r gwasanaeth hwn gael + ei sefydlu gyntaf. Er y bydd defnyddwyr yr ap yn gweld yr enw newydd + wedi ei adlewyrchu yn y chwiliad lleoliad a’r dewisydd map, dylai defnyddwyr + sy’n defnyddio’r swyddogaeth ymholi SPARQL fod yn ymwybodol nad yw data URI + ar gyfer yr ardal a ail-enwyd wedi newid. - %p The new local authority name is: + %p Enw’r awdurdod lleol newydd yw: %ul.list.list-bullet %li - Folkestone and Hythe (formerly Shepway), + Folkestone a Hythe (Shepway cyn hynny), + %br + mae’r URI yr un fath: %br - the URI remains: %code http://landregistry.data.gov.uk/id/region/shepway - %p In Scotland: + %p Yn yr Alban: %ul.list.list-bullet %li Fife %br - ONS GSS code: S12000047 (formerly S12000015), + cod ONS GSS: S12000047 (S12000015 cyn hynny), %br - the URI remains + mae’r URI yr un fath: %code http://landregistry.data.gov.uk/doc/region/fife %li - Perth and Kinross + Perth a Kinross %br - ONS GSS code: S12000048 (formerly S12000024), + cod ONS GSS: S12000048 (S12000024 cyn hynny), %br - the URI remains + mae’r URI yr un fath: %code http://landregistry.data.gov.uk/doc/region/perth-and-kinross - %p Date of change: 17th April 2019 + %p Dyddiad newid: 17 Ebrill 2019 - %h2.heading-medium August 2017 – Northern Ireland changes + %h2.heading-medium Awst 2017 – Newidiadau Gogledd Iwerddon %p - Three of the Northern Ireland regions have officially - changed name since this service - was first set up. While users of the app will see the new names reflected in the - location search and the map selector, users who utilise the SPARQL - query function should be aware the data URI for a re-named area has not changed. - The new local authority names are: + Mae tri o ranbarthau Gogledd Iwerddon wedi newid eu henwau yn + swyddogol ers i’r gwasanaeth hwn gael ei sefydlu gyntaf. Er y + bydd defnyddwyr yr ap yn gweld yr enwau newydd wedi eu hadlewyrchu + yn y chwiliad lleoliad a’r dewisydd map, dylai defnyddwyr sy’n + defnyddio’r swyddogaeth ymholi SPARQL fod yn ymwybodol nad yw data + URI ar gyfer yr ardal a ail-enwyd wedi newid. Enwau’r awdurdod + lleol newydd yw: %ul.list.list-bullet %li - Ards and North Down (formerly North Down and Ards), the URI remains: + Ards a Gogledd Down (Gogledd Down ac Ards cyn hynny), mae’r URI yr un fath: + %br %code http://landregistry.data.gov.uk/id/region/north-down-and-ards %li - Armagh City Banbridge and Craigavon (formerly Armagh Bainbridge and Craigavon), - the URI remains + Dinas Armagh Banbridge a Craigavon (Armagh Bainbridge a Craigavon cyn hynny), + mae’r URI yr un fath: + %br %code http://landregistry.data.gov.uk/doc/region/armagh-banbridge-and-craigavon %li - Derry City and Strabane (formerly Derry and Strabane), the URI remains + Dinas Derry a Strabane (Derry a Strabane cyn hynny), mae’r URI yr un fath: + %br %code http://landregistry.data.gov.uk/doc/region/derry-and-strabane diff --git a/app/views/common/_footer.html.haml b/app/views/common/_footer.html.haml index 6d4eb338..c5b9704e 100644 --- a/app/views/common/_footer.html.haml +++ b/app/views/common/_footer.html.haml @@ -15,9 +15,11 @@ %li.u-print-hidden %a{:href => "https://www.gov.uk/land-registry-public-data"} = t('common.footer.public_data') + %li.u-print-hidden + = link_to(t('common.footer.accessibility'), "#{Rails.application.config.accessibility_document_path}?lang=#{I18n.locale}") .ogl.open-government-licence %p.logo.u-print-hidden - %a{:href => "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3", rel:"license"} + %a{href: t('common.footer.ogl_url'), rel:"license"} = t('common.footer.ogl') %p = t('common.footer.ogl_statement').html_safe diff --git a/app/views/common/_header.html.haml b/app/views/common/_header.html.haml index 2bd13d7c..e6b8906e 100644 --- a/app/views/common/_header.html.haml +++ b/app/views/common/_header.html.haml @@ -31,13 +31,14 @@ .container.o-container .o-secondary-banner - %nav.o-secondary-banner__lang-select{ 'aria-label' => 'language selector' } - - if @view_state.user_selections.english? - English - - else - = link_to('English', @view_state.user_selections.alternative_language_params.params) - | - - if @view_state.user_selections.welsh? - Cymraeg - - else - = link_to('Cymraeg', @view_state.user_selections.alternative_language_params.params) + - if Rails.application.config.welsh_language_enabled + %nav.o-secondary-banner__lang-select{ 'aria-label' => 'language selector' } + - if @view_state.user_selections.english? + English + - else + = link_to('English', @view_state.user_selections.alternative_language_params.params) + | + - if @view_state.user_selections.welsh? + Cymraeg + - else + = link_to('Cymraeg', @view_state.user_selections.alternative_language_params.params) diff --git a/app/views/common/_skip_to_main_content.html.haml b/app/views/common/_skip_to_main_content.html.haml new file mode 100644 index 00000000..a683d367 --- /dev/null +++ b/app/views/common/_skip_to_main_content.html.haml @@ -0,0 +1,3 @@ +%nav.c-skip-to-main{ 'aria-label' => 'skip to main content'} + %a.c-skip-to-main__action.u-off-canvas.u-off-canvas--focusable{ href: '#main-content' } + Skip to main content diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml index ecbd5fbc..a99baf00 100644 --- a/app/views/doc/_about_ukhpi_cy.html.haml +++ b/app/views/doc/_about_ukhpi_cy.html.haml @@ -1,184 +1,221 @@ -%h1 [TODO: Welsh translation] UK House Price Index Linked Data +%h1.heading-large Data Cysylltiedig Mynegai Prisiau Tai y DU -%h2 - What does the House Price Index Dataset consist of? +%h2.heading-medium + Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai? %p - The UK House Price Index (UK HPI) captures changes in the value of residential properties. + Mae Mynegai Prisiau Tai y DU yn cofnodi newidiadau yng ngwerth eiddo preswyl. %p - The UK HPI uses sales data collected on residential housing transactions, whether for cash or with a mortgage. Properties have been included: + Mae Mynegai Prisiau Tai y DU yn defnyddio data gwerthiannau a gesglir ar drafodion tai preswyl, boed am arian parod neu gyda morgais. Mae eiddo wedi cael ei gynnwys: %ul.list.list-bullet - %li in England and Wales since January 1995, - %li in Scotland since January 2004 and - %li in Northern Ireland since January 2005. + %li yng Nghymru a Lloegr er Ionawr 1995, + %li yn yr Alban er Ionawr 2004 ac + %li yng Ngogledd Iwerddon er Ionawr 2005. %p - Data is available at a national and regional level, as well as counties, local authorities and London boroughs + Mae data ar gael ar lefel genedlaethol a rhanbarthol, yn ogystal ag ar lefel + sir, awdurdod lleol a bwrdeistref Llundain. %p - The UK HPI dataset contains information on more than 441 areas in England, Scotland, Northern Ireland and Wales. - Please note that we do not publish HPI information for The Isles of Scilly due to its low monthly sales volumes. + Mae set ddata Mynegai Prisiau Tai y DU yn cynnwys gwybodaeth am dros 441 o ardaloedd + yng Nghymru, Lloegr, yr Alban a Gogledd Iwerddon. Sylwer nad ydym yn cyhoeddi + gwybodaeth Mynegai Prisiau Tai ar gyfer Ynysoedd Scilly oherwydd ei nifer isel + o werthiannau misol. %p - For each area we publish a UK - %em House Price Index - figure. This was set at a base of 100 in January 2015, and reflects the change in - value of residential property since then. We also have figures for the average price of all properties in an area, - for each of four property types, sales volumes, and the percentage change from the previous month and year. - Please note that sales volume data is not available for the most-recent two months. + Ar gyfer pob ardal, rydym yn cyhoeddi ffigur + %em Mynegai Prisiau Tai + y DU. Cafodd hwn ei osod ar sylfaen o 100 yn Ionawr 2015, ac mae’n adlewyrchu’r newid + yng ngwerth eiddo preswyl ers hynny. Mae gennym ffigurau hefyd ar gyfer pris cyfartalog + yr holl eiddo mewn ardal, ar gyfer pob un o’r pedwar math o eiddo, nifer y gwerthiannau, + a’r newid canrannol ers y mis blaenorol a’r flwyddyn flaenorol. Sylwer nad yw data nifer + y gwerthiannau ar gael ar gyfer y ddau fis mwyaf diweddar. + I gael rhagor o wybodaeth am Fynegai Prisiau Tai y DU, gan gynnwys pam nad yw rhai mathau + o ddata ar gael ar gyfer y misoedd diwethaf, darllenwch am Fynegai Prisiau Tai y DU neu + defnyddiwch y cysylltau uniongyrchol isod: -%p - For more information on the UK HPI, including why some data is not available for recent months, - read about the UK HPI or use the direct links below: - -%ul +%ul.list.list-bullet %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#calculating-the-uk-hpi' } - Calculating the UK HPI + = link_to('Cyfrifo Mynegai Prisiau Tai y DU', 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/4437849#cyfrifo-mynegai-prisiau-tai-y-du') %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#monthly-revision' } - Revisions to the UK HPI data + = link_to('Diwygiadau i ddata Mynegai Prisiau Tai y DU', 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/4437849#diwygio-misol') %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#the-difference-between-the-uk-hpi-and-others' } - The difference between the UK HPI and others + = link_to('Y gwahaniaeth rhwng Mynegai Prisiau Tai y DU a mynegeion eraill', 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/4437849#y-gwahaniaeth-rhwng-mynegai-prisiau-tai-y-du-a-mynegeion-eraill') %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#searching-the-uk-house-price-index' } - Searching the UK House Price Index + = link_to('Chwilio Mynegai Prisiau Tai y DU', 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/4437849#chwilio-mynegai-prisiau-tai-y-du') %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#uk-house-price-index-release-dates' } - Calendar release dates + = link_to('Calendr dyddiadau cyhoeddi', 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/4437849#calendr-dyddiadau-rhyddhau') %p - In June 2016 the UK HPI linked data dataset contains approximately four million triples for 441 regions in - England, Scotland, Northern Ireland and Wales. The triple store is refreshed in each month with data - from the current month and a refresh of the previous two months. + Ym Mehefin 2016, mae set ddata data cysylltiedig Mynegai Prisiau Tai y DU yn cynnwys + oddeutu pedair miliwn tripled ar gyfer 441 o ranbarthau yng Nghymru, Lloegr, yr Alban + a Gogledd Iwerddon. Mae’r stôr driphlyg yn cael ei diweddaru bob mis gyda data o’r mis + cyfredol a diweddariad o ddata’r ddau fis blaenorol. %p - The linked data version of UK HPI dataset is generated from the published files and contains additional information to describe each of the reported regions, this information includes links to linked datasets published by the - = link_to "Ordnance Survey", "http://data.ordnancesurvey.co.uk/" - and the - = link_to "http://www.ons.gov.uk/" do + Mae’r fersiwn data cysylltiedig o set ddata Mynegai Prisiau Tai y DU yn cael ei + gynhyrchu o’r ffeiliau cyhoeddedig ac yn cynnwys gwybodaeth ychwanegol i ddisgrifio + pob un o’r rhanbarthau yr adroddir arnynt; mae’r wybodaeth hon yn cynnwys cysylltau + â setiau data cysylltiedig a gyhoeddwyd gan yr + = link_to('Arolwg Ordnans', "http://data.ordnancesurvey.co.uk/") + a’r + = link_to('https://cy.ons.gov.uk/') do = succeed "." do - Office of National Statistics + Swyddfa Ystadegau Gwladol %p - Please note that links to other sources of open, linked data are provided under the - = link_to "Open Government License", "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" - (ONS data) and - = link_to "Open Data License", "http://www.ordnancesurvey.co.uk/docs/licences/os-opendata-licence.pdf" - (OS data). HM Land Registry is not responsible for the content or reliability of any linked websites. + Sylwer bod cysylltau â ffynonellau eraill o ddata cysylltiedig, agored wedi eu + darparu o dan y + = link_to('Drwydded Llywodraeth Agored' , 'https://www.nationalarchives.gov.uk/doc/open-government-licence-cymraeg/version/3/') + (data’r Swyddfa Ystadegau Gwladol) a’r + = link_to('Drwydded Data Agored', 'http://www.ordnancesurvey.co.uk/docs/licences/os-opendata-licence.pdf') + (data’r Arolwg Ordnans). Nid yw Cofrestrfa Tir EM yn gyfrifol am gynnwys neu + ddibynadwyedd unrhyw wefannau cysylltiedig. -%h2 How is the House Price Index Dataset published? +%h2.heading-medium Sut caiff Set Ddata’r Mynegai Prisiau Tai ei chyhoeddi? %p - The UK house price index dataset is available in several forms from the HM Land Registry: + Mae set ddata Mynegai Prisiau Tai y DU ar gael ar sawl ffurf gan Gofrestrfa Tir EM: %ul.list.list-bullet %li - interactively, using the - = link_to("/app/ukhpi", 'aria-label' => 'Explore the UK house price index') do + yn rhyngweithiol, gan ddefnyddio’r + = link_to('/app/ukhpi', 'aria-label' => 'Explore the UK house price index') do = succeed "." do - Search the UK House Price Index tool - This tool also includes options to download the data in CSV or Turtle and to generate downloadable files from SPARQL queries in JSON, XML, plain text or as a table. + teclyn Chwilio Mynegai Prisiau Tai y DU + Mae’r teclyn hwn hefyd yn cynnwys opsiynau i lawrlwytho mewn CSV neu Turtle + a chynhyrchu ffeiliau i’w lawrlwytho o ymholiadau SPARQL mewn JSON, XML, + testun plaen neu fel tabl %li - for download in - = link_to "https://www.gov.uk/guidance/uk-house-price-index" do - = succeed "." do - CSV form or as an Excel Worksheet - -%p - The UK house price index dataset is also available in full as a 5* linked dataset which is free to use under the terms of the OGL. - -%h2 Linked Data Overview -%p - Each month UK HPI data is updated for all of Great Britain, there is a monthly value for Northern Ireland data which is updated quarterly. The UK HPI data is converted into linked data form and this replaces the previous named graph in the triplestore, graphs are named UKHPI-yyyy-mm. This process runs alongside the normal publication of UK HPI data. Publication dates are available on the Publication timetable - -%h3 Vocabularies -%p - The publication of the House Price Index Dataset as - %a{:href => "http://linkeddata.org/"} linked data - requires the creation of reusable - %a{:href => "http://www.w3.org/TR/rdf-schema/"} RDFS - or - %a{:href => "http://www.w3.org/TR/owl2-overview/"} OWL - vocabularies, one HM Land Registry vocabulary and two Ordnance Survey vocabularies. In addition, the data is - encoded as an + i’w lawrlwytho ar + = link_to('https://www.gov.uk/guidance/uk-house-price-index') do + = succeed '.' do + ffurf CSV neu fel Taflen Waith Excel + +%p + Mae set ddata Mynegai Prisiau Tai y DU hefyd ar gael yn llawn fel set ddata + gysylltiedig 5* sy’n rhad ac am ddim i’w defnyddio o dan delerau’r + Drwydded Llywodraeth Agored. + +%h2.heading-medium Trosolwg o Ddata Cysylltiedig +%p + Bob mis, caiff data Mynegai Prisiau Tai y DU ei ddiweddaru ar gyfer pob rhan o + Brydain Fawr; ceir prisiad misol ar gyfer data Gogledd Iwerddon sy’n cael ei + ddiweddaru bob chwarter. Mae data Mynegai Prisiau Tai y DU yn cael ei newid + i ffurf data cysylltiedig ac mae hyn yn cymryd lle’r graff a enwyd yn flaenorol + yn y stôr driphlyg; caiff graffiau eu henwi UKHPI-bbbb-mm. Mae’r broses hon + yn rhedeg ochr yn ochr â chyhoeddiad arferol Mynegai Prisiau Tai y DU. Mae + dyddiadau cyhoeddi ar gael ar yr amserlen Cyhoeddi. + +%h3.heading-small Geirfâu +%p + Mae cyhoeddi Set Ddata’r Mynegai Prisiau Tai fel + = link_to('data cysylltiedig', 'http://linkeddata.org/') + yn golygu bod angen creu geirfâu + = link_to('RDFS', 'http://www.w3.org/TR/rdf-schema/') + neu + = link_to('OWL', 'http://www.w3.org/TR/owl2-overview/') + ailddefnyddiadwy, un eirfa Cofrestrfa Tir EM a dwy eirfa’r Arolwg + Ordnans. Yn ogystal, caiff y data ei encryptio fel = succeed "." do - %a{:href => "http://www.w3.org/TR/vocab-data-cube/"} RDF data cube + = link_to('ciwb data RDF', 'http://www.w3.org/TR/vocab-data-cube/') + %dl.list %dt - Data Cube - %a{:href => "http://purl.org/linked-data/cube"} http://purl.org/linked-data/cube - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - A recommendation from the W3C for representing sets of multi-dimensional statistical data in RDF as a hypercube. + = link_to('Ciwb Data', 'http://purl.org/linked-data/cube') + %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em" } + Argymhelliad gan W3C ar gyfer cynrychioli setiau o ddata ystadegol + aml-ddimensiwn mewn RDF fel hypergiwb. %dt - HM Land Registry HPI - %a{:href => "http://landregistry.data.gov.uk/def/hpi"} http://landregistry.data.gov.uk/def/hpi - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - The HM Land Registry HPI vocabulary is used to describe the House Price Index Dataset produced each month. The vocabulary contains terms that are used by Land Registry to describe things that are used within the House Price Index dataset. + = link_to('Mynegai Prisiau Tai Cofrestrfa Tir EM', 'http://landregistry.data.gov.uk/def/hpi') + %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em" } + Defnyddir geirfa Mynegai Prisiau Tai Cofrestrfa Tir EM i ddisgrifio’r + Set Ddata Mynegai Prisiau Tai a gynhyrchir bob mis. Mae’r eirfa yn + cynnwys termau a ddefnyddir gan Gofrestrfa Tir EM i ddisgrifio pethau + a ddefnyddir o fewn set ddata’r Mynegai Prisiau Tai. %dt - OS Spatial Relations - %a{:href => "http://data.ordnancesurvey.co.uk/ontology/spatialrelations/"} http://landregistry.data.gov.uk/def/hpi - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - This Ordnance Survey vocabulary is used to describe basic spatial relations + = link_to('Cysylltiadau Gofodol yr Arolwg Ordnans', 'http://landregistry.data.gov.uk/def/hpi') + %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em" } + Defnyddir yr eirfa Arolwg Ordnans hon i ddisgrifio cysylltiadau + gofodol sylfaenol. %dt - OS Admingeo - %a{:href => "http://data.ordnancesurvey.co.uk/ontology/admingeo/"} http://data.ordnancesurvey.co.uk/ontology/admingeo/ - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - This Ordnance Survey vocabulary is used to describe the administrative and voting area geography of Great Britain. - -%h3 UKHPI Data -%p - UKHPI Data is stored as a named graph in a data cube with two dimensions and a variety of measures. - The - = link_to "Data Structure Definition (DSD)", controller: :doc, action: :ukhpi_dsd - file defines this structure, and can be used by both data users - and programs to understand how the data is structured. - -%h2 The UK House Price Index reporting tool -%p - The - = link_to("report tool", "/app/ukhpi", 'aria-label' => 'Explore the UK house price index') - is the easiest way to query the UKHouse Price Index dataset. It allows the easy creation of queries using a form and results can be downloaded in various forms. The report builder can also be used to generate SPARQL queries that can be amended and re-run as required. -%p - Please note that when choosing the CSV option for downloaded data then only the data items shown in the result on screen will be included in the CSV. For Turtle downloads all data items will be included as will the result from the SPARQL query if re-run. - -%h2 SPARQL -%p - Alongside the report builder we have created a - = link_to "SPARQL query page", "/app/qonsole" - that you can use to try out some example SPARQL queries or create your own. -%p - We also have made a SPARQL endpoint available. You can use the following URL address in - your own scripts, applications and SPARQL query tools: -%pre + = link_to('OS Admingeo', 'http://data.ordnancesurvey.co.uk/ontology/admingeo/') + %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em" } + Defnyddir yr eirfa Arolwg Ordnans hon i ddisgrifio daearyddiaeth + ardal weinyddol ac ardal bleidleisio Prydain Fawr. + +%h3.heading-small Data Mynegai Prisiau Tai y DU +%p + Caiff data Mynegai Prisiau Tai y DU ei storio fel graff a enwir mewn + ciwb data gyda dau ddimensiwn ac amrywiaeth o fesurau. Mae’r ffeil + = link_to('Diffiniad Strwythur Data', controller: :doc, action: :ukhpi_dsd) + yn diffinio’r strwythur hwn, a gellir ei defnyddio gan ddefnyddwyr + data a rhaglenni i ddeall sut y caiff y data ei strwythuro. + +%h2.heading-medium Teclyn adrodd Mynegai Prisiau Tai y DU +%p + Y + = link_to('teclyn adrodd', '/app/ukhpi', 'aria-label' => 'Explore the UK house price index') + yw’r ffordd hawsaf i ymholi set data Mynegai Prisiau Tai y DU. Mae’n cynnig + dull hawdd o greu ymholiadau trwy ddefnyddio ffurflen a gall canlyniadau gael + eu lawrlwytho ar ffurfiau amrywiol. Gellir defnyddio’r lluniwr adroddiadau + hefyd i gynhyrchu ymholiadau SPARQL y gellir eu diwygio a’u hail-redeg + fel y bo angen. +%p + Sylwer wrth ddewis yr opsiwn CSV ar gyfer data wedi ei lawrlwytho, dim ond + yr eitemau data a ddangosir yn y canlyniad ar y sgrin gaiff eu cynnwys yn + y CSV. Ar gyfer lawrlwythiadau Turtle, caiff yr holl eitemau data eu cynnwys + yn ogystal â’r canlyniad o’r ymholiad SPARQL os caiff ei ail-redeg. + +%h2.heading-medium SPARQL +%p + Ochr yn ochr â’r lluniwr adroddiadau, rydym wedi creu + = link_to('tudalen ymholiad SPARQL', '/app/qonsole') + y gallwch ei defnyddio i roi cynnig ar rai ymholiadau SPARQL enghreifftiol + neu i greu ymholiad eich hunain. +%p + Rydym wedi gwneud pwynt terfyn SPARQL ar gael hefyd. Gallwch ddefnyddio’r + cyfeiriad URL canlynol yn eich sgriptiau, cymwysiadau ac offer ymholi + SPARQL eich hunain: +%pre.code http://landregistry.data.gov.uk/landregistry/query -%h2 Via the API +%h2.heading-medium Trwy’r Rhyngwyneb Rhaglennu Cymwysiadau (API) %p - It is possible to query the UKHPI dataset directly through an - %em application programming interface (API). - This largely removes the need to know how to use SPARQL as long as the structure of the data is known. Using the example transaction above we know that there is data for the North east of England. With that information we can enter this URL into a web browser -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/north-east", "/data/ukhpi/region/north-east" + Mae modd ymholi set ddata Mynegai Prisiau Tai y DU yn uniongyrchol trwy’r + rhyngwyneb rhaglennu cymwysiadau. Mae hwn yn dileu i raddau helaeth yr + angen i wybod sut i ddefnyddio SPARQL ar yr amod eich bod yn gwybod + strwythur y data. Gan ddefnyddio’r trafodiad enghreifftiol uchod, rydym + yn gwybod bod data ar gael ar gyfer Gogledd Ddwyrain Lloegr. Gyda’r + wybodaeth honno, gallwn nodi’r URL mewn porwr gwe +%pre.code + = link_to('/data/ukhpi/region/north-east', 'http://landregistry.data.gov.uk/data/ukhpi/region/north-east') %p - Note that this query will return all data for that region from the current month back to January 1995. Because HM Land Registry do not publish Sales Volumes with the same frequency as other data there will be no Sales Volume figure for the first two months displayed. By default a count of the results generated for the query is displayed on screen. + Sylwer bydd yr ymholiad hwn yn dychwelyd yr holl ddata ar gyfer y + rhanbarth hwnnw o’r mis presennol yn ôl i Ionawr 1995. Oherwydd + nad yw Cofrestrfa Tir EM yn cyhoeddi Nifer y Gwerthiannau gyda’r un + amlder â data arall, ni fydd unrhyw ffigur Nifer y Gwerthiannau ar + gyfer y ddau fis a ddangosir. Caiff cyfrifiad o’r canlyniadau a + gynhyrchir ar gyfer yr ymholiad ei ddangos ar y sgrin yn ddiofyn. %p - There are options to generate the data displayed for download in another format, for example csv, note that the results will be limited to the same number of results displayed on screen. + Ceir opsiynau i gynhyrchu’r data a ddangosir i’w lawrlwytho ar ffurf + arall, er enghraifft CSV, ond sylwer bydd y canlyniadau wedi eu cyfyngu + i’r un nifer o ganlyniadau a ddangosir ar y sgrin. %p - Similarly other areas can be queried. In the following example, figures for all of England and Wales are shown: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales", "/data/ukhpi/region/england-and-wales" + Yn yr un modd, gall ardaloedd eraill gael eu hymholi. Yn yr enghraifft + ganlynol, dangosir y ffigurau ar gyfer Cymru a Lloegr gyfan: +%pre.code + = link_to('/data/ukhpi/region/england-and-wales', 'https://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales') %p - The query can be extended to give specific months: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales/month/2014-01", "/data/ukhpi/region/england-and-wales/month/2014-01" + Gellir estyn yr ymholiad i roi misoedd penodol: +%pre.code + = link_to('/data/ukhpi/region/england-and-wales/month/2014-01', 'https://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales/month/2014-01') %p - It is also possible to select ranges and sort the data returned. The following example returns - figures for England and Wales where the monthly change is between 1% and 10%, sorted on the reporting period: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth", "/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth" - - + Mae hefyd modd dewis amrediadau a threfnu’r data a ddychwelwyd. Mae’r + enghraifft ganlynol yn dychwelyd ffigurau ar gyfer Cymru a Lloegr lle + mae’r newid misol rhwng 1% a 10%, wedi ei ddidoli yn ôl y cyfnod adrodd: +%pre.code + = link_to('/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth', 'https://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth') %p - It is possible to change the results displayed using the - %code customise your search - button at the top of the page and the filters on the page allow easy sorting or filtering of results. + Mae modd newid y canlyniadau a ddangosir trwy ddefnyddio’r botwm + %code addasu eich chwiliad + ar frig y dudalen ac mae’r hidlwyr ar y dudalen yn ei + gwneud yn hawdd ichi drefnu neu hidlo’r canlyniadau. diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml index 49ed3a06..491e456e 100644 --- a/app/views/doc/_about_ukhpi_en.html.haml +++ b/app/views/doc/_about_ukhpi_en.html.haml @@ -7,7 +7,7 @@ The UK House Price Index (UK HPI) captures changes in the value of residential properties. %p The UK HPI uses sales data collected on residential housing transactions, whether for cash or with a mortgage. Properties have been included: -%ul.list.list-bullet.list.list-bullet +%ul.list.list-bullet %li in England and Wales since January 1995, %li in Scotland since January 2004 and %li in Northern Ireland since January 2005. @@ -68,7 +68,7 @@ %h2.heading-medium How is the House Price Index Dataset published? %p The UK house price index dataset is available in several forms from the HM Land Registry: -%ul.list.list-bullet.list.list-bullet +%ul.list.list-bullet %li interactively, using the = link_to("/app/ukhpi", 'aria-label' => 'Explore the UK house price index') do @@ -86,7 +86,12 @@ %h2.heading-medium Linked Data Overview %p - Each month UK HPI data is updated for all of Great Britain, there is a monthly value for Northern Ireland data which is updated quarterly. The UK HPI data is converted into linked data form and this replaces the previous named graph in the triplestore, graphs are named UKHPI-yyyy-mm. This process runs alongside the normal publication of UK HPI data. Publication dates are available on the Publication timetable + Each month UK HPI data is updated for all of Great Britain, there is a monthly + value for Northern Ireland data which is updated quarterly. The UK HPI data is + converted into linked data form and this replaces the previous named graph in + the triplestore, graphs are named UKHPI-yyyy-mm. This process runs alongside the + normal publication of UK HPI data. Publication dates are available on the + Publication timetable. %h3.heading-small Vocabularies %p diff --git a/app/views/doc/ukhpi.html.haml b/app/views/doc/ukhpi.html.haml index a79ab72f..a6289061 100644 --- a/app/views/doc/ukhpi.html.haml +++ b/app/views/doc/ukhpi.html.haml @@ -1,184 +1 @@ -%h1 UK House Price Index Linked Data - -%h2 - What does the House Price Index Dataset consist of? - -%p - The UK House Price Index (UK HPI) captures changes in the value of residential properties. -%p - The UK HPI uses sales data collected on residential housing transactions, whether for cash or with a mortgage. Properties have been included: -%ul.list.list-bullet - %li in England and Wales since January 1995, - %li in Scotland since January 2004 and - %li in Northern Ireland since January 2005. - -%p - Data is available at a national and regional level, as well as counties, local authorities and London boroughs - -%p - The UK HPI dataset contains information on more than 441 areas in England, Scotland, Northern Ireland and Wales. - Please note that we do not publish HPI information for The Isles of Scilly due to its low monthly sales volumes. -%p - For each area we publish a UK - %em House Price Index - figure. This was set at a base of 100 in January 2015, and reflects the change in - value of residential property since then. We also have figures for the average price of all properties in an area, - for each of four property types, sales volumes, and the percentage change from the previous month and year. - Please note that sales volume data is not available for the most-recent two months. - -%p - For more information on the UK HPI, including why some data is not available for recent months, - read about the UK HPI or use the direct links below: - -%ul - %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#calculating-the-uk-hpi' } - Calculating the UK HPI - %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#monthly-revision' } - Revisions to the UK HPI data - %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#the-difference-between-the-uk-hpi-and-others' } - The difference between the UK HPI and others - %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#searching-the-uk-house-price-index' } - Searching the UK House Price Index - %li - %a{ href: 'https://www.gov.uk/government/publications/about-the-uk-house-price-index/about-the-uk-house-price-index#uk-house-price-index-release-dates' } - Calendar release dates - -%p - In June 2016 the UK HPI linked data dataset contains approximately four million triples for 441 regions in - England, Scotland, Northern Ireland and Wales. The triple store is refreshed in each month with data - from the current month and a refresh of the previous two months. -%p - The linked data version of UK HPI dataset is generated from the published files and contains additional information to describe each of the reported regions, this information includes links to linked datasets published by the - = link_to "Ordnance Survey", "http://data.ordnancesurvey.co.uk/" - and the - = link_to "http://www.ons.gov.uk/" do - = succeed "." do - Office of National Statistics -%p - Please note that links to other sources of open, linked data are provided under the - = link_to "Open Government License", "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" - (ONS data) and - = link_to "Open Data License", "http://www.ordnancesurvey.co.uk/docs/licences/os-opendata-licence.pdf" - (OS data). HM Land Registry is not responsible for the content or reliability of any linked websites. - -%h2 How is the House Price Index Dataset published? -%p - The UK house price index dataset is available in several forms from the HM Land Registry: -%ul.list.list-bullet - %li - interactively, using the - = link_to("/app/ukhpi", 'aria-label' => 'Explore the UK house price index') do - = succeed "." do - Search the UK House Price Index tool - This tool also includes options to download the data in CSV or Turtle and to generate downloadable files from SPARQL queries in JSON, XML, plain text or as a table. - %li - for download in - = link_to "https://www.gov.uk/guidance/uk-house-price-index" do - = succeed "." do - CSV form or as an Excel Worksheet - -%p - The UK house price index dataset is also available in full as a 5* linked dataset which is free to use under the terms of the OGL. - -%h2 Linked Data Overview -%p - Each month UK HPI data is updated for all of Great Britain, there is a monthly value for Northern Ireland data which is updated quarterly. The UK HPI data is converted into linked data form and this replaces the previous named graph in the triplestore, graphs are named UKHPI-yyyy-mm. This process runs alongside the normal publication of UK HPI data. Publication dates are available on the Publication timetable - -%h3 Vocabularies -%p - The publication of the House Price Index Dataset as - %a{:href => "http://linkeddata.org/"} linked data - requires the creation of reusable - %a{:href => "http://www.w3.org/TR/rdf-schema/"} RDFS - or - %a{:href => "http://www.w3.org/TR/owl2-overview/"} OWL - vocabularies, one HM Land Registry vocabulary and two Ordnance Survey vocabularies. In addition, the data is - encoded as an - = succeed "." do - %a{:href => "http://www.w3.org/TR/vocab-data-cube/"} RDF data cube -%dl.list - %dt - Data Cube - %a{:href => "http://purl.org/linked-data/cube"} http://purl.org/linked-data/cube - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - A recommendation from the W3C for representing sets of multi-dimensional statistical data in RDF as a hypercube. - %dt - HM Land Registry HPI - %a{:href => "http://landregistry.data.gov.uk/def/hpi"} http://landregistry.data.gov.uk/def/hpi - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - The HM Land Registry HPI vocabulary is used to describe the House Price Index Dataset produced each month. The vocabulary contains terms that are used by Land Registry to describe things that are used within the House Price Index dataset. - %dt - OS Spatial Relations - %a{:href => "http://data.ordnancesurvey.co.uk/ontology/spatialrelations/"} http://landregistry.data.gov.uk/def/hpi - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - This Ordnance Survey vocabulary is used to describe basic spatial relations - %dt - OS Admingeo - %a{:href => "http://data.ordnancesurvey.co.uk/ontology/admingeo/"} http://data.ordnancesurvey.co.uk/ontology/admingeo/ - %dd{ style: "margin-left: 1.5em; margin-bottom: 0.5em"} - This Ordnance Survey vocabulary is used to describe the administrative and voting area geography of Great Britain. - -%h3 UKHPI Data -%p - UKHPI Data is stored as a named graph in a data cube with two dimensions and a variety of measures. - The - = link_to "Data Structure Definition (DSD)", controller: :doc, action: :ukhpi_dsd - file defines this structure, and can be used by both data users - and programs to understand how the data is structured. - -%h2 The UK House Price Index reporting tool -%p - The - = link_to("report tool", "/app/ukhpi", 'aria-label' => 'Explore the UK house price index') - is the easiest way to query the UKHouse Price Index dataset. It allows the easy creation of queries using a form and results can be downloaded in various forms. The report builder can also be used to generate SPARQL queries that can be amended and re-run as required. -%p - Please note that when choosing the CSV option for downloaded data then only the data items shown in the result on screen will be included in the CSV. For Turtle downloads all data items will be included as will the result from the SPARQL query if re-run. - -%h2 SPARQL -%p - Alongside the report builder we have created a - = link_to "SPARQL query page", "/app/qonsole" - that you can use to try out some example SPARQL queries or create your own. -%p - We also have made a SPARQL endpoint available. You can use the following URL address in - your own scripts, applications and SPARQL query tools: -%pre - http://landregistry.data.gov.uk/landregistry/query - -%h2 Via the API -%p - It is possible to query the UKHPI dataset directly through an - %em application programming interface (API). - This largely removes the need to know how to use SPARQL as long as the structure of the data is known. Using the example transaction above we know that there is data for the North east of England. With that information we can enter this URL into a web browser -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/north-east", "/data/ukhpi/region/north-east" - -%p - Note that this query will return all data for that region from the current month back to January 1995. Because HM Land Registry do not publish Sales Volumes with the same frequency as other data there will be no Sales Volume figure for the first two months displayed. By default a count of the results generated for the query is displayed on screen. -%p - There are options to generate the data displayed for download in another format, for example csv, note that the results will be limited to the same number of results displayed on screen. -%p - Similarly other areas can be queried. In the following example, figures for all of England and Wales are shown: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales", "/data/ukhpi/region/england-and-wales" - -%p - The query can be extended to give specific months: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales/month/2014-01", "/data/ukhpi/region/england-and-wales/month/2014-01" - -%p - It is also possible to select ranges and sort the data returned. The following example returns - figures for England and Wales where the monthly change is between 1% and 10%, sorted on the reporting period: -%pre - = link_to "http://landregistry.data.gov.uk/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth", "/data/ukhpi/region/england-and-wales?max-percentageChange=10&min-percentageChange=1&_page=0&_sort=refMonth" - - -%p - It is possible to change the results displayed using the - %code customise your search - button at the top of the page and the filters on the page allow easy sorting or filtering of results. += render partial: "about_ukhpi_#{@view_state.user_selections.language_slug}" diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml index a23d2c69..0d968763 100644 --- a/app/views/landing/_index_cy.html.haml +++ b/app/views/landing/_index_cy.html.haml @@ -14,17 +14,18 @@ %p O %span.c-headline-figure.c-headline-figure__period - = @view_state.period + = succeed ',' do + = @view_state.period %span.c-headline-figure.c-headline-figure__average-price = number_to_currency( @view_state.average_price, locale: "en-GB", precision: 0 ) yw pris tŷ cyfartalog yn y DU, ac mae’r mynegai yn sefyll ar %span.c-headline-figure.c-headline-figure__house-price-index = succeed "." do = @view_state.house_price_index - Mae prisiau eiddo wedi cwympo gan + Mae prisiau eiddo %span.c-headline-figure.c-headline-figure__monthly-change = @view_state.percentage_monthly_change - o’i gymharu â’r mis blaenorol, ac wedi codi gan + o’i gymharu â’r mis blaenorol, ac %span.c-headline-figure.c-headline-figure__annual-change = @view_state.percentage_annual_change o’i gymharu â’r flwyddyn flaenorol. diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml index ba764e87..a83a0c17 100644 --- a/app/views/landing/_index_en.html.haml +++ b/app/views/landing/_index_en.html.haml @@ -15,7 +15,8 @@ %p As of %span.c-headline-figure.c-headline-figure__period - = @view_state.period + = succeed ',' do + = @view_state.period the average house price in the UK is %span.c-headline-figure.c-headline-figure__average-price = succeed "," do diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 0aec6e9b..f2ba06db 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -21,10 +21,11 @@ window.isIE8 = true; %body.government.website.hmlr + = render partial: 'common/skip_to_main_content' = render partial: 'common/header' = render partial: 'common/flash_message' - %main.container.o-container + %main#main-content.container.o-container .row .col-md-12 = yield diff --git a/app/views/layouts/webpack_application.html.haml b/app/views/layouts/webpack_application.html.haml index ce425372..57d4a430 100644 --- a/app/views/layouts/webpack_application.html.haml +++ b/app/views/layouts/webpack_application.html.haml @@ -34,10 +34,11 @@ = javascript_pack_tag 'ukhpi_vue' %body.government.website.lr + = render partial: 'common/skip_to_main_content' = render partial: 'common/header' = render partial: 'common/flash_message' - %main.container.o-container + %main#main-content.container.o-container = yield = render partial: 'common/footer' diff --git a/config/environments/development.rb b/config/environments/development.rb index 409c25e6..2a6afd81 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -43,4 +43,9 @@ # API location can be specified in the environment # But defaults to the dev service config.api_service_url = ENV['API_SERVICE_URL'] || 'http://localhost:8080/dsapi' + + # feature flag for showing the Welsh language switch affordance + config.welsh_language_enabled = true + + config.accessibility_document_path = '/doc/accessibility' end diff --git a/config/environments/production.rb b/config/environments/production.rb index 5b9b18db..8a059cc7 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -81,7 +81,7 @@ config.action_view.logger = nil if ENV['RAILS_LOG_TO_STDOUT'].present? - logger = ActiveSupport::Logger.new(STDOUT) + logger = ActiveSupport::Logger.new($stdout) logger.formatter = config.log_formatter config.logger = ActiveSupport::TaggedLogging.new(logger) end @@ -91,4 +91,9 @@ # API location can be specified in the environment # But defaults to the dev service config.api_service_url = ENV['API_SERVICE_URL'] || 'http://localhost:8080/dsapi' + + # feature flag for showing the Welsh language switch affordance + config.welsh_language_enabled = ENV['DEPLOYMENT_ENVIRONMENT'] == 'dev' + + config.accessibility_document_path = '/accessibility' end diff --git a/config/environments/test.rb b/config/environments/test.rb index e6f83c4d..2ac42cea 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -45,4 +45,9 @@ # API location can be specified in the environment # But defaults to the dev service config.api_service_url = ENV['API_SERVICE_URL'] || 'http://localhost:8080/dsapi' + + # feature flag for showing the Welsh language switch affordance + config.welsh_language_enabled = true + + config.accessibility_document_path = '/doc/accessibility' end diff --git a/config/locales/cy.yml b/config/locales/cy.yml index e17ecb2c..b64fc1b4 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -12,8 +12,10 @@ cy: personal_info_url: "//www.gov.uk/government/organisations/land-registry/about/personal-information-charter.cy" public_data: "Data Cyhoeddus Cofrestrfa Tir EM" ogl: "Trwydded Llywodraeth Agored" - ogl_statement: "Mae’r holl gynnwys ar gael o dan Drwydded Llywodraeth Agored fersiwn 3.0 oni nodir fel arall" + ogl_url: "https://www.nationalarchives.gov.uk/doc/open-government-licence-cymraeg/version/3/" + ogl_statement: "Mae’r holl gynnwys ar gael o dan Drwydded Llywodraeth Agored fersiwn 3.0 oni nodir fel arall" application_release: "Cyhoeddiad ap" + accessibility: "Hygyrchedd" browse: show: @@ -69,7 +71,7 @@ cy: search_results: "Canlyniadau chwilio:" print: - locations_summary: "#{n_locations} lleoliad" + locations_summary: "%{n_locations} lleoliad" unavailable: "Mae’n flin gennym, nid yw #{indicator_name} ar gael ar gyfer #{statistic_name}." date: "Dyddiad" quarterly: "chwarterol" @@ -141,16 +143,18 @@ cy: show_result: "dangos canlyniad" compare: "cymharu" update_comparison: "diweddaru cymhariaeth" + add_location: "ychwanegu lleoliad" + remove: "dileu" connective: and: "a" landing: change: - risen: "[cy] risen by" - fallen: "[cy] fallen by" - same: "[cy] remained the same" - not_available: "[cy] Latest period not available" + risen: "wedi codi gan" + fallen: "wedi gostwng gan" + same: "yn parhau yr un fath" + not_available: "Y cyfnod diweddaraf ddim ar gael" js: action: @@ -170,7 +174,7 @@ cy: location: results: "Canlyniadau chwilio" - many_results: "... a ${manyResults} arall" + many_results: "... a %{manyResults} arall" show_on_map: "Dangos ar fap:" type_countries: "Gwledydd" type_las: "Awdurdodau lleol" @@ -179,6 +183,11 @@ cy: default_title: "Dewiswch ranbarth neu leoliad gwahanol" default_prompt: "I weld ystadegau Mynegai Prisiau Tai y DU ar gyfer rhan wahanol o’r DU, chwiliwch am y lleoliad newydd yn ôl enw, neu cliciwch ar leoliad ar y map." search_locations_label: "Lleoliadau chwilio:" + type: + la: 'awdurdod lleol' + county: 'sir' + country: 'wlad' + region: 'rhanbarth' data_table: date: "Dyddiad" @@ -201,7 +210,7 @@ cy: dates_to: "hyd at" validation_dates: "Rhaid i’r dyddiad dechrau fod yn gynharach na’r dyddiad diwedd" for_locations: "Ar gyfer lleoliadau:" - title: "Cymharu %{indLabel} o %{statLabel} ar gyfer %{locLabel}" + title: "Cymharu %{indLabel} %{statLabel} ar gyfer %{locLabel}" zero_locations: "dim lleoliadau" one_locations: "un lleoliad" two_locations: "dau leoliad" diff --git a/config/locales/en.yml b/config/locales/en.yml index f8925443..0101002c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -12,8 +12,10 @@ en: personal_info_url: "https://www.gov.uk/government/organisations/land-registry/about/personal-information-charter" public_data: "HM Land Registry Public Data" ogl: "Open Government Licence" + ogl_url: "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" ogl_statement: "All content is available under the Open Government Licence v3.0 except where otherwise stated" application_release: "Application release" + accessibility: "Accessibility" browse: show: @@ -69,7 +71,7 @@ en: search_results: "Search results:" print: - locations_summary: "#{n_locations} locations" + locations_summary: "%{n_locations} locations" unavailable: "We're sorry, #{indicator_name} is not available for #{statistic_name}." date: "Date" quarterly: "quarterly" @@ -141,6 +143,8 @@ en: show_result: "show result" compare: "compare" update_comparison: "update comparison" + add_location: "add location" + remove: "remove" connective: and: "and" @@ -170,7 +174,7 @@ en: location: results: "Search results" - many_results: "... plus ${manyResults} more." + many_results: "... plus %{manyResults} more." show_on_map: "Show on map:" type_countries: "Countries" type_las: "Local authorities" @@ -179,6 +183,11 @@ en: default_title: "Choose a different region or location" default_prompt: "To see UKHPI statistics for a different part of the UK, search for the new location by name, or click a location on the map." search_locations_label: "Search locations:" + type: + la: 'local authority' + county: 'county' + country: 'country' + region: 'region' data_table: date: "Date" diff --git a/lib/tasks/ds_api.rake b/lib/tasks/ds_api.rake index 47c08123..a306c448 100644 --- a/lib/tasks/ds_api.rake +++ b/lib/tasks/ds_api.rake @@ -5,9 +5,9 @@ namespace :ukhpi do desc 'Create the DSAPI config file from the current DSD' task dsapi_config: :environment do ukhpi_data_cube = UkhpiDataCube.new - FILENAME = 'config/dsapi/ukhpi.ttl' + filename = 'config/dsapi/ukhpi.ttl' - File.open(FILENAME, 'w') do |file| + File.open(filename, 'w') do |file| file << <<~PREFIXES @prefix owl: . @prefix rdf: . diff --git a/lib/tasks/location.rake b/lib/tasks/location.rake index 2ce23bd8..4f558b30 100644 --- a/lib/tasks/location.rake +++ b/lib/tasks/location.rake @@ -291,7 +291,7 @@ namespace :ukhpi do uri = args[:uri] query = "describe <#{uri}>" - squery = (ENV['FUSEKI'] || '/home/ian/dev/java/jena-fuseki') + '/bin/s-query' + squery = "#{(ENV['FUSEKI'] || '/home/ian/dev/java/jena-fuseki')}/bin/s-query" server = ENV['SERVER'] || 'http://lr-data-dev-c.epimorphics.net/landregistry/query' puts 'Running SPARQL query ...' diff --git a/test/lib/welsh_grammar_test.rb b/test/lib/welsh_grammar_test.rb index 749e0e65..4c3db067 100644 --- a/test/lib/welsh_grammar_test.rb +++ b/test/lib/welsh_grammar_test.rb @@ -17,25 +17,86 @@ class WelshGrammarTest < ActiveSupport::TestCase it 'make no changes if language is not Welsh' do _( WelshGrammar - .mutate(source: 'Ionawr', assuming_prefix: 'o') + .apply(source: 'Ionawr', assuming_prefix: 'o') .result ).must_equal('Ionawr') end - it 'should mutate months that are prefix by "O" if necessary' do + it 'should mutate months that are prefix by "o" if necessary' do I18n.locale = :cy - _( - WelshGrammar - .mutate(source: 'Ionawr', assuming_prefix: 'o') - .result - ).must_equal('Ionawr') + result = WelshGrammar.mutate(source: 'Ionawr', assuming_prefix: 'o') + _(result.result).must_equal('Ionawr') - _( - WelshGrammar - .mutate(source: 'Mai', assuming_prefix: 'o') - .result - ).must_equal('Fai') + result = WelshGrammar.mutate(source: 'Mai', assuming_prefix: 'o') + _(result.result).must_equal('Fai') + end + + it 'should mutate a placenmame with an assumed prefix' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'Gwynedd', assuming_prefix: 'yn') + _(result.result).must_equal('Ngwynedd') + _(result.prefix).must_equal('yng') + end + + it 'should mutate if the prefix is "yn"' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'yn Bxxyy', prefix: 'yn') + _(result.result).must_equal('ym Mxxyy') + + result = WelshGrammar.mutate(source: 'some text yn Bxxyy', prefix: 'yn') + _(result.result).must_equal('some text ym Mxxyy') + + result = WelshGrammar.mutate(source: 'yn Cxxyy', prefix: 'yn') + _(result.result).must_equal('yng Nghxxyy') + + result = WelshGrammar.mutate(source: 'some text yn Cxxyy', prefix: 'yn') + _(result.result).must_equal('some text yng Nghxxyy') + end + + it 'should mutate if the prefix is "o"' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'o Mxxyy', prefix: 'o') + _(result.result).must_equal('o Fxxyy') + result = WelshGrammar.mutate(source: 'some text o Mxxyy', prefix: 'o') + _(result.result).must_equal('some text o Fxxyy') + result = WelshGrammar.mutate(source: 'some text o Gxxyy', prefix: 'o') + _(result.result).must_equal('some text o Xxyy') + end + + it 'should mutate if the prefix is "i"' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'i Rhxxyy', prefix: 'i') + _(result.result).must_equal('i Rxxyy') + result = WelshGrammar.mutate(source: 'some text i Mxxyy', prefix: 'i') + _(result.result).must_equal('some text i Fxxyy') + result = WelshGrammar.mutate(source: 'some text i llxxyy', prefix: 'i') + _(result.result).must_equal('some text i xxyy') + end + + it 'should preserve the case of the mutated value' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'yn Dxxyy', prefix: 'yn') + _(result.result).must_equal('yn Nxxyy') + result = WelshGrammar.mutate(source: 'yn dxxyy', prefix: 'yn') + _(result.result).must_equal('yn nxxyy') + end + + it 'should mutate correctly if there are spaces in the name' do + I18n.locale = :cy + + result = WelshGrammar.mutate(source: 'Gorllewin Berkshire', assuming_prefix: 'yn') + _(result.prefix).must_equal('yng') + _(result.result).must_equal('Ngorllewin Berkshire') + + result = WelshGrammar.mutate(source: 'yn Gorllewin Berkshire', prefix: 'yn') + _(result.prefix).must_equal('yng') + _(result.result).must_equal('yng Ngorllewin Berkshire') end end end diff --git a/yarn.lock b/yarn.lock index f32405c0..d656b0a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,45 +9,44 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.4.tgz#706a6484ee6f910b719b696a9194f8da7d7ac241" - integrity sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw== +"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c" + integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ== dependencies: browserslist "^4.12.0" invariant "^2.2.4" semver "^5.5.0" "@babel/core@^7.7.2": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.4.tgz#780e8b83e496152f8dd7df63892b2e052bf1d51d" - integrity sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA== + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651" + integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.4" - "@babel/helper-module-transforms" "^7.10.4" + "@babel/generator" "^7.11.6" + "@babel/helper-module-transforms" "^7.11.0" "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.10.4" + "@babel/parser" "^7.11.5" "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/traverse" "^7.11.5" + "@babel/types" "^7.11.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" - lodash "^4.17.13" + lodash "^4.17.19" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243" - integrity sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng== +"@babel/generator@^7.11.5", "@babel/generator@^7.11.6": + version "7.11.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620" + integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.5" jsesc "^2.5.1" - lodash "^4.17.13" source-map "^0.5.0" "@babel/helper-annotate-as-pure@^7.10.4": @@ -77,12 +76,12 @@ semver "^5.5.0" "@babel/helper-create-class-features-plugin@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz#2d4015d0136bd314103a70d84a7183e4b344a355" - integrity sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d" + integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A== dependencies: "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.10.4" + "@babel/helper-member-expression-to-functions" "^7.10.5" "@babel/helper-optimise-call-expression" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-replace-supers" "^7.10.4" @@ -98,20 +97,19 @@ regexpu-core "^4.7.0" "@babel/helper-define-map@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz#f037ad794264f729eda1889f4ee210b870999092" - integrity sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" + integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== dependencies: "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.4" - lodash "^4.17.13" + "@babel/types" "^7.10.5" + lodash "^4.17.19" "@babel/helper-explode-assignable-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c" - integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A== + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b" + integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ== dependencies: - "@babel/traverse" "^7.10.4" "@babel/types" "^7.10.4" "@babel/helper-function-name@^7.10.4": @@ -137,12 +135,12 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-member-expression-to-functions@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz#7cd04b57dfcf82fce9aeae7d4e4452fa31b8c7c4" - integrity sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A== +"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df" + integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" "@babel/helper-module-imports@^7.10.4": version "7.10.4" @@ -151,18 +149,18 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-module-transforms@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz#ca1f01fdb84e48c24d7506bb818c961f1da8805d" - integrity sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q== +"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359" + integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-replace-supers" "^7.10.4" "@babel/helper-simple-access" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" - lodash "^4.17.13" + "@babel/types" "^7.11.0" + lodash "^4.17.19" "@babel/helper-optimise-call-expression@^7.10.4": version "7.10.4" @@ -171,27 +169,26 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== "@babel/helper-regex@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.4.tgz#59b373daaf3458e5747dece71bbaf45f9676af6d" - integrity sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" + integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg== dependencies: - lodash "^4.17.13" + lodash "^4.17.19" "@babel/helper-remap-async-to-generator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5" - integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg== + version "7.11.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d" + integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-wrap-function" "^7.10.4" "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" "@babel/types" "^7.10.4" "@babel/helper-replace-supers@^7.10.4": @@ -212,12 +209,19 @@ "@babel/template" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/helper-split-export-declaration@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1" - integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg== +"@babel/helper-skip-transparent-expression-wrappers@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729" + integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.0" + +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" "@babel/helper-validator-identifier@^7.10.4": version "7.10.4" @@ -252,15 +256,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.4", "@babel/parser@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64" - integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA== +"@babel/parser@^7.10.4", "@babel/parser@^7.11.5", "@babel/parser@^7.7.0": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037" + integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q== "@babel/plugin-proposal-async-generator-functions@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6" - integrity sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558" + integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.10.4" @@ -282,6 +286,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" +"@babel/plugin-proposal-export-namespace-from@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54" + integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-proposal-json-strings@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db" @@ -290,6 +302,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" +"@babel/plugin-proposal-logical-assignment-operators@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8" + integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" @@ -306,10 +326,10 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== +"@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af" + integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -323,12 +343,13 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7" - integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ== +"@babel/plugin-proposal-optional-chaining@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076" + integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.10.4": @@ -368,6 +389,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-json-strings@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" @@ -375,6 +403,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" @@ -441,12 +476,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-block-scoping@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz#a670d1364bb5019a621b9ea2001482876d734787" - integrity sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215" + integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew== dependencies: "@babel/helper-plugin-utils" "^7.10.4" - lodash "^4.17.13" "@babel/plugin-transform-classes@^7.10.4": version "7.10.4" @@ -529,11 +563,11 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-modules-amd@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz#cb407c68b862e4c1d13a2fc738c7ec5ed75fc520" - integrity sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1" + integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw== dependencies: - "@babel/helper-module-transforms" "^7.10.4" + "@babel/helper-module-transforms" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" @@ -548,12 +582,12 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz#8f576afd943ac2f789b35ded0a6312f929c633f9" - integrity sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85" + integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw== dependencies: "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.10.4" + "@babel/helper-module-transforms" "^7.10.5" "@babel/helper-plugin-utils" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" @@ -588,9 +622,9 @@ "@babel/helper-replace-supers" "^7.10.4" "@babel/plugin-transform-parameters@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz#7b4d137c87ea7adc2a0f3ebf53266871daa6fced" - integrity sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a" + integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw== dependencies: "@babel/helper-get-function-arity" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -617,9 +651,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-runtime@^7.6.2": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7" - integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw== + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz#f108bc8e0cf33c37da031c097d1df470b3a293fc" + integrity sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -633,12 +667,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-spread@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff" - integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ== +"@babel/plugin-transform-spread@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc" + integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0" "@babel/plugin-transform-sticky-regex@^7.10.4": version "7.10.4" @@ -649,9 +684,9 @@ "@babel/helper-regex" "^7.10.4" "@babel/plugin-transform-template-literals@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz#e6375407b30fcb7fcfdbba3bb98ef3e9d36df7bc" - integrity sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ== + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c" + integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw== dependencies: "@babel/helper-annotate-as-pure" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -679,29 +714,33 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/preset-env@^7.10.3", "@babel/preset-env@^7.7.1": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" - integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz#18cb4b9379e3e92ffea92c07471a99a2914e4272" + integrity sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA== dependencies: - "@babel/compat-data" "^7.10.4" + "@babel/compat-data" "^7.11.0" "@babel/helper-compilation-targets" "^7.10.4" "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-async-generator-functions" "^7.10.4" "@babel/plugin-proposal-class-properties" "^7.10.4" "@babel/plugin-proposal-dynamic-import" "^7.10.4" + "@babel/plugin-proposal-export-namespace-from" "^7.10.4" "@babel/plugin-proposal-json-strings" "^7.10.4" + "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" "@babel/plugin-proposal-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.11.0" "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" - "@babel/plugin-proposal-optional-chaining" "^7.10.4" + "@babel/plugin-proposal-optional-chaining" "^7.11.0" "@babel/plugin-proposal-private-methods" "^7.10.4" "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-syntax-class-properties" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" @@ -734,14 +773,14 @@ "@babel/plugin-transform-regenerator" "^7.10.4" "@babel/plugin-transform-reserved-words" "^7.10.4" "@babel/plugin-transform-shorthand-properties" "^7.10.4" - "@babel/plugin-transform-spread" "^7.10.4" + "@babel/plugin-transform-spread" "^7.11.0" "@babel/plugin-transform-sticky-regex" "^7.10.4" "@babel/plugin-transform-template-literals" "^7.10.4" "@babel/plugin-transform-typeof-symbol" "^7.10.4" "@babel/plugin-transform-unicode-escapes" "^7.10.4" "@babel/plugin-transform-unicode-regex" "^7.10.4" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.10.4" + "@babel/types" "^7.11.5" browserslist "^4.12.0" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -749,9 +788,9 @@ semver "^5.5.0" "@babel/preset-modules@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" - integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg== + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" @@ -760,9 +799,9 @@ esutils "^2.0.2" "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99" - integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw== + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== dependencies: regenerator-runtime "^0.13.4" @@ -775,28 +814,28 @@ "@babel/parser" "^7.10.4" "@babel/types" "^7.10.4" -"@babel/traverse@^7.10.4", "@babel/traverse@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.4.tgz#e642e5395a3b09cc95c8e74a27432b484b697818" - integrity sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q== +"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.7.0": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3" + integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.4" + "@babel/generator" "^7.11.5" "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.11.5" + "@babel/types" "^7.11.5" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.13" + lodash "^4.17.19" -"@babel/types@^7.10.4", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee" - integrity sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg== +"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.11.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d" + integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q== dependencies: "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.13" + lodash "^4.17.19" to-fast-properties "^2.0.0" "@csstools/convert-colors@^1.4.0": @@ -804,10 +843,17 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== +"@npmcli/move-file@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" + integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + dependencies: + mkdirp "^1.0.4" + "@rails/webpacker@^4.0.7": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.2.2.tgz#b9dd3235fdf4d0badbda8e33f6ebee742a9f3abb" - integrity sha512-jzw7qMfSCLdrt9j1X+2IvXjf63huXYqeIPwLujXa9pYFvxtEstbVYRDivuLhiDokzih+PrYpB+dLTGBNgVsnpw== + version "4.3.0" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-4.3.0.tgz#3793b3aed08ed0b661f1bed9de0739abacb6a834" + integrity sha512-DmKGjKugLeeytT1TO9fUBBjdA3YwQ19zoWK5JDL8V1rM0bf6WRf1n9DZTiVmuf0WO1gp5ej5pJ9b3NjZwfAz4Q== dependencies: "@babel/core" "^7.7.2" "@babel/plugin-proposal-class-properties" "^7.7.0" @@ -822,7 +868,7 @@ babel-plugin-dynamic-import-node "^2.3.0" babel-plugin-macros "^2.6.1" case-sensitive-paths-webpack-plugin "^2.2.0" - compression-webpack-plugin "^3.0.0" + compression-webpack-plugin "^4.0.0" core-js "^3.4.0" css-loader "^3.2.0" file-loader "^4.2.0" @@ -849,64 +895,65 @@ webpack-sources "^1.4.3" "@sentry/browser@^5.6.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.19.0.tgz#9189b6633fe45e54325e40b39345d9eabd171e4a" - integrity sha512-Cz8PnzC5NGfpHIGCmHLgA6iDEBVELwo4Il/iFweXjs4+VL4biw62lI32Q4iLCCpmX0t5UvrWBOnju2v8zuFIjA== + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.24.2.tgz#e2c2786dbf07699ee12f12babf0138d633abc494" + integrity sha512-P/uZC/VrLRpU7MVEJnlZK5+AkEmuHu+mns5gC91Z4gjn7GamjR/CaXVedHGw/15ZrsQiAiwoWwuxpv4Ypd/+SA== dependencies: - "@sentry/core" "5.19.0" - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/core" "5.24.2" + "@sentry/types" "5.24.2" + "@sentry/utils" "5.24.2" tslib "^1.9.3" -"@sentry/core@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.19.0.tgz#31b08a0b46ae1ee6863447225b401ac2a777774c" - integrity sha512-ry1Zms6jrVQPEwmfywItyUhOgabPrykd8stR1x/u2t1YiISWlR813fE5nzdwgW5mxEitXz/ikTwvrfK3egsDWQ== +"@sentry/core@5.24.2": + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.24.2.tgz#1724652855c0887a690c3fc6acd2519d4072b511" + integrity sha512-nuAwCGU1l9hgMinl5P/8nIQGRXDP2FI9cJnq5h1qiP/XIOvJkJz2yzBR6nTyqr4vBth0tvxQJbIpDNGd7vHJLg== dependencies: - "@sentry/hub" "5.19.0" - "@sentry/minimal" "5.19.0" - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/hub" "5.24.2" + "@sentry/minimal" "5.24.2" + "@sentry/types" "5.24.2" + "@sentry/utils" "5.24.2" tslib "^1.9.3" -"@sentry/hub@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.19.0.tgz#f38e7745a4980d9fa6c5baeca5605e7e6fecd5ac" - integrity sha512-UFaQLa1XAa02ZcxUmN9GdDpGs3vHK1LpOyYooimX8ttWa4KAkMuP+O5uXH1TJabry6o/cRwYisg2k6PBSy8gxw== +"@sentry/hub@5.24.2": + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.24.2.tgz#64a02fd487599945e488ae23aba4ce4df44ee79e" + integrity sha512-xmO1Ivvpb5Qr9WgekinuZZlpl9Iw7iPETUe84HQOhUrXf+2gKO+LaUYMMsYSVDwXQEmR6/tTMyOtS6iavldC6w== dependencies: - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/types" "5.24.2" + "@sentry/utils" "5.24.2" tslib "^1.9.3" "@sentry/integrations@^5.6.1": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.19.0.tgz#2efe8eaa8d1c26ba92f99af941c9dd922efbb94e" - integrity sha512-vCmej1zfumVRKnxKw0RlwVjZ/TWBJZTAWIzqoAxXZyo67bKRy3fP408nj0QL5QAWKw+sUelqvzNqvY94cy+b0w== + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.24.2.tgz#cfb14c64465d6acbb279994b8a87a8ef72776320" + integrity sha512-b0upZS+xvONwxkLL6apSSgseR1e6dtq7wAGHefnPa5ckTwIoUkboL/dqiTNmFj1xXnWb87WDX1ZcIx7nfEqw6A== dependencies: - "@sentry/types" "5.19.0" - "@sentry/utils" "5.19.0" + "@sentry/types" "5.24.2" + "@sentry/utils" "5.24.2" + localforage "1.8.1" tslib "^1.9.3" -"@sentry/minimal@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.19.0.tgz#aa5a700618608ea79d270280fe77f04bbb44ed5a" - integrity sha512-3FHgirwOuOMF4VlwHboYObPT9c0S9b9y5FW0DGgNt8sJPezS00VaJti/38ZwOHQJ4fJ6ubt/Y3Kz0eBTVxMCCQ== +"@sentry/minimal@5.24.2": + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.24.2.tgz#14e8b136842398a32987459f0574359b6dc57a1f" + integrity sha512-biFpux5bI3R8xiD/Zzvrk1kRE6bqPtfWXmZYAHRtaUMCAibprTKSY9Ta8QYHynOAEoJ5Akedy6HUsEkK5DoZfA== dependencies: - "@sentry/hub" "5.19.0" - "@sentry/types" "5.19.0" + "@sentry/hub" "5.24.2" + "@sentry/types" "5.24.2" tslib "^1.9.3" -"@sentry/types@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.0.tgz#30c6a05040b644d90337ef8b50d9d59c0872744d" - integrity sha512-NlHLS9mwCEimKUA5vClAwVhXFLsqSF3VJEXU+K61fF6NZx8zfJi/HTrIBtoM4iNSAt9o4XLQatC1liIpBC06tg== +"@sentry/types@5.24.2": + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.24.2.tgz#e2c25d1e75d8dbec5dbbd9a309a321425b61c2ca" + integrity sha512-HcOK00R0tQG5vzrIrqQ0jC28+z76jWSgQCzXiessJ5SH/9uc6NzdO7sR7K8vqMP2+nweCHckFohC8G0T1DLzuQ== -"@sentry/utils@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.0.tgz#0e01f84aa67a1cf2ec71faab670230918ea7e9aa" - integrity sha512-EU/T9aJrI8isexRnyDx5InNw/HjSQ0nKI7YWdiwfFrJusqQ/uisnCGK7vw6gGHDgiAHMXW3TJ38NHpNBin6y7Q== +"@sentry/utils@5.24.2": + version "5.24.2" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.24.2.tgz#90b7dff939bbbf4bb8edcac6aac2d04a0552af80" + integrity sha512-oPGde4tNEDHKk0Cg9q2p0qX649jLDUOwzJXHKpd0X65w3A6eJByDevMr8CSzKV9sesjrUpxqAv6f9WWlz185tA== dependencies: - "@sentry/types" "5.19.0" + "@sentry/types" "5.24.2" tslib "^1.9.3" "@types/color-name@^1.1.1": @@ -915,17 +962,17 @@ integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/glob@^7.1.1": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987" - integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA== + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== dependencies: "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@^7.0.4": - version "7.0.5" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" - integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== "@types/json5@^0.0.29": version "0.0.29" @@ -938,9 +985,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.0.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce" - integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ== + version "14.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" + integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -953,9 +1000,9 @@ integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== "@vue/component-compiler-utils@^3.1.0": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz#8213a5ff3202f9f2137fe55370f9e8b9656081c3" - integrity sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz#8f85182ceed28e9b3c75313de669f83166d11e5d" + integrity sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -1137,9 +1184,9 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: negotiator "0.6.2" acorn-jsx@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" - integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== acorn@^6.4.1: version "6.4.1" @@ -1147,14 +1194,14 @@ acorn@^6.4.1: integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" - integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== aggregate-error@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== dependencies: clean-stack "^2.0.0" indent-string "^4.0.0" @@ -1164,15 +1211,15 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.0.tgz#5c894537098785926d71e696114a53ce768ed773" - integrity sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw== +ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5: - version "6.12.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" - integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -1351,14 +1398,15 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== dependencies: bn.js "^4.0.0" inherits "^2.0.1" minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" asn1@~0.2.3: version "0.2.4" @@ -1430,13 +1478,13 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.6.1: - version "9.8.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.4.tgz#736f1012673a70fa3464671d78d41abd54512863" - integrity sha512-84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A== + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== dependencies: browserslist "^4.12.0" - caniuse-lite "^1.0.30001087" - colorette "^1.2.0" + caniuse-lite "^1.0.30001109" + colorette "^1.2.1" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.32" @@ -1448,9 +1496,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" - integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" + integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== axios@^0.19.2: version "0.19.2" @@ -1586,9 +1634,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== bn.js@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" - integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== + version "5.1.3" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" + integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== body-parser@1.19.0: version "1.19.0" @@ -1699,15 +1747,15 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11" - integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA== + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== dependencies: bn.js "^5.1.1" browserify-rsa "^4.0.1" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.2" + elliptic "^6.5.3" inherits "^2.0.4" parse-asn1 "^5.1.5" readable-stream "^3.6.0" @@ -1721,14 +1769,14 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.5: - version "4.13.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d" - integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ== + version "4.14.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015" + integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA== dependencies: - caniuse-lite "^1.0.30001093" - electron-to-chromium "^1.3.488" - escalade "^3.0.1" - node-releases "^1.1.58" + caniuse-lite "^1.0.30001135" + electron-to-chromium "^1.3.571" + escalade "^3.1.0" + node-releases "^1.1.61" buffer-from@^1.0.0: version "1.1.1" @@ -1814,6 +1862,29 @@ cacache@^13.0.1: ssri "^7.0.0" unique-filename "^1.1.1" +cacache@^15.0.5: + version "15.0.5" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" + integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== + dependencies: + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.0" + tar "^6.0.2" + unique-filename "^1.1.1" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -1881,10 +1952,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001087, caniuse-lite@^1.0.30001093: - version "1.0.30001094" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001094.tgz#0b11d02e1cdc201348dbd8e3e57bd9b6ce82b175" - integrity sha512-ufHZNtMaDEuRBpTbqD93tIQnngmJ+oBknjvr0IbFympSdtFpAUFmNv4mVKbb53qltxFx0nK3iy32S9AqkLzUNA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135: + version "1.0.30001137" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz#6f0127b1d3788742561a25af3607a17fc778b803" + integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw== case-sensitive-paths-webpack-plugin@^2.2.0: version "2.3.0" @@ -1948,10 +2019,10 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" - integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ== +chokidar@^3.4.1: + version "3.4.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" + integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -1968,6 +2039,11 @@ chownr@^1.1.1, chownr@^1.1.2: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -2090,7 +2166,7 @@ color@^3.0.0: color-convert "^1.9.1" color-string "^1.5.2" -colorette@^1.2.0: +colorette@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== @@ -2124,17 +2200,16 @@ compressible@~2.0.16: dependencies: mime-db ">= 1.43.0 < 2" -compression-webpack-plugin@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.1.0.tgz#9f510172a7b5fae5aad3b670652e8bd7997aeeca" - integrity sha512-iqTHj3rADN4yHwXMBrQa/xrncex/uEQy8QHlaTKxGchT/hC0SdlJlmL/5eRqffmWq2ep0/Romw6Ld39JjTR/ug== +compression-webpack-plugin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-4.0.1.tgz#33eda97f1170dd38c5556771de10f34245aa0274" + integrity sha512-0mg6PgwTsUe5LEcUrOu3ob32vraDx2VdbMGAT1PARcOV+UJWDYZFdkSo6RbHoGQ061mmmkC7XpRKOlvwm/gzJQ== dependencies: - cacache "^13.0.1" - find-cache-dir "^3.0.0" - neo-async "^2.5.0" - schema-utils "^2.6.1" - serialize-javascript "^2.1.2" - webpack-sources "^1.0.1" + cacache "^15.0.5" + find-cache-dir "^3.3.1" + schema-utils "^2.7.0" + serialize-javascript "^4.0.0" + webpack-sources "^1.4.3" compression@^1.7.4: version "1.7.4" @@ -2287,12 +2362,12 @@ cosmiconfig@^6.0.0: yaml "^1.7.2" create-ecdh@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" - integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== dependencies: bn.js "^4.1.0" - elliptic "^6.0.0" + elliptic "^6.5.3" create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" @@ -2545,10 +2620,10 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -"d3-array@1.2.0 - 2", d3-array@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.4.0.tgz#87f8b9ad11088769c82b5ea846bcb1cc9393f242" - integrity sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw== +d3-array@^2.3.0, d3-array@^2.4.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.8.0.tgz#f76e10ad47f1f4f75f33db5fc322eb9ffde5ef23" + integrity sha512-6V272gsOeg7+9pTW1jSYOR1QE37g95I3my1hBmY+vOUNHRrk9yt4OTz/gK7PMkVAVDrYYq4mq3grTiZ8iJdNIw== d3-axis@^1.0.8: version "1.0.12" @@ -2560,12 +2635,29 @@ d3-color@1: resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== -d3-format@1, d3-format@^1.2.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.4.tgz#356925f28d0fd7c7983bfad593726fce46844030" - integrity sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw== +"d3-color@1 - 2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" + integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== + +"d3-format@1 - 2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767" + integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA== + +d3-format@^1.2.0: + version "1.4.5" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" + integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== + +"d3-interpolate@1.2.0 - 2": + version "2.0.1" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163" + integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ== + dependencies: + d3-color "1 - 2" -d3-interpolate@^1.1.6, d3-interpolate@^1.2.0: +d3-interpolate@^1.1.6: version "1.4.0" resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== @@ -2578,20 +2670,20 @@ d3-path@1: integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== d3-scale@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.1.tgz#da1684adce7261b4bc7a76fe193d887f0e909e69" - integrity sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA== + version "3.2.3" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.3.tgz#be380f57f1f61d4ff2e6cbb65a40593a51649cfd" + integrity sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g== dependencies: - d3-array "1.2.0 - 2" - d3-format "1" - d3-interpolate "^1.2.0" - d3-time "1" - d3-time-format "2" + d3-array "^2.3.0" + d3-format "1 - 2" + d3-interpolate "1.2.0 - 2" + d3-time "1 - 2" + d3-time-format "2 - 3" d3-selection@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98" - integrity sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" + integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== d3-shape@^1.2.0: version "1.3.7" @@ -2600,10 +2692,17 @@ d3-shape@^1.2.0: dependencies: d3-path "1" -d3-time-format@2, d3-time-format@^2.0.5: - version "2.2.3" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb" - integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA== +"d3-time-format@2 - 3": + version "3.0.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6" + integrity sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag== + dependencies: + d3-time "1 - 2" + +d3-time-format@^2.0.5: + version "2.3.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" + integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== dependencies: d3-time "1" @@ -2612,6 +2711,11 @@ d3-time@1, d3-time@^1.0.7: resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== +"d3-time@1 - 2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.0.0.tgz#ad7c127d17c67bd57a4c61f3eaecb81108b1e0ab" + integrity sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q== + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2646,11 +2750,11 @@ debug@^3.1.1, debug@^3.2.5: ms "^2.1.1" debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== dependencies: - ms "^2.1.1" + ms "2.1.2" decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" @@ -2692,7 +2796,7 @@ default-gateway@^4.2.0: execa "^1.0.0" ip-regex "^2.1.0" -define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -2835,9 +2939,9 @@ domelementtype@1, domelementtype@^1.3.1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d" - integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971" + integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA== domhandler@^2.3.0: version "2.4.2" @@ -2855,9 +2959,9 @@ domutils@^1.5.1, domutils@^1.7.0: domelementtype "1" dot-prop@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" - integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== dependencies: is-obj "^2.0.0" @@ -2884,10 +2988,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.488: - version "1.3.488" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.488.tgz#9226229f5fbc825959210e81e0bb3e63035d1c06" - integrity sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q== +electron-to-chromium@^1.3.571: + version "1.3.575" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.575.tgz#57065cfad7b977a817dba47b28e7eb4dbce3fc37" + integrity sha512-031VrjcilnE8bXivDGhEeuGjMZrjTAeyAKm3XWPY9SvGYE6Hn8003gCqoNszFu6lh1v0gDx5hrM0VE1cPSMUkQ== element-ui@^2.13.2: version "2.13.2" @@ -2901,7 +3005,7 @@ element-ui@^2.13.2: resize-observer-polyfill "^1.5.0" throttle-debounce "^1.0.1" -elliptic@^6.0.0, elliptic@^6.5.2: +elliptic@^6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== @@ -2941,10 +3045,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d" - integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ== +enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" + integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" @@ -2991,6 +3095,24 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstrac string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" +es-abstract@^1.18.0-next.0: + version "1.18.0-next.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc" + integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.0" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -3000,10 +3122,10 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.1.tgz#52568a77443f6927cd0ab9c73129137533c965ed" - integrity sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA== +escalade@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e" + integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig== escape-html@~1.0.3: version "1.0.3" @@ -3020,7 +3142,7 @@ eslint-config-standard@^14.1.0: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea" integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg== -eslint-import-resolver-node@^0.3.3: +eslint-import-resolver-node@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== @@ -3052,16 +3174,16 @@ eslint-plugin-html@6.0.0: htmlparser2 "^3.10.1" eslint-plugin-import@^2.18.1: - version "2.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e" - integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg== + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== 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.3" + eslint-import-resolver-node "^0.3.4" eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" @@ -3101,11 +3223,11 @@ eslint-scope@^4.0.3: estraverse "^4.1.1" eslint-scope@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" eslint-utils@^1.4.3: @@ -3191,22 +3313,22 @@ esquery@^1.0.1: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== +esrecurse@^4.1.0, esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estraverse@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" - integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== esutils@^2.0.2: version "2.0.3" @@ -3219,14 +3341,14 @@ etag@~1.8.1: integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eventemitter3@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" - integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== eventsource@^1.0.7: version "1.0.7" @@ -3465,7 +3587,7 @@ find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: +find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== @@ -3547,11 +3669,11 @@ focus-trap-vue@^0.0.6: integrity sha512-U6/Qt7kAUFHirurz1HqFMxtvjcQ397JZyShcDyRrmBLEkXu/q8sSKYtm2s+wWxO2ebE3HZySUBfc/iTfY4+UCQ== focus-trap@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.0.1.tgz#f90725e4bb62ddab16e685b02b43b823858a4c0a" - integrity sha512-BOksLMPK/jlXD389jYPlZHAqiDdy9W63EBQfVIouME8s3UZsCEmq3NA53qt30S4i72sRcDjc1FHtast0TmqhRA== + version "6.1.0" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.1.0.tgz#836a4851b389b71fe26d4dcdfb43d5c8d6f2bfc6" + integrity sha512-TQf1gJ5UgAY2ZMXrTDls6ah10kJmh35w/4COQHncLILwAK7hme4tiOwYnq2JOU88pqu1LoPqO9Yn7EbvmnzRRQ== dependencies: - tabbable "^5.0.0" + tabbable "^5.1.0" follow-redirects@1.5.10: version "1.5.10" @@ -3561,9 +3683,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.0.0: - version "1.12.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6" - integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg== + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== for-in@^1.0.2: version "1.0.2" @@ -3837,11 +3959,11 @@ har-schema@^2.0.0: integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== dependencies: - ajv "^6.5.5" + ajv "^6.12.3" har-schema "^2.0.0" has-ansi@^2.0.0: @@ -3861,7 +3983,7 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.0, has-symbols@^1.0.1: +has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== @@ -4113,6 +4235,11 @@ ignore@^5.1.1: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -4212,9 +4339,9 @@ ini@^1.3.4, ini@^1.3.5: integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== inquirer@^7.0.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.0.tgz#aa3e7cb0c18a410c3c16cdd2bc9dcbe83c4d333e" - integrity sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA== + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.0" @@ -4222,7 +4349,7 @@ inquirer@^7.0.0: cli-width "^3.0.0" external-editor "^3.0.3" figures "^3.0.0" - lodash "^4.17.15" + lodash "^4.17.19" mute-stream "0.0.8" run-async "^2.4.0" rxjs "^6.6.0" @@ -4324,9 +4451,9 @@ is-buffer@^1.1.5: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-callable@^1.1.4, is-callable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" - integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== is-color-stop@^1.0.0: version "1.1.0" @@ -4435,6 +4562,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -4483,10 +4615,10 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-regex@^1.0.4, is-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" - integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== +is-regex@^1.0.4, is-regex@^1.1.0, is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== dependencies: has-symbols "^1.0.1" @@ -4575,9 +4707,9 @@ jest-worker@^25.4.0: supports-color "^7.0.0" js-base64@^2.1.8: - version "2.6.2" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.2.tgz#cf9301bc5cc756892a9a6c8d7138322e5944fb0d" - integrity sha512-1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw== + version "2.6.4" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" + integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -4612,6 +4744,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -4709,9 +4846,9 @@ leaflet-clonelayer@^1.0.4: integrity sha512-kqpGX1NfoPZ7fy8SU+PfrfWhvjAEsLECx2JYFdifhW6WGbJRlESMP7vnI3DVbrplcIcSHPOcAUPuGpoK9jNcPg== leaflet@^1.2.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.6.0.tgz#aecbb044b949ec29469eeb31c77a88e2f448f308" - integrity sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ== + version "1.7.1" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19" + integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw== leven@^3.1.0: version "3.1.0" @@ -4733,6 +4870,13 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lie@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= + dependencies: + immediate "~3.0.5" + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -4782,6 +4926,13 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" +localforage@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.8.1.tgz#f6c0a24b41ab33b10e4dc84342dd696f6f3e3433" + integrity sha512-azSSJJfc7h4bVpi0PGi+SmLQKJl2/8NErI+LhJsrORNikMZnhaQ7rv9fHj+ofwgSHrKRlsDCL/639a6nECIKuQ== + dependencies: + lie "3.1.1" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -4850,15 +5001,15 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== loglevel@^1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" - integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== + version "1.7.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" + integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== loose-envify@^1.0.0: version "1.4.0" @@ -4890,6 +5041,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + make-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -5027,11 +5185,16 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.44.0: version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== +"mime-db@>= 1.43.0 < 2": + version "1.45.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== + mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" @@ -5101,9 +5264,9 @@ minipass-flush@^1.0.5: minipass "^3.0.0" minipass-pipeline@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34" - integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" @@ -5114,6 +5277,14 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -5138,17 +5309,22 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -"mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: +"mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + moment@^2.18.1: - version "2.27.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" - integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== + version "2.29.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.0.tgz#fcbef955844d91deb55438613ddcec56e86a3425" + integrity sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA== move-concurrently@^1.0.1: version "1.0.1" @@ -5172,7 +5348,7 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@^2.1.1: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -5228,19 +5404,19 @@ negotiator@0.6.2: integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== neo-async@^2.5.0, neo-async@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-forge@0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" - integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== +node-forge@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== node-gyp@^3.8.0: version "3.8.0" @@ -5289,10 +5465,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.58: - version "1.1.58" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935" - integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg== +node-releases@^1.1.61: + version "1.1.61" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e" + integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g== node-sass@^4.13.0: version "4.14.1" @@ -5429,7 +5605,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0: +object-inspect@^1.7.0, object-inspect@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== @@ -5442,7 +5618,7 @@ object-is@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -5455,14 +5631,14 @@ object-visit@^1.0.0: isobject "^3.0.0" object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + version "4.1.1" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd" + integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA== dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.0" + has-symbols "^1.0.1" + object-keys "^1.1.1" object.getownpropertydescriptors@^2.1.0: version "2.1.0" @@ -5514,9 +5690,9 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: wrappy "1" onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" @@ -5528,9 +5704,9 @@ opn@^5.5.0: is-wsl "^1.1.0" optimize-css-assets-webpack-plugin@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572" - integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA== + version "5.0.4" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" + integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A== dependencies: cssnano "^4.1.10" last-call-webpack-plugin "^3.0.0" @@ -5629,6 +5805,13 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-retry@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" @@ -5668,13 +5851,12 @@ parent-module@^1.0.0: callsites "^3.0.0" parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" - integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== dependencies: - asn1.js "^4.0.0" + asn1.js "^5.2.0" browserify-aes "^1.0.0" - create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" safe-buffer "^5.1.1" @@ -5695,13 +5877,13 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" parse-passwd@^1.0.0: @@ -5869,13 +6051,13 @@ pnp-webpack-plugin@^1.5.0: ts-pnp "^1.1.6" portfinder@^1.0.26: - version "1.0.26" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70" - integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ== + version "1.0.28" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== dependencies: async "^2.6.2" debug "^3.1.1" - mkdirp "^0.5.1" + mkdirp "^0.5.5" posix-character-classes@^0.1.0: version "0.1.1" @@ -5891,9 +6073,9 @@ postcss-attribute-case-insensitive@^4.0.1: postcss-selector-parser "^6.0.2" postcss-calc@^7.0.1: - version "7.0.2" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1" - integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ== + version "7.0.4" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz#5e177ddb417341e6d4a193c5d9fd8ada79094f8b" + integrity sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw== dependencies: postcss "^7.0.27" postcss-selector-parser "^6.0.2" @@ -6106,9 +6288,9 @@ postcss-lab-function@^2.0.1: postcss-values-parser "^2.0.0" postcss-load-config@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003" - integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q== + version "2.1.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" + integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw== dependencies: cosmiconfig "^5.0.0" import-cwd "^2.0.0" @@ -6207,14 +6389,14 @@ postcss-modules-extract-imports@^2.0.0: postcss "^7.0.5" postcss-modules-local-by-default@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" - integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== dependencies: icss-utils "^4.1.1" - postcss "^7.0.16" + postcss "^7.0.32" postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.0" + postcss-value-parser "^4.1.0" postcss-modules-scope@^2.2.0: version "2.2.0" @@ -6486,13 +6668,14 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" - integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" + integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== dependencies: cssesc "^3.0.0" indexes-of "^1.0.1" uniq "^1.0.1" + util-deprecate "^1.0.2" postcss-smart-import@^0.7.6: version "0.7.6" @@ -6535,7 +6718,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -6558,10 +6741,10 @@ postcss@^6.0.14, postcss@^6.0.23, postcss@^6.0.6: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" + integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -6708,9 +6891,9 @@ query-string@^4.1.0: strict-uri-encode "^1.0.0" query-string@^6.8.2: - version "6.13.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.1.tgz#d913ccfce3b4b3a713989fe6d39466d92e71ccad" - integrity sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA== + version "6.13.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.4.tgz#b35a9a3bd4955bce55f94feb0e819b3d0be6f66f" + integrity sha512-E2NPIeJoBEJGQNy3ib1k/Z/OkDBUKIo8IV2ZVwbKfoa65IS9unqWWUlLcbfU70Da0qNoxUZZA8CfKUjKLE641Q== dependencies: decode-uri-component "^0.2.0" split-on-first "^1.0.0" @@ -6727,9 +6910,9 @@ querystring@0.2.0: integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= querystringify@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" - integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== rails-erb-loader@^5.5.2: version "5.5.2" @@ -6874,9 +7057,9 @@ regenerator-runtime@^0.11.0: integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== regenerator-transform@^0.14.2: version "0.14.5" @@ -6912,9 +7095,9 @@ regexpp@^3.0.0: integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== regexpu-core@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" - integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ== + version "4.7.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" + integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== dependencies: regenerate "^1.4.0" regenerate-unicode-properties "^8.2.0" @@ -7082,6 +7265,13 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -7103,9 +7293,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: aproba "^1.1.1" rxjs@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84" - integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg== + version "6.6.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" + integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== dependencies: tslib "^1.9.0" @@ -7166,14 +7356,14 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" - integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== +schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== dependencies: - "@types/json-schema" "^7.0.4" - ajv "^6.12.2" - ajv-keywords "^3.4.1" + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" scss-tokenizer@^0.2.3: version "0.2.3" @@ -7189,11 +7379,11 @@ select-hose@^2.0.0: integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^1.10.7: - version "1.10.7" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b" - integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA== + version "1.10.8" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" + integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== dependencies: - node-forge "0.9.0" + node-forge "^0.10.0" "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" @@ -7234,15 +7424,10 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" - integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== - -serialize-javascript@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea" - integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg== +serialize-javascript@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== dependencies: randombytes "^2.1.0" @@ -7473,9 +7658,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + version "3.0.6" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" + integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== spdy-transport@^3.0.0: version "3.0.0" @@ -7547,6 +7732,13 @@ ssri@^7.0.0: figgy-pudding "^3.5.1" minipass "^3.1.1" +ssri@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" + integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + dependencies: + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -7732,9 +7924,9 @@ strip-indent@^1.0.1: get-stdin "^4.0.1" strip-json-comments@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" - integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== style-loader@^1.0.0: version "1.2.1" @@ -7780,9 +7972,9 @@ supports-color@^6.1.0: has-flag "^3.0.0" supports-color@^7.0.0, supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" @@ -7805,10 +7997,10 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -tabbable@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.0.0.tgz#862b6f33a625da45d7c648cff0262dab453d8b0c" - integrity sha512-+TJTMpkHRCWkMGczHHVEfzBYCsVOiBjd3vle55AT4H299BhdJDLFqcYmr7S6kt5EGhT8gAywSC5gPUBDNvtl7w== +tabbable@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.1.0.tgz#b81115168d0a8359ba69003b6a99d05f8480a664" + integrity sha512-Y3nSukchqM5UchuZjhj/WyE79Qb4RM/Vx3x3oHO3UYKKpf70Hy3iVRxb61MzCavN74aZsKzvPl4KNG8tQUAjFQ== table@^5.2.3: version "5.4.6" @@ -7834,32 +8026,44 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" +tar@^6.0.2: + version "6.0.5" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" + integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terser-webpack-plugin@^1.4.3: - version "1.4.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f" - integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA== + version "1.4.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" + integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^3.1.0" + serialize-javascript "^4.0.0" source-map "^0.6.1" terser "^4.1.2" webpack-sources "^1.4.0" worker-farm "^1.7.0" terser-webpack-plugin@^2.2.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz#4910ff5d1a872168cc7fa6cd3749e2b0d60a8a0b" - integrity sha512-xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg== + version "2.3.8" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724" + integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w== dependencies: cacache "^13.0.1" find-cache-dir "^3.3.1" jest-worker "^25.4.0" p-limit "^2.3.0" schema-utils "^2.6.6" - serialize-javascript "^3.1.0" + serialize-javascript "^4.0.0" source-map "^0.6.1" terser "^4.6.12" webpack-sources "^1.4.3" @@ -8135,9 +8339,9 @@ upath@^1.1.1: integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== dependencies: punycode "^2.1.0" @@ -8167,7 +8371,7 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@^1.0.1, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -8249,9 +8453,9 @@ vue-hot-reload-api@^2.3.0: integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== vue-i18n@^8.20.0: - version "8.20.0" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.20.0.tgz#c81b01d6541182b28565316cafe881b65a3c0f1b" - integrity sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg== + version "8.21.1" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.21.1.tgz#afa8e6390a5de3b65bd17533c4269181f86f1d61" + integrity sha512-KEakJLI7R6+UCmhJOMZ0K7C+Zf5FcMh7QDkBRaEq39V7d9JgSrTDBf/9HuHU3TaxQYXx4fUi5PTIPdwLXq+iow== vue-loader@^15.7.1: version "15.9.3" @@ -8265,9 +8469,9 @@ vue-loader@^15.7.1: vue-style-loader "^4.1.0" vue-router@^3.0.1: - version "3.3.4" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.3.4.tgz#4e38abc34a11c41b6c3d8244449a2e363ba6250b" - integrity sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg== + version "3.4.5" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz#d396ec037b35931bdd1e9b7edd86f9788dc15175" + integrity sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg== vue-style-loader@^4.1.0: version "4.1.2" @@ -8278,9 +8482,9 @@ vue-style-loader@^4.1.0: loader-utils "^1.0.2" vue-template-compiler@^2.6.10: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" - integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA== + version "2.6.12" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e" + integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -8291,9 +8495,9 @@ vue-template-es2015-compiler@^1.9.0: integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== vue@^2.6.11: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" - integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== + version "2.6.12" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" + integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== vuex@^3.0.1: version "3.5.1" @@ -8307,15 +8511,15 @@ watchpack-chokidar2@^2.0.0: dependencies: chokidar "^2.1.8" -watchpack@^1.6.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa" - integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g== +watchpack@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b" + integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg== dependencies: graceful-fs "^4.1.2" neo-async "^2.5.0" optionalDependencies: - chokidar "^3.4.0" + chokidar "^3.4.1" watchpack-chokidar2 "^2.0.0" wbuf@^1.1.0, wbuf@^1.7.3: @@ -8413,7 +8617,7 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: +webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -8422,9 +8626,9 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack- source-map "~0.6.1" webpack@^4.41.2: - version "4.43.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" - integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== + version "4.44.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72" + integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q== dependencies: "@webassemblyjs/ast" "1.9.0" "@webassemblyjs/helper-module-context" "1.9.0" @@ -8434,7 +8638,7 @@ webpack@^4.41.2: ajv "^6.10.2" ajv-keywords "^3.4.1" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" + enhanced-resolve "^4.3.0" eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" loader-runner "^2.4.0" @@ -8447,7 +8651,7 @@ webpack@^4.41.2: schema-utils "^1.0.0" tapable "^1.1.3" terser-webpack-plugin "^1.4.3" - watchpack "^1.6.1" + watchpack "^1.7.4" webpack-sources "^1.4.1" websocket-driver@0.6.5: