diff --git a/assets/js/author_delete_stats.js b/assets/js/author_delete_stats.js new file mode 100644 index 0000000000..65655e71e6 --- /dev/null +++ b/assets/js/author_delete_stats.js @@ -0,0 +1,48 @@ +/* ===== Zeste de Savoir ==================================================== + Nom du fichier : author_stats.js + Description : Script JS pour supprimer les statistiques des quizzs par l'auteur ou staff + Auteur : Atman BOZ + ========================================================================== */ + + +$('.quizz_name').each(function () { + var quizzName = $(this).text(); + quizzName = quizzName.replace("#", ""); + var parts = quizzName.split("/"); + var statsPart = parts[parts.length - 2] + "/" + parts[parts.length - 1]; + $(this).text(statsPart); +}); + + +$(document).ready(function () { + // Add an event listener to the quizz delete button + $(".delete-quizz-button").click(function () { + var quizzName = $(this).attr('data-quizz'); + deleteQuizz(quizzName, ''); + }); + + // Add an event listener to the question delete button + $(".delete-question-button").click(function () { + var quizzName = $(this).attr('data-quizz'); + var question = $(this).attr('data-question'); + deleteQuizz(quizzName, question); + }); + +}); + +function deleteQuizz(quizzName, question) { + const csrfmiddlewaretoken = $("input[name='csrfmiddlewaretoken']").val(); + $.ajax({ + url: '/contenus/delete_quizz/', + type: 'POST', + data: question ? JSON.stringify({ 'quizzName': quizzName, 'question': question }) : JSON.stringify({ 'quizzName': quizzName }), + headers: { + 'X-Requested-With': 'XMLHttpRequest', + 'Content-Type': 'application/json', + 'X-CSRFToken': csrfmiddlewaretoken + }, + success: function (response) { + location.reload(); + } + }); +} diff --git a/assets/js/charts.js b/assets/js/charts.js index 888a427bbc..7f60c4b93f 100644 --- a/assets/js/charts.js +++ b/assets/js/charts.js @@ -37,12 +37,35 @@ const t = v * (1 - s * (1 - f)) switch (i) { - case 0: r = v; g = t; b = p; break - case 1: r = q; g = v; b = p; break - case 2: r = p; g = v; b = t; break - case 3: r = p; g = q; b = v; break - case 4: r = t; g = p; b = v; break - default: r = v; g = p; b = q + case 0: + r = v + g = t + b = p + break + case 1: + r = q + g = v + b = p + break + case 2: + r = p + g = v + b = t + break + case 3: + r = p + g = q + b = v + break + case 4: + r = t + g = p + b = v + break + default: + r = v + g = p + b = q } return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)] @@ -173,6 +196,7 @@ } } } + drawCharts() // Tab management diff --git a/assets/js/content-quizz.js b/assets/js/content-quizz.js new file mode 100644 index 0000000000..cef28e24bd --- /dev/null +++ b/assets/js/content-quizz.js @@ -0,0 +1,582 @@ +/** + * The full quizz is contained in a div or article that has class "quizz". + * Then one question is inside a zmarkdown "custom-block" of type "custom-block-quizz". Two possibilities : + * + * Without explanation for correction : + * + * + *
+ *
The question
+ *
+ *
  • the answer
  • + *
  • the good answer
  • + *
+ *
+ *
+ *
+ * + * With an explanation inside another custom block most of time a custom-block-neutral + * + * + *
+ *
The question
+ *
+ *
  • the answer
  • + *
  • the good answer + * + *
    + *
    Explanation
    + *
    a formatted text
    + *
  • + * + *
+ *
+ *
+ *
+ * + * Note that the correction MAY be inside the last li due to the way custom-block plugin works, this is not a bug + * */ + +var currentURL = window.location.href; + +if (currentURL.includes("/contenus/")) { + + let lastListItems = document.querySelectorAll('.custom-block-quizz ul li:last-child'); + + for (let i = 0; i < lastListItems.length; i++) { + + // Create a new div element + let newDiv = document.createElement('div'); + newDiv.classList.add('explanation_on') + + // Set the text content of the div to match the text content of the last list item + newDiv.innerHTML = 'Explication : ' + lastListItems[i].textContent; + + // Replace the last list item with the new div element + lastListItems[i].parentNode.replaceChild(newDiv, lastListItems[i]); + } + + +} + +if (currentURL.includes("/tutoriels/")) { + + let index = 0 + + function extractAnswer(inputDomElementList, answers) { + + let idli = 0 + inputDomElementList.forEach((rb) => { + + const ulWrapperElement = rb.parentElement.parentElement + // we give the ui an id to find the element in a more effective way later when the users answer the questions + if (!ulWrapperElement.getAttribute('id')) { + ulWrapperElement.setAttribute('id', 'id-' + (index++)) + } + + rb.setAttribute('name', ulWrapperElement.getAttribute('id')) + rb.setAttribute('id', ulWrapperElement.getAttribute('id') + '-' + idli) + idli++ + + const questionBlock = ulWrapperElement.parentElement.parentElement + questionBlock.setAttribute('data-name', rb.getAttribute('name')) + if (!answers[ulWrapperElement.getAttribute('id')]) { + answers[ulWrapperElement.getAttribute('id')] = [rb.checked] + } else { + answers[ulWrapperElement.getAttribute('id')].push(rb.checked) + } + rb.setAttribute('value', answers[ulWrapperElement.getAttribute('id')].length - 1) + rb.disabled = false + rb.checked = false + }) + } + + /** + * @param answers the answer dictionary, it will be modified by the process + */ + function initializeCheckboxes(answers) { + + ExplanationMaker() + + const checkboxes = document.querySelectorAll('.quizz ul li input[type=checkbox]') + extractAnswer(checkboxes, answers) + + AnswersAsLabels() + + } + + function AnswersAsLabels() { + + var checkboxli = document.querySelectorAll('.quizz ul li') + + checkboxli.forEach((li) => { + var input = li.querySelector('input[type=checkbox]') + var label = document.createElement('label') + label.setAttribute('for', input.getAttribute('id')) + label.classList.add('answer-label') + label.innerHTML = li.querySelector('span.math') ? li.querySelector('span.math').innerHTML : li.innerText + li.textContent = '' + li.appendChild(input) + li.appendChild(label) + }) + } + + function ExplanationMaker() { + // add explanation to all questions + document.querySelectorAll('div.custom-block-quizz').forEach(quizzDiv => { + + const ul = quizzDiv.querySelector('ul') + const lastLi = ul.lastElementChild + const explanationText = 'Explication : ' + lastLi.innerText + const explanation = document.createElement('div') + explanation.classList.add('explanation_off') + explanation.innerHTML = explanationText + lastLi.parentNode.removeChild(lastLi) + quizzDiv.querySelector('div.custom-block-body').appendChild(explanation) + + }) + } + + const initializePipeline = [initializeCheckboxes] + + function computeForm(formdata, answers) { + const badAnswers = [] + const allAnswerNames = [] + for (const entry of formdata.entries()) { + const name = entry[0] + const values = parseInt(entry[1], 10) + allAnswerNames.push(name) + if (!answers[name]) { + continue + } else { + // for poc we assume we only deal with lists + if (!answers[name][values]) { + badAnswers.push({ + name: name, + value: values + }) + } + } + } + return [badAnswers, allAnswerNames] + } + + function markBadAnswers(form, names, answers) { + + const toAdd = [] + + Object.keys(answers).forEach(answer => { + + const inputs = form.querySelectorAll(`#${answer} input`); + + + let numChecked = 0; + inputs.forEach(input => { + if (input.hasAttribute('checked')) { + input.parentElement.classList.add('answer-good') + numChecked++; + } + }); + + // question with more than one correct answer + if (numChecked > 1) { + + let AnsweredWell = true + answers[answer].forEach((value, index) => { + const inputAnswer = document.querySelector(`#${answer} input[value="${index}"]`) + if (value && !inputAnswer.checked) { + AnsweredWell = false + } + }) + + const divquizz = form.querySelector(`div[data-name="${answer}"]`) + if (!AnsweredWell) { + divquizz.classList.add('quizz-bad') + const icon = iconMaker(false) + divquizz.querySelector('div.custom-block-body').appendChild(icon); + } else { + divquizz.classList.add('quizz-good') + } + } + }) + + names.forEach(({ name }) => { + + form.querySelectorAll('input[name="' + name + '"]').forEach(field => { + + + if (answers[name][parseInt(field.getAttribute('value'), 10)] && !field.checked) { + + toAdd.push({ + name: name, + value: field.getAttribute('value') + }) + } + }) + + const divquizz = form.querySelector(`.custom-block[data-name=${name}]`) + if (!divquizz.classList.contains('quizz-good')) { + + divquizz.classList.add('quizz-bad') + // Create a new icon element + const icon = iconMaker(false) + divquizz.querySelector('div.custom-block-body').appendChild(icon); + } + }) + + names.forEach(({ + name, + value + }) => { + + form.querySelector(`input[type=checkbox][name="${name}"][value="${value}"]`).parentElement.classList.add('answer-bad') + }) + + toAdd.forEach(name => names.push(name)) + } + + function getWantedHeading(questionNode, nodeName, attr) { + let potentialHeading = questionNode + while (potentialHeading[attr] && + potentialHeading.nodeName !== nodeName.toUpperCase()) { + potentialHeading = potentialHeading[attr] + } + if (potentialHeading.nodeName !== nodeName.toUpperCase()) { + return null + } + return potentialHeading + } + + + function injectForms(quizz, answers) { + + + const searchedTitle = quizz.getAttribute('data-heading-level') || 'h3' + const submitLabel = quizz.getAttribute('data-quizz-validate') || 'Validate' + const headings = {} + const wrappers = [] + + + const QuizzQstNum = quizz.querySelectorAll('.custom-block-quizz').length + + Object.keys(answers).forEach(blockId => { + + + const blockNode = document.getElementById(blockId) + + if (!blockNode) { + // if the node was treated and therefore the clone has not been reinserted yet + return + } + // this is the custom-block-quizz node + const questionNode = blockNode.parentElement.parentElement + const heading = getWantedHeading(questionNode, searchedTitle, 'previousSibling') || quizz + + if (!heading.getAttribute('id')) { + + heading.setAttribute('id', `quizz-form-${idBias}`) + idBias++ + } + + + if (heading && !headings[heading.getAttribute('id')]) { + + // this is just for convenience, this add a "known" element that will always be there + const wrapper = document.createElement('div') + + headings[heading.getAttribute('id')] = true + const form = document.createElement('form') + form.classList.add('quizz') + form.style.marginBottom = '50px' + + + const submit = document.createElement('button') + submit.innerText = submitLabel + submit.style.marginTop = '-22px' + + submit.classList.add('btn', 'btn-submit') + + var parts = quizz.previousElementSibling.firstElementChild.href.split("/"); + var idButton = parts[parts.length - 4] + "/" + parts[parts.length - 3] + "/" + parts[parts.length - 2] + "/" + parts[parts.length - 1]; + + submit.setAttribute('id', `my-button-${idButton}`); + + + const notAnswered = document.createElement('p') + notAnswered.classList.add('notAnswered') + + let nodeToAddToForm + if (heading === quizz) { + + nodeToAddToForm = quizz.firstChild + } else { + nodeToAddToForm = heading.nextSibling + } + + + // add any element before the first question to the wrapper + while (nodeToAddToForm.nodeName !== "DIV" && nodeToAddToForm.className !== "custom-block custom-block-quizz") { + + const current = nodeToAddToForm + nodeToAddToForm = nodeToAddToForm.nextSibling + wrapper.appendChild(current.cloneNode(true)) + current.parentNode.removeChild(current) + + } + + form.method = 'POST' + form.setAttribute('action', quizz.getAttribute('data-answer-url')) + form.setAttribute('id', `my-form-${idCounter}`); + idCounter++; + + + // add elements between 1st and last question to form + let num = 0; + while (nodeToAddToForm && nodeToAddToForm.nodeName !== searchedTitle.toUpperCase()) { + const current = nodeToAddToForm + if (current.nodeName === "DIV" && current.className === "custom-block custom-block-quizz") num++; + nodeToAddToForm = nodeToAddToForm.nextSibling + form.appendChild(current.cloneNode(true)) + current.parentNode.removeChild(current) + if (num === QuizzQstNum) { form.appendChild(submit); break }; + } + wrapper.append(form) + + // add elements after last question until next h3 to wrapper + while (nodeToAddToForm && nodeToAddToForm.nodeName !== searchedTitle.toUpperCase()) { + + const current = nodeToAddToForm + nodeToAddToForm = nodeToAddToForm.nextSibling + wrapper.appendChild(current.cloneNode(true)) + current.parentNode.removeChild(current) + } + + wrapper.appendChild(notAnswered) + wrappers.push(wrapper) + + } + // avoid doubly + if (heading.nodeName === searchedTitle.toUpperCase()) { + quizz.removeChild(heading) + } + }) + wrappers.forEach((wrapper) => quizz.appendChild(wrapper)) + } + + let answers = {} + + initializePipeline.forEach(func => func(answers)) + + let idCounter = 0 + let idBias = 0 + + document.querySelectorAll('div.quizz').forEach(div => { + + const quizInside = div.querySelector('.custom-block-quizz ul li input[type=checkbox]'); + if (quizInside) { + injectForms(div, answers) + } + + }) + + function sendQuizzStatistics(form, statistics) { + + const csrfmiddlewaretoken = document.querySelector('input[name=\'csrfmiddlewaretoken\']').value + const xhttp = new XMLHttpRequest() + xhttp.open('POST', form.getAttribute('action')) + xhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest') + xhttp.setRequestHeader('Content-Type', 'application/json') + xhttp.setRequestHeader('X-CSRFToken', csrfmiddlewaretoken) + statistics.url = form.parentElement.parentElement.previousElementSibling.firstElementChild.href + xhttp.send(JSON.stringify(statistics)) + + } + + function displayResultAfterSubmitButton(form) { + + const questions = form.querySelectorAll('.custom-block-quizz'); + + for (let question of questions) { + + const explanationElement = question.querySelector('.explanation_off') + if (explanationElement !== null) { + explanationElement.classList.remove('explanation_off'); + explanationElement.classList.add('explanation_on'); + } + + } + + } + + // test if the quizz is totally answered or not + function QuizzAnswered(form) { + + const questions = form.querySelectorAll('.custom-block-quizz'); + for (let question of questions) { + const checkboxes = question.querySelectorAll('input[type="checkbox"]'); + let isQuestionValid = false; + for (let checkbox of checkboxes) { + if (checkbox.checked) { + isQuestionValid = true; + break; + } + } + if (!isQuestionValid) { + return false + } + } + return true + } + + function iconMaker(isGood) { + // Create a new icon element + const icon = document.createElement('div'); + icon.classList.add('fas'); + isGood ? icon.classList.add('fa-check') : icon.classList.add('fa-exclamation-triangle') + icon.style.fontSize = '10px'; + icon.style.transform = 'scale(2)'; + icon.style.margin = '10px' + return icon + } + + + function getQuestionText(question) { + + let title + if (question.querySelector('.math')) { + const annotation = question.querySelector('.math annotation'); + title = '$' + annotation.textContent.trim() + '$'; + } + else { + title = question.textContent; + } + return title + } + + + function getAnswerText(liWrapper) { + + let label = liWrapper.querySelector('.answer-label') + let MathAnnotation = label.querySelector('annotation') + let answer; + if (MathAnnotation) { + answer = '$' + MathAnnotation.textContent.trim() + '$'; + } else { + answer = liWrapper.textContent; + } + return answer + } + + + document.querySelectorAll('form.quizz').forEach(form => { + + form.addEventListener('submit', e => { + + e.preventDefault() + e.stopPropagation() + + const notAnswered = form.parentElement.querySelector('.notAnswered'); + const submitBtn = form.querySelector('.btn-submit'); + + + if (!document.querySelector('input[name=\'csrfmiddlewaretoken\']')) { + if (!sessionStorage.getItem(submitBtn.id)) { + // If the quiz has not been submitted before, store a flag in session storage to prevent multiple submissions + sessionStorage.setItem(`${submitBtn.id}`, true); + } else { + // If the quiz has already been submitted, disable the submit button + submitBtn.setAttribute('disabled', true); + alert('Vous avez déjà répondu, Veuillez vous connecter'); + return; + } + } + + // test if the whole quizz is answered + if (QuizzAnswered(form)) { + + const formData = new FormData(form) + const [badAnswerNames, allAnswerNames] = computeForm(formData, answers) + + markBadAnswers(form, badAnswerNames, answers) + + allAnswerNames.forEach(name => { + const ulWrapper = document.getElementById(name) + const quizzCustomBlock = ulWrapper.parentElement.parentElement + quizzCustomBlock.classList.add('hasAnswer') + }) + const questions = [] + badAnswerNames.forEach(result => { + if (questions.indexOf(result.name) === -1) { + questions.push(result.name) + } + }) + + const statistics = { + expected: {}, + result: {} + } + + const CurrentFormQuestions = [...form.querySelectorAll('.custom-block-heading')].map(question => getQuestionText(question)); + + Object.keys(answers).forEach(name => { + + const element = document.querySelector(`.custom-block[data-name="${name}"]`) + + let title = getQuestionText(element.querySelector('.custom-block-heading')) + + + //make statistics of concerned form only + if (CurrentFormQuestions.includes(title)) { + + statistics.result[title] = { + evaluation: 'bad', + labels: [] + } + statistics.expected[title] = {} + + const availableResponses = element.querySelectorAll('input') + for (let i = 0; i < availableResponses.length; i++) { + // wee need to get the question label for statistics + const liWrapper = availableResponses[i].parentElement + let questionLabel = getAnswerText(liWrapper) + + statistics.expected[title][questionLabel] = answers[name][i] + } + // now determine answers and their labels + element.querySelectorAll('input:checked').forEach(node => { + + // remove eventual glued corretion + let label = getAnswerText(node.parentElement) + + statistics.result[title].labels.push(label.trim()) + }) + if (element.classList.contains('hasAnswer') && !element.classList.contains('quizz-bad')) { + + element.classList.add('quizz-good') + + const icon = iconMaker(true) + // Append the icon to the element + element.querySelector('div.custom-block-body').appendChild(icon); + statistics.result[title].evaluation = 'ok' + + } + } + }) + + if (document.querySelector('input[name=\'csrfmiddlewaretoken\']')) { + sendQuizzStatistics(form, statistics) + } + submitBtn.setAttribute('disabled', true); + displayResultAfterSubmitButton(form) + notAnswered.innerText = '' + // not all questions answered + } else { + + notAnswered.innerText = 'Veuillez répondre à toutes les questions' + + } + }) + }) + + +} diff --git a/assets/js/editor-new.js b/assets/js/editor-new.js index ed610b2a79..a3b0876a87 100644 --- a/assets/js/editor-new.js +++ b/assets/js/editor-new.js @@ -118,6 +118,7 @@ } else if (_type === 'n' || _type === 'neutre') { ret.blocNeutral = true } + } } else { // find checklist @@ -169,7 +170,7 @@ start = text.slice(0, startPoint.ch) end = text.slice(startPoint.ch) let offset = 0 - if (type === 'blocInformation' || type === 'blocQuestion' || type === 'blocWarning' || type === 'blocError' || type === 'blocSecret' || type === 'blocNeutral') { + if (type === 'blocInformation' || type === 'blocQuestion' || type === 'blocWarning' || type === 'blocError' || type === 'blocSecret' || type === 'blocNeutral' || type === 'blocquizz') { unShiftLines(cm, startPoint.line, endPoint.line) startPoint.ch = 0 } else if (type === 'checklist') { @@ -228,7 +229,7 @@ function enableBlockZmd(cm, type, start, end, startPoint, endPoint) { let i, text - if (type === 'blocInformation' || type === 'blocQuestion' || type === 'blocWarning' || type === 'blocError' || type === 'blocSecret' || type === 'blocNeutral') { + if (type === 'blocInformation' || type === 'blocQuestion' || type === 'blocWarning' || type === 'blocError' || type === 'blocSecret' || type === 'blocNeutral'|| type === 'blocquizz') { // blocs for (i = startPoint.line; i <= endPoint.line; i++) { text = start + cm.getLine(i) @@ -247,6 +248,22 @@ } else if (type === 'blocNeutral') { shiftLines(cm, startPoint.line, '[[neutre|titre]]') } + else if (type === 'blocquizz') { + + if(window.location.href.includes('/contenus/')){ + shiftLines(cm, startPoint.line, '| - Votre explication'); + shiftLines(cm, startPoint.line, '| - [ ] réponse 3'); + shiftLines(cm, startPoint.line, '| - [x] réponse 2 ( bonne )'); + } + else { + shiftLines(cm, startPoint.line, '| - [ ] réponse 3'); + shiftLines(cm, startPoint.line, '| - [ ] réponse 2'); + } + + + shiftLines(cm, startPoint.line, '| - [ ] réponse 1'); + shiftLines(cm, startPoint.line, '[[quizz|Question]]'); + } startPoint.ch = 0 endPoint.line += 1 endPoint.ch = endPoint.line.length @@ -383,570 +400,584 @@ return null } - /* global EasyMDE */ - const easyMDE = new EasyMDE({ - autoDownloadFontAwesome: false, - element: this, - forceSync: true, - autosave: { - enabled: true, - uniqueId: mdeUniqueKey, - delay: 1000 + const BaseToolbar = [ + { + name: 'bold', + action: EasyMDE.toggleBold, + className: 'fa fa-bold', + title: 'Gras' }, - indentWithTabs: false, - minHeight: minHeight + 'px', - placeholder: 'Votre message au format Markdown', - promptURLs: true, - promptTexts: { - image: 'Url de votre image', - link: 'Url de votre lien' + { + name: 'italic', + action: EasyMDE.toggleItalic, + className: 'fa fa-italic', + title: 'Italique' }, - uploadImage: true, - imageUploadFunction: uploadImage, - imageTexts: { - sbInit: 'Joindre des images par glisser-déposer ou coller depuis le presse-papiers.', - sbOnDragEnter: 'Déposez l\'image pour l\'envoyer dans votre galerie.', - sbOnDrop: 'Téléchargement d\'images #images_names#', - sbProgress: 'Téléchargement #file_name#: #progress#%', - sbOnUploaded: 'Image téléchargée #image_name#' + { + name: 'strikethrough', + action: EasyMDE.toggleStrikethrough, + className: 'fa fa-strikethrough', + title: 'Barré' }, - spellChecker: false, - inputStyle: 'contenteditable', - nativeSpellcheck: true, - sideBySideFullscreen: false, - promptAbbrv: true, - theme: 'zest', - previewRender: customMarkdownParser, - syncSideBySidePreviewScroll: false, - toolbar: [ - { - name: 'bold', - action: EasyMDE.toggleBold, - className: 'fa fa-bold', - title: 'Gras' - }, - { - name: 'italic', - action: EasyMDE.toggleItalic, - className: 'fa fa-italic', - title: 'Italique' - }, - { - name: 'strikethrough', - action: EasyMDE.toggleStrikethrough, - className: 'fa fa-strikethrough', - title: 'Barré' - }, - { - name: 'abbr', - action: (e) => { - const options = e.options - const cm = e.codemirror - let abbr = cm.getSelection() - let description = '' - const lastLine = cm.lastLine() - const lastCh = cm.getLine(lastLine).length - - const startPoint = cm.getCursor('start') - const endPoint = cm.getCursor('end') - - if (options.promptAbbrv) { + { + name: 'abbr', + action: (e) => { + const options = e.options + const cm = e.codemirror + let abbr = cm.getSelection() + let description = '' + const lastLine = cm.lastLine() + const lastCh = cm.getLine(lastLine).length + + const startPoint = cm.getCursor('start') + const endPoint = cm.getCursor('end') + + if (options.promptAbbrv) { + if (abbr.length === 0) { + abbr = prompt('Mot abrégé', '') if (abbr.length === 0) { - abbr = prompt('Mot abrégé', '') - if (abbr.length === 0) { - return false - } + return false } - description = prompt('Description de l\'abbréviation', '') } + description = prompt('Description de l\'abbréviation', '') + } - cm.replaceRange(cm.lineSeparator() + cm.lineSeparator() + '*[' + abbr + ']: ' + description, { line: lastLine, ch: lastCh }, { line: lastLine, ch: maxRange }) - cm.setSelection(startPoint, endPoint) - cm.focus() - }, - className: 'fa fa-text-width', - title: 'Abbréviation' + cm.replaceRange(cm.lineSeparator() + cm.lineSeparator() + '*[' + abbr + ']: ' + description, { line: lastLine, ch: lastCh }, { line: lastLine, ch: maxRange }) + cm.setSelection(startPoint, endPoint) + cm.focus() }, - { - name: 'keyboard', - action: (e) => { - _toggleBlockZmd(e, 'keyboard', '||') - }, - className: 'far fa-keyboard', - title: 'Touche clavier' - }, - { - name: 'codeInline', - action: (e) => { - _toggleBlockZmd(e, 'codeInline', '`') - }, - className: 'fa fa-terminal', - title: 'Code inline' - }, - '|', - { - name: 'superscript', - action: (e) => { - _toggleBlockZmd(e, 'superscript', '^') - }, - className: 'fa fa-superscript', - title: 'Exposant' - }, - { - name: 'subscript', - action: (e) => { - _toggleBlockZmd(e, 'subscript', '~') - }, - className: 'fa fa-subscript', - title: 'Indice' - }, - '|', - { - name: 'alignCenter', - action: (e) => { - _toggleBlockZmd(e, 'alignCenter', '-> ', ' <-') - }, - className: 'fa fa-align-center', - title: 'Aligner au centre' - }, - { - name: 'alignRight', - action: (e) => { - _toggleBlockZmd(e, 'alignRight', '-> ', ' ->') - }, - className: 'fa fa-align-right', - title: 'Aligner a droite' - }, - '|', - { - name: 'list-ul', - action: EasyMDE.toggleUnorderedList, - className: 'fa fa-list-ul', - title: 'Liste à puces' - }, - { - name: 'ordered-list', - action: EasyMDE.toggleOrderedList, - className: 'fa fa-list-ol', - title: 'Liste ordonnée' - }, - { - name: 'checklist', - action: (e) => { - _toggleBlockZmd(e, 'checklist', '- [ ] ') - }, - className: 'far fa-check-square', - title: 'Liste de taches' + className: 'fa fa-text-width', + title: 'Abbréviation' + }, + { + name: 'keyboard', + action: (e) => { + _toggleBlockZmd(e, 'keyboard', '||') }, - '|', - { - name: 'heading', - action: EasyMDE.toggleHeadingSmaller, - className: 'fas fa-heading', - title: 'Titres' + className: 'far fa-keyboard', + title: 'Touche clavier' + }, + { + name: 'codeInline', + action: (e) => { + _toggleBlockZmd(e, 'codeInline', '`') }, - '|', - { - name: 'image', - action: EasyMDE.drawImage, - className: 'far fa-image', - title: 'Image' + className: 'fa fa-terminal', + title: 'Code inline' + }, + '|', + { + name: 'superscript', + action: (e) => { + _toggleBlockZmd(e, 'superscript', '^') }, - { - name: 'link_btn', - action: EasyMDE.drawLink, - className: 'fa fa-link', - title: 'Lien' + className: 'fa fa-superscript', + title: 'Exposant' + }, + { + name: 'subscript', + action: (e) => { + _toggleBlockZmd(e, 'subscript', '~') }, - '|', - { - name: 'quote', - action: EasyMDE.toggleBlockquote, - className: 'fa fa-quote-left', - title: 'Citation' + className: 'fa fa-subscript', + title: 'Indice' + }, + '|', + { + name: 'alignCenter', + action: (e) => { + _toggleBlockZmd(e, 'alignCenter', '-> ', ' <-') }, - { - name: 'code', - action: EasyMDE.toggleCodeBlock, - className: 'fa fa-code', - title: 'Bloc de code coloré' + className: 'fa fa-align-center', + title: 'Aligner au centre' + }, + { + name: 'alignRight', + action: (e) => { + _toggleBlockZmd(e, 'alignRight', '-> ', ' ->') }, - { - name: 'math', - action: (e) => { - _toggleBlockZmd(e, 'math', '$$') - }, - className: 'fa fa-percent', - title: 'Formule mathématique' + className: 'fa fa-align-right', + title: 'Aligner a droite' + }, + '|', + { + name: 'list-ul', + action: EasyMDE.toggleUnorderedList, + className: 'fa fa-list-ul', + title: 'Liste à puces' + }, + { + name: 'ordered-list', + action: EasyMDE.toggleOrderedList, + className: 'fa fa-list-ol', + title: 'Liste ordonnée' + }, + { + name: 'checklist', + action: (e) => { + _toggleBlockZmd(e, 'checklist', '- [ ] ') }, - { - name: 'table', - action: EasyMDE.drawTable, - className: 'fa fa-table', - title: 'Table' + className: 'far fa-check-square', + title: 'Liste de taches' + }, + '|', + { + name: 'heading', + action: EasyMDE.toggleHeadingSmaller, + className: 'fas fa-heading', + title: 'Titres' + }, + '|', + { + name: 'image', + action: EasyMDE.drawImage, + className: 'far fa-image', + title: 'Image' + }, + { + name: 'link_btn', + action: EasyMDE.drawLink, + className: 'fa fa-link', + title: 'Lien' + }, + '|', + { + name: 'quote', + action: EasyMDE.toggleBlockquote, + className: 'fa fa-quote-left', + title: 'Citation' + }, + { + name: 'code', + action: EasyMDE.toggleCodeBlock, + className: 'fa fa-code', + title: 'Bloc de code coloré' + }, + { + name: 'math', + action: (e) => { + _toggleBlockZmd(e, 'math', '$$') }, - '|', - { - name: 'blocMenu', - action: (e) => { + className: 'fa fa-percent', + title: 'Formule mathématique' + }, + { + name: 'table', + action: EasyMDE.drawTable, + className: 'fa fa-table', + title: 'Table' + }, + '|', + { + name: 'blocMenu', + action: (e) => { + }, + className: 'fa fa-smile', + title: 'Emojis heureux', + children: [ + { + name: 'char1', + action: (e) => { + toggleEmoji(e.codemirror, ':)') + }, + className: 'emoji smile', + title: ':)' }, - className: 'fa fa-smile', - title: 'Emojis heureux', - children: [ - { - name: 'char1', - action: (e) => { - toggleEmoji(e.codemirror, ':)') - }, - className: 'emoji smile', - title: ':)' + { + name: 'char2', + action: (e) => { + toggleEmoji(e.codemirror, ':D') }, - { - name: 'char2', - action: (e) => { - toggleEmoji(e.codemirror, ':D') - }, - className: 'emoji heureux', - title: ':D' + className: 'emoji heureux', + title: ':D' + }, + { + name: 'char3', + action: (e) => { + toggleEmoji(e.codemirror, ';)') }, - { - name: 'char3', - action: (e) => { - toggleEmoji(e.codemirror, ';)') - }, - className: 'emoji clin', - title: ';)' + className: 'emoji clin', + title: ';)' + }, + { + name: 'char8', + action: (e) => { + toggleEmoji(e.codemirror, ':soleil:') }, - { - name: 'char8', - action: (e) => { - toggleEmoji(e.codemirror, ':soleil:') - }, - className: 'emoji soleil', - title: ':soleil:' + className: 'emoji soleil', + title: ':soleil:' + }, + { + name: 'char4', + action: (e) => { + toggleEmoji(e.codemirror, ':p') }, - { - name: 'char4', - action: (e) => { - toggleEmoji(e.codemirror, ':p') - }, - className: 'emoji langue', - title: ':P' + className: 'emoji langue', + title: ':P' + }, + { + name: 'char5', + action: (e) => { + toggleEmoji(e.codemirror, ':lol:') }, - { - name: 'char5', - action: (e) => { - toggleEmoji(e.codemirror, ':lol:') - }, - className: 'emoji rire', - title: ':lol:' + className: 'emoji rire', + title: ':lol:' + }, + { + name: 'char6', + action: (e) => { + toggleEmoji(e.codemirror, '^^') }, - { - name: 'char6', - action: (e) => { - toggleEmoji(e.codemirror, '^^') - }, - className: 'emoji hihi', - title: '^^' + className: 'emoji hihi', + title: '^^' + }, + { + name: 'char7', + action: (e) => { + toggleEmoji(e.codemirror, ':ange:') }, - { - name: 'char7', - action: (e) => { - toggleEmoji(e.codemirror, ':ange:') - }, - className: 'emoji ange', - title: ':ange:' + className: 'emoji ange', + title: ':ange:' + }, + { + name: 'char9', + action: (e) => { + toggleEmoji(e.codemirror, ':popcorn:') }, - { - name: 'char9', - action: (e) => { - toggleEmoji(e.codemirror, ':popcorn:') - }, - className: 'emoji popcorn', - title: ':popcorn:' + className: 'emoji popcorn', + title: ':popcorn:' + }, + { + name: 'char10', + action: (e) => { + toggleEmoji(e.codemirror, ':bounce:') }, - { - name: 'char10', - action: (e) => { - toggleEmoji(e.codemirror, ':bounce:') - }, - className: 'emoji bounce', - title: ':bounce:' - } - ] - }, - { - name: 'blocMenu', - action: (e) => { + className: 'emoji bounce', + title: ':bounce:' + } + ] + }, + { + name: 'blocMenu', + action: (e) => { + }, + className: 'fa fa-frown', + title: 'Emojis mécontents', + children: [ + { + name: 'char1', + action: (e) => { + toggleEmoji(e.codemirror, ':(') + }, + className: 'emoji triste', + title: ':(' }, - className: 'fa fa-frown', - title: 'Emojis mécontents', - children: [ - { - name: 'char1', - action: (e) => { - toggleEmoji(e.codemirror, ':(') - }, - className: 'emoji triste', - title: ':(' + { + name: 'char2', + action: (e) => { + toggleEmoji(e.codemirror, ':colere:') }, - { - name: 'char2', - action: (e) => { - toggleEmoji(e.codemirror, ':colere:') - }, - className: 'emoji angry', - title: ':colere:' + className: 'emoji angry', + title: ':colere:' + }, + { + name: 'char3', + action: (e) => { + toggleEmoji(e.codemirror, ':colere2:') }, - { - name: 'char3', - action: (e) => { - toggleEmoji(e.codemirror, ':colere2:') - }, - className: 'emoji mechant', - title: ':colere2:' + className: 'emoji mechant', + title: ':colere2:' + }, + { + name: 'char4', + action: (e) => { + toggleEmoji(e.codemirror, ':diable:') }, - { - name: 'char4', - action: (e) => { - toggleEmoji(e.codemirror, ':diable:') - }, - className: 'emoji diable', - title: ':diable:' + className: 'emoji diable', + title: ':diable:' + }, + { + name: 'char5', + action: (e) => { + toggleEmoji(e.codemirror, ':\'(') }, - { - name: 'char5', - action: (e) => { - toggleEmoji(e.codemirror, ':\'(') - }, - className: 'emoji pleure', - title: ':\'(' + className: 'emoji pleure', + title: ':\'(' + }, + { + name: 'char6', + action: (e) => { + toggleEmoji(e.codemirror, '>_<') }, - { - name: 'char6', - action: (e) => { - toggleEmoji(e.codemirror, '>_<') - }, - className: 'emoji pinch', - title: '>_<' - } - ] - }, - { - name: 'blocMenu', - action: (e) => { + className: 'emoji pinch', + title: '>_<' + } + ] + }, + { + name: 'blocMenu', + action: (e) => { - }, - className: 'fa fa-meh', - title: 'Emojis autres', - children: [ - { - name: 'char1', - action: (e) => { - toggleEmoji(e.codemirror, ':euh:') - }, - className: 'emoji unsure', - title: ':euh:' + }, + className: 'fa fa-meh', + title: 'Emojis autres', + children: [ + { + name: 'char1', + action: (e) => { + toggleEmoji(e.codemirror, ':euh:') }, - { - name: 'char2', - action: (e) => { - toggleEmoji(e.codemirror, ':o') - }, - className: 'emoji huh', - title: ':o' + className: 'emoji unsure', + title: ':euh:' + }, + { + name: 'char2', + action: (e) => { + toggleEmoji(e.codemirror, ':o') }, - { - name: 'char3', - action: (e) => { - toggleEmoji(e.codemirror, ':B') - }, - className: 'emoji b', - title: ':B' + className: 'emoji huh', + title: ':o' + }, + { + name: 'char3', + action: (e) => { + toggleEmoji(e.codemirror, ':B') }, - { - name: 'char4', - action: (e) => { - toggleEmoji(e.codemirror, 'o_O') - }, - className: 'emoji blink', - title: 'o_O' + className: 'emoji b', + title: ':B' + }, + { + name: 'char4', + action: (e) => { + toggleEmoji(e.codemirror, 'o_O') }, - { - name: 'char5', - action: (e) => { - toggleEmoji(e.codemirror, ':-°') - }, - className: 'emoji siffle', - title: ':-°' + className: 'emoji blink', + title: 'o_O' + }, + { + name: 'char5', + action: (e) => { + toggleEmoji(e.codemirror, ':-°') }, - { - name: 'char6', - action: (e) => { - toggleEmoji(e.codemirror, ':magicien:') - }, - className: 'emoji magicien', - title: ':magicien:' + className: 'emoji siffle', + title: ':-°' + }, + { + name: 'char6', + action: (e) => { + toggleEmoji(e.codemirror, ':magicien:') }, - { - name: 'char8', - action: (e) => { - toggleEmoji(e.codemirror, ':pirate:') - }, - className: 'emoji pirate', - title: ':pirate:' + className: 'emoji magicien', + title: ':magicien:' + }, + { + name: 'char8', + action: (e) => { + toggleEmoji(e.codemirror, ':pirate:') }, - { - name: 'char9', - action: (e) => { - toggleEmoji(e.codemirror, ':honte:') - }, - className: 'emoji rouge', - title: ':honte:' + className: 'emoji pirate', + title: ':pirate:' + }, + { + name: 'char9', + action: (e) => { + toggleEmoji(e.codemirror, ':honte:') }, - { - name: 'char10', - action: (e) => { - toggleEmoji(e.codemirror, ':waw:') - }, - className: 'emoji waw', - title: ':waw:' + className: 'emoji rouge', + title: ':honte:' + }, + { + name: 'char10', + action: (e) => { + toggleEmoji(e.codemirror, ':waw:') }, - { - name: 'char11', - action: (e) => { - toggleEmoji(e.codemirror, ':zorro:') - }, - className: 'emoji zorro', - title: ':zorro:' + className: 'emoji waw', + title: ':waw:' + }, + { + name: 'char11', + action: (e) => { + toggleEmoji(e.codemirror, ':zorro:') }, - { - name: 'char7', - action: (e) => { - toggleEmoji(e.codemirror, ':ninja:') - }, - className: 'emoji ninja', - title: ':ninja:' - } - ] - }, - '|', - { - name: 'blocMenu', - action: (e) => { - _toggleBlockZmd(e, 'blocInformation', '| ') + className: 'emoji zorro', + title: ':zorro:' }, - className: 'fa fa-info', - title: 'Bloc spéciaux', - children: [ - { - name: 'blocInformation', - action: (e) => { - _toggleBlockZmd(e, 'blocInformation', '| ') - }, - className: 'fa fa-info bloc_information', - title: 'Bloc information' + { + name: 'char7', + action: (e) => { + toggleEmoji(e.codemirror, ':ninja:') }, - { - name: 'blocQuestion', - action: (e) => { - _toggleBlockZmd(e, 'blocQuestion', '| ') - }, - className: 'fa fa-question bloc_question', - title: 'Bloc question' + className: 'emoji ninja', + title: ':ninja:' + } + ] + }, + '|', + { + name: 'blocMenu', + action: (e) => { + _toggleBlockZmd(e, 'blocInformation', '| ') + }, + className: 'fa fa-info', + title: 'Bloc spéciaux', + children: [ + { + name: 'blocInformation', + action: (e) => { + _toggleBlockZmd(e, 'blocInformation', '| ') }, - { - name: 'blocWarning', - action: (e) => { - _toggleBlockZmd(e, 'blocWarning', '| ') - }, - className: 'fas fa-exclamation-triangle bloc_warning', - title: 'Bloc attention' + className: 'fa fa-info bloc_information', + title: 'Bloc information' + }, + { + name: 'blocQuestion', + action: (e) => { + _toggleBlockZmd(e, 'blocQuestion', '| ') }, - { - name: 'blocError', - action: (e) => { - _toggleBlockZmd(e, 'blocError', '| ') - }, - className: 'fas fa-times-circle bloc_error', - title: 'Bloc erreur' + className: 'fa fa-question bloc_question', + title: 'Bloc question' + }, + { + name: 'blocWarning', + action: (e) => { + _toggleBlockZmd(e, 'blocWarning', '| ') }, - { - name: 'blocSecret', - action: (e) => { - _toggleBlockZmd(e, 'blocSecret', '| ') - }, - className: 'fa fa-eye-slash', - title: 'Bloc secret' + className: 'fas fa-exclamation-triangle bloc_warning', + title: 'Bloc attention' + }, + { + name: 'blocError', + action: (e) => { + _toggleBlockZmd(e, 'blocError', '| ') }, - { - name: 'blocNeutral', - action: (e) => { - _toggleBlockZmd(e, 'blocNeutral', '| ') - }, - className: 'fa fa-sticky-note', - title: 'Bloc neutre' - } - ] - }, - '|', - { - name: 'abc-spellchecker', - action: (evt) => {}, - className: 'fas fa-spell-check', - title: 'Correcteur orthographique externe' - }, - { - name: 'abc-grammalecte', - action: (evt) => { - oGrammalecteAPI.openPanelForText(easyMDE.codemirror.getValue(), easyMDE.codemirror.display.lineDiv) + className: 'fas fa-times-circle bloc_error', + title: 'Bloc erreur' }, - className: 'fa zdsicon zi-grammalecte', - title: 'Correcteur orthographique externe' - }, - { - name: 'switch-contentAreaStyle', - action: (evt) => { - if (easyMDE.isFullscreenActive()) { - easyMDE.toggleFullScreen() - } - const wrapper = easyMDE.codemirror.getWrapperElement() - $(wrapper.parentElement).children('.textarea-multivers').toggle() - $(wrapper).toggle() - // deactivating buttons incompatible with the textarea mode - const $toolbar = $(easyMDE.element.parentElement).children('.editor-toolbar') - if ($toolbar.hasClass('disabled-for-textarea-mode')) { - $toolbar.removeClass('disabled-for-textarea-mode') - } else { - $toolbar.addClass('disabled-for-textarea-mode') - } - easyMDE.codemirror.refresh() + { + name: 'blocSecret', + action: (e) => { + _toggleBlockZmd(e, 'blocSecret', '| ') + }, + className: 'fa fa-eye-slash', + title: 'Bloc secret' }, - className: 'fas fa-remove-format', - title: 'Zone de texte sans mise en forme' - }, - '|', - { - name: 'preview', - action: EasyMDE.togglePreview, - className: 'fa fa-eye no-disable disable-for-textarea-mode', - title: 'Aperçu' + { + name: 'blocNeutral', + action: (e) => { + _toggleBlockZmd(e, 'blocNeutral', '| ') + }, + className: 'fa fa-sticky-note', + title: 'Bloc neutre' + } + ] + }, + '|', + { + name: 'abc-spellchecker', + action: (evt) => {}, + className: 'fas fa-spell-check', + title: 'Correcteur orthographique externe' + }, + { + name: 'abc-grammalecte', + action: (evt) => { + oGrammalecteAPI.openPanelForText(easyMDE.codemirror.getValue(), easyMDE.codemirror.display.lineDiv) }, - { - name: 'side-by-side', - action: EasyMDE.toggleSideBySide, - className: 'fa fa-columns no-disable no-mobile disable-for-textarea-mode', - title: 'Aperçu sur le coté' + className: 'fa zdsicon zi-grammalecte', + title: 'Correcteur orthographique externe' + }, + { + name: 'switch-contentAreaStyle', + action: (evt) => { + if (easyMDE.isFullscreenActive()) { + easyMDE.toggleFullScreen() + } + const wrapper = easyMDE.codemirror.getWrapperElement() + $(wrapper.parentElement).children('.textarea-multivers').toggle() + $(wrapper).toggle() + // deactivating buttons incompatible with the textarea mode + const $toolbar = $(easyMDE.element.parentElement).children('.editor-toolbar') + if ($toolbar.hasClass('disabled-for-textarea-mode')) { + $toolbar.removeClass('disabled-for-textarea-mode') + } else { + $toolbar.addClass('disabled-for-textarea-mode') + } + easyMDE.codemirror.refresh() }, - { - name: 'fullscreen', - action: EasyMDE.toggleFullScreen, - className: 'fa fa-arrows-alt no-disable no-mobile disable-for-textarea-mode', - title: 'Plein écran' - } - ] + className: 'fas fa-remove-format', + title: 'Zone de texte sans mise en forme' + }, + '|', + { + name: 'preview', + action: EasyMDE.togglePreview, + className: 'fa fa-eye no-disable disable-for-textarea-mode', + title: 'Aperçu' + }, + { + name: 'side-by-side', + action: EasyMDE.toggleSideBySide, + className: 'fa fa-columns no-disable no-mobile disable-for-textarea-mode', + title: 'Aperçu sur le coté' + }, + { + name: 'fullscreen', + action: EasyMDE.toggleFullScreen, + className: 'fa fa-arrows-alt no-disable no-mobile disable-for-textarea-mode', + title: 'Plein écran' + }, + '|' + ] + const QuizzButton = { + name: 'blocquizz', + action: (e) => { + _toggleBlockZmd(e, 'blocquizz', '') + }, + className: 'fas fa-question', + title: 'Bloc quizz' + }; + + const currentURL = window.location.href + const Toolbar = ( currentURL.includes('/contenus/') || currentURL.includes('/forums/') ) ? [...BaseToolbar, QuizzButton] : BaseToolbar; + + /* global EasyMDE */ + const easyMDE = new EasyMDE({ + autoDownloadFontAwesome: false, + element: this, + forceSync: true, + autosave: { + enabled: true, + uniqueId: mdeUniqueKey, + delay: 1000 + }, + indentWithTabs: false, + minHeight: minHeight + 'px', + placeholder: 'Votre message au format Markdown', + promptURLs: true, + promptTexts: { + image: 'Url de votre image', + link: 'Url de votre lien' + }, + uploadImage: true, + imageUploadFunction: uploadImage, + imageTexts: { + sbInit: 'Joindre des images par glisser-déposer ou coller depuis le presse-papiers.', + sbOnDragEnter: 'Déposez l\'image pour l\'envoyer dans votre galerie.', + sbOnDrop: 'Téléchargement d\'images #images_names#', + sbProgress: 'Téléchargement #file_name#: #progress#%', + sbOnUploaded: 'Image téléchargée #image_name#' + }, + spellChecker: false, + inputStyle: 'contenteditable', + nativeSpellcheck: true, + sideBySideFullscreen: false, + promptAbbrv: true, + theme: 'zest', + previewRender: customMarkdownParser, + syncSideBySidePreviewScroll: false, + toolbar: Toolbar }) if (smdeUniqueContent != null && localStorage['smde_' + mdeUniqueKey] !== textarea.value) { diff --git a/assets/scss/base/_content.scss b/assets/scss/base/_content.scss index 0043484a6a..de0bf07f2a 100644 --- a/assets/scss/base/_content.scss +++ b/assets/scss/base/_content.scss @@ -115,6 +115,36 @@ h6 { } +.quizz .custom-block { + .custom-block { + display: none; + } + &.quizz-bad { + display: block; + & .custom-block-body { + background-color: $accent-500 ; + } + .custom-block { + display: block; + border: solid 1px $grey-600; + } + } + &.quizz-good { + display: block; + & .custom-block-body{ + background: $green-500; + } + .custom-block { + display: block; + border: solid 1px $grey-600; + .custom-block-body { + font-weight: normal; + } + } + } + +} + .custom-block { margin: $length-24 0; @@ -224,6 +254,7 @@ h6 { } } .custom-block-neutral, +.custom-block-quizz, .custom-block-spoiler { background: $grey-100; @@ -238,6 +269,15 @@ h6 { &:after { display: none; } + + .custom-block { + display: none; + /* hide the correction while not answered */ + &.quizz-good, &.quizz-bad, &.quizz-missing { + display: block; + } + } + } } @@ -604,22 +644,32 @@ div.align-left, figure pre code.hljs { // checkbox menu -ul li p { - margin: 0; -} - li.task-list-item { + list-style-type: none; position: relative; + display: flex; + align-items: center; + + input[type="checkbox"] { + margin-right: 10px; + } + + &.answer-bad { + label { + color: $color-danger; + } + } - input[type=checkbox] { - position: absolute; - top: $length-2; - left: -$length-24; + + &.answer-good { + label { + color: green; + } - background-color: $true-white !important; } -} + } + .warn-typo { height: $length-20; diff --git a/assets/scss/pages/_stats.scss b/assets/scss/pages/_stats.scss index 0b130f004f..0441e55304 100644 --- a/assets/scss/pages/_stats.scss +++ b/assets/scss/pages/_stats.scss @@ -1,52 +1,144 @@ -.stat-table { - .level-1 { - padding-left: $length-20; - } +/* Style for the header of each quiz */ +.header-stats-quiz { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px; + background-color: #f2f2f2; + border: 1px solid #ddd; +} + +.header-stats-quiz h3 { + font-size: 24px; + margin: 0; +} + +/* Style for the initialize stats button */ +.delete-quizz-button, +.delete-question-button { + background-color: #e44833; + border: none; + color: white; + padding: 10px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + margin-left: 10px; + cursor: pointer; +} + +.delete-quizz-button:hover, +.delete-question-button:hover { + background-color: #3e8e41; +} + +/* Style for each question and its stats */ +.stat-graph { + margin-bottom: 20px; + border: 1px solid #ddd; + padding: 10px; +} + +.Question { + display: flex; + align-items: center; + justify-content: space-between; +} + +.question-stats { + font-size: 15px; + margin: 0; + margin-bottom: 5px; +} + +.question-stats span { + display: inline-block; +} + +.quizz-answers { + list-style: none; + padding: 0; + margin: 0; + border: 1px solid #ddd; + +} + +.quizz-answers li { + display: flex; + align-items: center; + width: 100%; + margin-bottom: 10px; + justify-content: space-around; +} - .level-2 { - padding-left: $length-38; - } +.progress-stat { + width : 20vw; + text-align: center; } - /* Style the tab */ -.tab { - border: $length-1 solid $grey-100; - border-bottom: none; - background-color: $grey-100; - color: $color-primary; +.quizz-answers li span:last-child { + font-weight: bold; + font-size: 16px; } -/* Style the buttons that are used to open the tab content */ -.tab span { - display: inline-block; - padding: $length-8 $length-16; - cursor: pointer; +.quizz-answers li.quizz-stats-good { + background-color: #a6f566; + border-color: #155724; + color: #155724; +} + +.progress-wrapper { + position: relative; + height: 20px; + border-radius: 10px; + background-color: #f2f2f2; } -/* Change background color of buttons on hover */ -.tab span:hover { - background-color: $white; +.progress-bar { + position: absolute; + top: 0; + left: 0; + height: 100%; + border-radius: 10px; + background-color: #4CAF50; } -/* Create an active/current tablink class */ -.tab span.active { - background-color: $white; - font-weight: bold; +.progress-label { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + color: white; + font-size: 16px; + font-weight: bold; } -/* Style the tab content */ -.tabcontent { - /* Tab has to be displayed by default, otherwise Chart.js doesn't render the graph. */ - padding: $length-6 $length-12; +.explanation_off { + display: none; +} + +.explanation_on { + margin-top: 1rem; + padding: 1rem; + color: #0a0706; /* dark text */ + border-radius: 0.25rem; +} - border: $length-1 solid $grey-100; - border-top: none; +.notAnswered { + margin-top: 1rem; + padding: 1rem; + margin-right: 17rem; - .stat-graph { - width: 60%; - margin: 0 auto; - } + border: 1px solid #f5c6cb; /* dark red */ + color: #f72f0c; /* dark text */ + border-radius: 0.25rem; + font-size: 1.2rem; + line-height: 1.5; + &:empty { + display: none; + } } diff --git a/doc/source/back-end/contents_manifest.rst b/doc/source/back-end/contents_manifest.rst index 1ed2ca261e..c6ff17ae63 100644 --- a/doc/source/back-end/contents_manifest.rst +++ b/doc/source/back-end/contents_manifest.rst @@ -100,7 +100,17 @@ Version 2.0 6. ``children`` : tableau vers les enfants de niveau inférieur si l'enfant est de type *container*. **Obligatoire** 7. ``text`` : nom du fichier contenant le texte quand l'enfant est de type *extract*. Nous conseillons de garder la convention ``nom de fichier = slug.md`` mais rien n'est obligatoire à ce sujet. **Obligatoire** +Version 2.1 +----------- + +Cette version ajoute le paramètre "ready_to_publish" dans les ``Container`` qui vaut ``True`` par défaut. +Cet attribut permet d'implémenter la fonctionnalité de "publication partielle". + +Version 2.2 +----------- +Cette version ajoute le paramètre ``is_quizz`` dans les ``Extract`` afin de créer des extraits de type Quizz qui auront leur +correction automatiquement calculée par le client. Version 1.0 diff --git a/doc/source/back-end/quizz.rst b/doc/source/back-end/quizz.rst new file mode 100644 index 0000000000..da5d238227 --- /dev/null +++ b/doc/source/back-end/quizz.rst @@ -0,0 +1,134 @@ +=============================== +Ajout de Quizz à Zest de savoir +=============================== + +Zeste de savoir est capable de présenter des quizz à l'utilisateur. La philosophie qui a été retenue est : + +- L'auteur écrit la **correction** du quizz dans un extrait qui est marqué comme étant un quizz. +- Lorsque le tutoriel est publié, côté client, un script parcourt cette correction et la transforme en formulaire. +- Une fois que le lecteur a rempli son quizz, la correction est automatiquement calculée et rendue au lecteur. +- Des statistiques sont alors envoyées à l'auteur pour qu'il voit où sont les erreurs de chacun. + +L'ajout de quizz n'est pas une mince affaire dans notre code d'autant qu'il est important de les rendre **faciles** à rédiger. +En effet, rédiger sur ZDS demande pas mal d'effort et l'ajout de quizz avec les méthodes habituelles à base +de formulaires spécifiques, qui permettent de "configurer le rendu" de la question est peu pertinent. + +La première version du module de quizz permet d'ajouter des QCM mais a été conçue pour permettre l'ajout d'autres types de réponse. + +Liens avec ZMarkdown +==================== + +Le module des quizz nécessite ZMarkdown 9 pour être fonctionnel sur la version web et ZMarkdown 10 pour être proprement exporté en PDF. +Les epub affichent uniquement la correction pour l'instant. + +Utiliser Zmarkdown > 10 +----------------------- + +Avec l'utilisation de zmarkdown > 10 vous pouvez utiliser le bloc ``[[quizz | Intitulé de la question]]``. +Ce bloc a le même comportement que le bloc neutre. Cependant il permet d'ajouter des informations de contexte nécessaires à l'export Latex. +De même on devrait pouvoir tirer partie du fait que ce bloc a une classe précise dans les implémentations des futurs types de questions. + +Ajouter des types de questions +------------------------------ + +Globalement, l'ajout de type de questions, disons "texte libre" pour l'exemple se décompose en trois parties : + +- Décider de quelle syntaxe Markdown on tirera partie pour définir la correction. Imaginons ici qu'on utilise la syntaxe des codes inlines (deux `````) +- Implémenter dans zMarkdown un préprocesseur de ``quizzCustomBlock`` qui permettra de remplacer les ``inlineCode`` par un texte composé de ``______`` dans le quizz et les laissera intacts dans la correction +- Adapter ``content_quizz.js`` et ``statistics.py`` pour que la correction se fasse et que les statistiques remontent + +Comportement attendu des quiz +============================= + +- Les quiz peuvent être créés dans les tutoriels. +- Dans une session, un utilisateur non connecté ne peut répondre qu’une seule fois à un quiz +- Un utilisateur connecté peut répondre plusieurs fois à un quiz +- Le propriétaire du quiz et le staff ont accès à une page contenant les statistiques (nombre de réponses à chaque question) +- Le propriétaire et le staff ont la possibilité de réinitialiser les statistiques de chaque quiz et de chaque question d’un quiz indépendamment à l’aide d’un bouton +- Une question de quiz contient au moins une bonne réponse (pas de test) +- Une question quiz doit avoir une explication qui s’affiche lorsqu'il répond au quiz +- Lors de la modification du tutoriel, les statistiques doivent rester cohérentes avec les quiz qui sont encore présents dans le tutoriel +- Lors d’une bonne réponse, la couleur de fond passe en vert, en orange pour une bonne réponse partielle (ex : une des deux bonnes réponses a été choisie mais pas l’autre). Enfin rouge pour une mauvaise réponse. + +Comment créer un quiz +===================== + +la Création d’un quiz se fait directement en zmarkdown de la façon suivante : + +[[quizz | la question1]] +| - [ ] réponse 1 +| - [x] bonne réponse +| - [ ] réponse 2 +| - réponse 2 est correcte, car Elle est correcte + +[[quizz | la question2]] +| - [x] réponse 1 +| - [x] bonne réponse +| - [ ] réponse 2 +| - réponse 1 et 2 sont correcte car Elle sont bonnes + +Contenu du fichier +================== + +Variables globales +------------------ + +- answers: un objet vide qui contiendra les réponses des utilisateurs aux questions du quizz. +- idCounter: un compteur pour générer des identifiants uniques pour chaque question du quizz. +- idBias: une valeur qui sert à décaler la numérotation des questions du quizz en cas de suppression d'une question. + +Fonctions +--------- + +- initializePipeline(answers): une fonction qui initialise une série de fonctions pour traiter les réponses des utilisateurs. +- injectForms(div, answers): une fonction qui ajoute les éléments de formulaire pour les questions du quizz à un élément de la page HTML. +- sendQuizzStatistics(form, statistics): une fonction qui envoie les statistiques de la réponse du quizz à un serveur à l'aide d'une requête XMLHttpRequest. +- displayResultAfterSubmitButton(form): une fonction qui affiche la réponse correcte pour chaque question du quizz après que l'utilisateur a soumis ses réponses. +- QuizzAnswered(form): une fonction qui teste si toutes les questions du quizz ont une réponse. +- iconMaker(isGood): une fonction qui crée un élément d'icône avec l'icône "check" ou "exclamation-triangle" de Font Awesome en fonction de si la réponse de l'utilisateur est correcte ou non. +- getQuestionText(question): une fonction qui retourne le texte de la question. +- getAnswerText(liWrapper): une fonction qui retourne le texte de la réponse. +- computeForm(formData, answers): une fonction qui compare les réponses de l'utilisateur avec les réponses attendues et retourne une liste des réponses incorrectes et une liste de toutes les réponses. +- markBadAnswers(form, badAnswerNames, answers): une fonction qui marque les réponses incorrectes pour chaque question du quizz. + +Événements +---------- + +- 'submit' pour chaque formulaire de quizz: lorsque l'utilisateur soumet ses réponses, le code traite les réponses et envoie les statistiques à un serveur. + +Sélectionneurs DOM (Document Object Model) +------------------------------------------ + +- document.querySelectorAll('div.quizz'): sélectionne tous les éléments HTML avec la classe quizz qui contiennent des questions de quizz. +- document.querySelectorAll('form.quizz'): sélectionne tous les éléments HTML avec la classe quizz qui sont des formulaires de quizz. + + +Base de données +=============== + +Représentation en base de donnée des quiz +----------------------------------------- + +- Le modèle QuizzQuestion contient les champs pour stocker une URL, la question et le type de question. Le type de question est un champ de texte avec une taille maximale de 15 caractères et une valeur par défaut de "qcm". +- Le modèle QuizzAvailableAnswer contient les champs pour stocker le libellé de la réponse, un indicateur pour savoir si c'est la bonne réponse, et une clé étrangère pour lier la réponse à la question correspondante dans le modèle QuizzQuestion. +- Le modèle QuizzUserAnswer contient les champs pour stocker une réponse donnée par l'utilisateur, la date de la réponse, et des clés étrangères pour lier la réponse à la question correspondante dans le modèle QuizzQuestion et au contenu publié associé. + +Commentaires sur les factories +------------------------------ + +- La classe QuizzQuestionFactory utilise la bibliothèque Python faker pour générer une URL, une question et un type de questions aléatoires. Le type de question est choisi parmi une liste de valeurs possibles ('qcm', 'open', 'bool'). +- La classe QuizzAvailableAnswerFactory génère des réponses possibles à une question de quiz. Elle utilise également faker pour générer une étiquette de réponse et un booléen pour indiquer si la réponse est correcte ou non. La clé étrangère related_question est une sous-factory qui crée une instance de QuizzQuestion. +- La classe QuizzUserAnswerFactory génère des réponses d'utilisateurs à des questions de quiz. Elle utilise une sous-factory pour créer une instance de PublishableContentFactory, un champ de réponse aléatoire et une clé étrangère related_question qui est une sous-factory pour créer une instance de QuizzQuestion. Le champ full_answer_id est généré à l'aide de faker pour simuler un identifiant unique. + + +Commentaires sur les tests +-------------------------- + +- test_question_count() : vérifie que deux questions ont été créées dans la base de données. +- test_answer_count() : vérifie que quatre réponses ont été créées dans la base de données. +- test_user_answer_count() : vérifie que deux réponses d'utilisateur ont été créées dans la base de données. +- test_related_user_answers() : vérifie que les réponses d'utilisateur sont bien liées aux bonnes questions. +- test_related_answers() : vérifie que les réponses disponibles sont bien liées aux bonnes questions. +- test_answer_is_good() : vérifie qu'au moins une réponse disponible pour chaque question est marquée comme bonne. +- test_user_answer_unique_id() : vérifie que chaque réponse d'utilisateur a un ID unique. +- test_nb_good_answers() : vérifie qu'il y a bien 2 bonnes et 2 mauvaises réponses pour une question qui a plusieurs réponses possibles. \ No newline at end of file diff --git a/templates/misc/quizz.graph.part.html b/templates/misc/quizz.graph.part.html new file mode 100644 index 0000000000..139d3a6eb1 --- /dev/null +++ b/templates/misc/quizz.graph.part.html @@ -0,0 +1,33 @@ +{% load i18n %} +{% load emarkdown%} + + +
+ {% for quizz_name, questions in quizz.items %} +
+

{{ quizz_name }}

+ +
+ {% for question, stats in questions.items %} +
+
+

{% trans graph_title %} {{ question|emarkdown }}

+ +
+ +
+ {% endfor %} + {% endfor %} +
diff --git a/templates/tutorialv2/create/extract.html b/templates/tutorialv2/create/extract.html index d8ddb99b98..46efdb3562 100644 --- a/templates/tutorialv2/create/extract.html +++ b/templates/tutorialv2/create/extract.html @@ -4,14 +4,22 @@ {% block title %} + {% if quizz %} + {% trans "Nouveau quizz" %} + {% else %} {% trans "Nouvelle section" %} + {% endif %} {% endblock %} {% block headline %}

- {% trans "Nouvelle section" %} + {% if quizz %} + {% trans "Nouveau quizz" %} + {% else %} + {% trans "Nouvelle section" %} + {% endif %}

{% endblock %} @@ -29,7 +37,11 @@

  • {{ container.title }}
  • -
  • {% trans "Nouvelle section" %}
  • +
  • {% if quizz %} + {% trans "Nouveau quizz" %} + {% else %} + {% trans "Nouvelle section" %} + {% endif %}
  • {% endblock %} diff --git a/templates/tutorialv2/export/chapter.html b/templates/tutorialv2/export/chapter.html index 7178530b82..de6e0f4155 100644 --- a/templates/tutorialv2/export/chapter.html +++ b/templates/tutorialv2/export/chapter.html @@ -1,3 +1,4 @@ +{% load i18n %} {# this template will be used to generate the HTML file for each container ! #} @@ -24,7 +25,8 @@

    {% if rendered_extract.text %} -
    +
    {{ rendered_extract.text|safe }}
    {% endif %} diff --git a/templates/tutorialv2/stats/index.html b/templates/tutorialv2/stats/index.html index eca63b1a25..1ed12c0be7 100644 --- a/templates/tutorialv2/stats/index.html +++ b/templates/tutorialv2/stats/index.html @@ -47,11 +47,14 @@

    {% trans "Pages vues" %} {% trans "Temps moyen de lecture" %} {% trans "Nombre de visiteurs uniques" %} +

    {% include "misc/graph.part.html" with tab_name="tab-view-graph-content" graph_title="Évolution des pages vues sur le contenu" canvas_id="view-graph" report_key="nb_hits" y_label="Nombre de pages" %} {% include "misc/graph.part.html" with tab_name="tab-visit-time-graph-content" graph_title="Évolution du temps moyen lecture (en secondes)" canvas_id="visit-time-graph" report_key="avg_time_on_page" y_label="Secondes" %} {% include "misc/graph.part.html" with tab_name="tab-users-graph-content" graph_title="Évolution du nombre de visiteurs uniques" canvas_id="users-graph" report_key="nb_uniq_visitors" y_label="Nombre de visiteurs" %} + + {% endif %} {% if cumulative_stats %} @@ -175,6 +178,14 @@

    {% trans "Vues" %}

    {% block sidebar %} {% endblock sidebar %} diff --git a/templates/tutorialv2/stats/quizz_stats.html b/templates/tutorialv2/stats/quizz_stats.html new file mode 100644 index 0000000000..c1ca595c8f --- /dev/null +++ b/templates/tutorialv2/stats/quizz_stats.html @@ -0,0 +1,98 @@ +{% extends "tutorialv2/base.html" %} +{% load i18n %} +{% load crispy_forms_tags %} +{% load append_query_params %} +{% load datedelta_from_day %} +{% load seconds_to_duration %} +{% load static %} + +{% block title %} + {% trans "Statistiques du contenu" %} +{% endblock %} + +{% block breadcrumb %} +
  • {% trans "Statistiques" %}
  • +
  • {{ content.title }}
  • +{% endblock %} + +{% block content_out %} + {% include "misc/quizz.graph.part.html" with tab_name="tab-quizz-content" graph_title="Réponses à la question :" canvas_id="quizz-graph" metric="quizz" %} +{% endblock %} + + +{% block sidebar %} + +{% endblock sidebar %} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 3eebb5eaa6..64ff6c5dd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,19 +2,31 @@ # yarn lockfile v1 +<<<<<<< HEAD +"@es-joy/jsdoccomment@~0.31.0": + version "0.31.0" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz#dbc342cc38eb6878c12727985e693eaef34302bc" +======= "@es-joy/jsdoccomment@~0.36.1": version "0.36.1" resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz" integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: comment-parser "1.3.1" esquery "^1.4.0" jsdoc-type-pratt-parser "~3.1.0" +<<<<<<< HEAD +"@eslint/eslintrc@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d" +======= "@eslint/eslintrc@^1.4.1": version "1.4.1" resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz" integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -26,6 +38,31 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +<<<<<<< HEAD +"@humanwhocodes/config-array@^0.10.4": + version "0.10.4" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c" + dependencies: + "@humanwhocodes/object-schema" "^1.2.1" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/gitignore-to-minimatch@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" +======= "@humanwhocodes/config-array@^0.11.8": version "0.11.8" resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz" @@ -49,12 +86,20 @@ version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + +"@nodelib/fs.walk@^1.2.3": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2" +======= resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -62,6 +107,7 @@ version "1.2.7" resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz" integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" @@ -76,6 +122,17 @@ "@sindresorhus/is@^0.7.0": version "0.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + +"@types/codemirror@^5.60.4": + version "5.60.5" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7" +======= resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== @@ -88,11 +145,19 @@ version "5.60.5" resolved "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.5.tgz" integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/tern" "*" "@types/estree@*": version "0.0.51" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" +======= resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== @@ -100,12 +165,36 @@ version "7.2.0" resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz" integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/minimatch" "*" "@types/node" "*" "@types/json5@^0.0.29": version "0.0.29" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + +"@types/marked@^4.0.1": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.2.tgz#cb2dbf10da2f41cf20bd91fb5f89b67540c282f7" + +"@types/minimatch@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + +"@types/node@*": + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" + +"@types/q@^1.5.1": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + +"@types/tern@*": + version "0.23.4" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" +======= resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= @@ -133,11 +222,23 @@ version "0.23.4" resolved "https://registry.npmjs.org/@types/tern/-/tern-0.23.4.tgz" integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/estree" "*" acorn-jsx@^5.3.2: version "5.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + +acorn@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" +======= resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -150,14 +251,19 @@ aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: clean-stack "^2.0.0" indent-string "^4.0.0" ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" +======= resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -166,20 +272,47 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: ansi-colors@^1.0.1: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9" +======= resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz" integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-wrap "^0.1.0" ansi-gray@^0.1.1: version "0.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" +======= resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz" integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-wrap "0.1.0" ansi-regex@^2.0.0: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" +======= resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= @@ -202,18 +335,30 @@ ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: color-convert "^1.9.0" ansi-styles@^4.1.0: version "4.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" +======= resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: color-convert "^2.0.1" ansi-wrap@0.1.0, ansi-wrap@^0.1.0: version "0.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" +======= resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz" integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= @@ -221,27 +366,43 @@ anymatch@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz" integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: micromatch "^3.1.4" normalize-path "^2.1.1" anymatch@~3.1.1: version "3.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" +======= resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" append-buffer@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" +======= resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz" integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer-equal "^1.0.0" arch@^2.1.0: version "2.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + +archive-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70" +======= resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== @@ -249,11 +410,19 @@ archive-type@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz" integrity sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: file-type "^4.2.0" archy@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" +======= resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz" integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== @@ -261,11 +430,23 @@ argparse@^1.0.7: version "1.0.10" resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: sprintf-js "~1.0.2" argparse@^2.0.1: version "2.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-filter@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee" +======= resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== @@ -278,11 +459,19 @@ arr-filter@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz" integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: make-iterator "^1.0.0" arr-flatten@^1.0.1, arr-flatten@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +arr-map@^2.0.0, arr-map@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4" +======= resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== @@ -290,11 +479,27 @@ arr-map@^2.0.0, arr-map@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz" integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: make-iterator "^1.0.0" arr-union@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + +array-each@^1.0.0, array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + +array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" +======= resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= @@ -312,6 +517,7 @@ array-includes@^3.1.4: version "3.1.4" resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" @@ -321,21 +527,36 @@ array-includes@^3.1.4: array-initial@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" +======= resolved "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz" integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-slice "^1.0.0" is-number "^4.0.0" array-last@^1.1.1: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336" +======= resolved "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz" integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-number "^4.0.0" array-slice@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" +======= resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz" integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== @@ -343,6 +564,7 @@ array-sort@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz" integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: default-compare "^1.0.0" get-value "^2.0.6" @@ -350,6 +572,17 @@ array-sort@^1.0.0: array-union@^2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + +array.prototype.flat@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13" +======= resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== @@ -362,6 +595,7 @@ array.prototype.flat@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz" integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" @@ -369,13 +603,28 @@ array.prototype.flat@^1.2.5: asn1@~0.2.3: version "0.2.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" +======= resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz" integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: safer-buffer "~2.1.0" assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +async-done@^1.2.0, async-done@^1.2.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2" +======= resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= @@ -388,6 +637,7 @@ async-done@^1.2.0, async-done@^1.2.2: version "1.3.2" resolved "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz" integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: end-of-stream "^1.1.0" once "^1.3.2" @@ -396,6 +646,13 @@ async-done@^1.2.0, async-done@^1.2.2: async-each@^1.0.1: version "1.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + +async-settle@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b" +======= resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== @@ -403,11 +660,31 @@ async-settle@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz" integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: async-done "^1.2.2" async@~0.9.0: version "0.9.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + +async@~3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + +autoprefixer@10.4.8: + version "10.4.8" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5" +======= resolved "https://registry.npmjs.org/async/-/async-0.9.2.tgz" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= @@ -430,6 +707,7 @@ autoprefixer@10.4.13: version "10.4.13" resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz" integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" caniuse-lite "^1.0.30001426" @@ -440,6 +718,17 @@ autoprefixer@10.4.13: aws-sign2@~0.7.0: version "0.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.8.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + +bach@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880" +======= resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz" integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= @@ -452,6 +741,7 @@ bach@^1.0.0: version "1.2.0" resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz" integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-filter "^1.1.1" arr-flatten "^1.0.1" @@ -465,6 +755,17 @@ bach@^1.0.0: balanced-match@^1.0.0: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" +======= resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== @@ -477,6 +778,7 @@ base@^0.11.1: version "0.11.2" resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz" integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cache-base "^1.0.1" class-utils "^0.3.5" @@ -488,15 +790,23 @@ base@^0.11.1: bcrypt-pbkdf@^1.0.0: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" +======= resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz" integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: tweetnacl "^0.14.3" bin-build@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz#c5780a25a8a9f966d8244217e6c1f5082a143861" +======= resolved "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz" integrity sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decompress "^4.0.0" download "^6.2.2" @@ -506,14 +816,25 @@ bin-build@^3.0.0: bin-check@^4.1.0: version "4.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz#fc495970bdc88bb1d5a35fc17e65c4a149fc4a49" +======= resolved "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz" integrity sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: execa "^0.7.0" executable "^4.1.0" bin-pack@~1.0.1: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bin-pack/-/bin-pack-1.0.2.tgz#c2a014edbf0bed70a3292062ed46577b96120679" + +bin-version-check@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-4.0.0.tgz#7d819c62496991f80d893e6e02a3032361608f71" +======= resolved "https://registry.npmjs.org/bin-pack/-/bin-pack-1.0.2.tgz" integrity sha1-wqAU7b8L7XCjKSBi7UZXe5YSBnk= @@ -521,6 +842,7 @@ bin-version-check@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz" integrity sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-version "^3.0.0" semver "^5.6.0" @@ -528,16 +850,24 @@ bin-version-check@^4.0.0: bin-version@^3.0.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-3.1.0.tgz#5b09eb280752b1bd28f0c9db3f96f2f43b6c0839" +======= resolved "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz" integrity sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: execa "^1.0.0" find-versions "^3.0.0" bin-wrapper@^4.0.0: version "4.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605" +======= resolved "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz" integrity sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-check "^4.1.0" bin-version-check "^4.0.0" @@ -548,6 +878,13 @@ bin-wrapper@^4.0.0: binary-extensions@^1.0.0: version "1.13.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" +======= resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== @@ -555,24 +892,35 @@ binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== dependencies: file-uri-to-path "1.0.0" bl@^1.0.0: version "1.2.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" +======= resolved "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz" integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "^2.3.5" safe-buffer "^5.1.1" boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" +======= resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= @@ -580,14 +928,19 @@ brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: balanced-match "^1.0.0" concat-map "0.0.1" braces@^2.3.1, braces@^2.3.2: version "2.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" +======= resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-flatten "^1.1.0" array-unique "^0.3.2" @@ -602,6 +955,18 @@ braces@^2.3.1, braces@^2.3.2: braces@^3.0.1, braces@~3.0.2: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + dependencies: + fill-range "^7.0.1" + +browserslist@^4.0.0, browserslist@^4.16.6, browserslist@^4.20.3, browserslist@^4.21.3: + version "4.21.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" + dependencies: + caniuse-lite "^1.0.30001370" + electron-to-chromium "^1.4.202" +======= resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: @@ -625,11 +990,19 @@ browserslist@^4.21.4: dependencies: caniuse-lite "^1.0.30001400" electron-to-chromium "^1.4.251" +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 node-releases "^2.0.6" update-browserslist-db "^1.0.9" buffer-alloc-unsafe@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" +======= resolved "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz" integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== @@ -637,12 +1010,32 @@ buffer-alloc@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz" integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" buffer-crc32@~0.2.3: version "0.2.13" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + +buffer-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + +buffer@^5.2.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" +======= resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= @@ -665,21 +1058,30 @@ buffer@^5.2.1: version "5.7.1" resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: base64-js "^1.3.1" ieee754 "^1.1.13" builtins@^5.0.1: version "5.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" +======= resolved "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz" integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: semver "^7.0.0" cache-base@^1.0.1: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" +======= resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz" integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: collection-visit "^1.0.0" component-emitter "^1.2.1" @@ -693,8 +1095,12 @@ cache-base@^1.0.1: cacheable-request@^2.1.1: version "2.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d" +======= resolved "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz" integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: clone-response "1.0.2" get-stream "3.0.0" @@ -706,14 +1112,25 @@ cacheable-request@^2.1.1: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" +======= resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: function-bind "^1.1.1" get-intrinsic "^1.0.2" callsites@^3.0.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + +camelcase-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" +======= resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== @@ -721,12 +1138,24 @@ camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz" integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: camelcase "^2.0.0" map-obj "^1.0.0" camelcase@^2.0.0: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + +camelcase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" +======= resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= @@ -739,16 +1168,23 @@ caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz" integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.0.0" caniuse-lite "^1.0.0" lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" +<<<<<<< HEAD +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373: + version "1.0.30001390" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f" +======= caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219: version "1.0.30001390" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz" integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: version "1.0.30001442" @@ -757,6 +1193,13 @@ caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: caseless@~0.12.0: version "0.12.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +caw@^2.0.0, caw@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95" +======= resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= @@ -764,6 +1207,7 @@ caw@^2.0.0, caw@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz" integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-proxy "^2.0.0" isurl "^1.0.0-alpha5" @@ -772,8 +1216,12 @@ caw@^2.0.0, caw@^2.0.1: chalk@^1.0.0: version "1.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" +======= resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -783,8 +1231,12 @@ chalk@^1.0.0: chalk@^2.3.0, chalk@^2.4.1: version "2.4.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" +======= resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -792,22 +1244,41 @@ chalk@^2.3.0, chalk@^2.4.1: chalk@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" +======= resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz" integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" chalk@^4.0.0: version "4.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" +======= resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" chart.js@3.9.1: version "3.9.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.9.1.tgz#3abf2c775169c4c71217a107163ac708515924b8" + +chartjs-adapter-moment@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.0.tgz#9174b1093c68bcfe285aff24f7388ad60d44e8f7" + +"chokidar@>=3.0.0 <4.0.0": + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" +======= resolved "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz" integrity sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w== @@ -820,6 +1291,7 @@ chartjs-adapter-moment@1.0.1: version "3.5.1" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz" integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -833,8 +1305,12 @@ chartjs-adapter-moment@1.0.1: chokidar@^2.0.0: version "2.1.8" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" +======= resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: anymatch "^2.0.0" async-each "^1.0.1" @@ -852,8 +1328,12 @@ chokidar@^2.0.0: class-utils@^0.3.5: version "0.3.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" +======= resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz" integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-union "^3.1.0" define-property "^0.2.5" @@ -862,6 +1342,13 @@ class-utils@^0.3.5: clean-stack@^2.0.0: version "2.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" +======= resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== @@ -869,6 +1356,7 @@ cliui@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" @@ -876,6 +1364,13 @@ cliui@^3.2.0: clone-buffer@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + +clone-response@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" +======= resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz" integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= @@ -883,11 +1378,31 @@ clone-response@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz" integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mimic-response "^1.0.0" clone-stats@^0.0.1: version "0.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" + +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + +clone@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + +cloneable-readable@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" +======= resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= @@ -910,6 +1425,7 @@ cloneable-readable@^1.0.0: version "1.1.3" resolved "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz" integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: inherits "^2.0.1" process-nextick-args "^2.0.0" @@ -917,8 +1433,12 @@ cloneable-readable@^1.0.0: coa@^2.0.2: version "2.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" +======= resolved "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz" integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/q" "^1.5.1" chalk "^2.4.1" @@ -926,6 +1446,13 @@ coa@^2.0.2: code-point-at@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +codemirror-spell-checker@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" +======= resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= @@ -933,11 +1460,19 @@ codemirror-spell-checker@1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz" integrity sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: typo-js "*" codemirror@^5.63.1: version "5.65.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.1.tgz#5988a812c974c467f964bcc1a00c944e373de502" + +collection-map@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" +======= resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz" integrity sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA== @@ -945,6 +1480,7 @@ collection-map@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz" integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-map "^2.0.2" for-own "^1.0.0" @@ -952,28 +1488,59 @@ collection-map@^1.0.0: collection-visit@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" +======= resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz" integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: map-visit "^1.0.0" object-visit "^1.0.0" color-convert@^1.9.0: version "1.9.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" +======= resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: color-name "1.1.3" color-convert@^2.0.1: version "2.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" +======= resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: color-name "~1.1.4" color-name@1.1.3: version "1.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + +colord@^2.9.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" +======= resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= @@ -1001,11 +1568,35 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: delayed-stream "~1.0.0" commander@^2.20.0, commander@^2.8.1: version "2.20.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + +commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + +comment-parser@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b" + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +concat-stream@^1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" +======= resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1033,6 +1624,7 @@ concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer-from "^1.0.0" inherits "^2.0.3" @@ -1041,8 +1633,12 @@ concat-stream@^1.6.0: concat-stream@~1.5.1: version "1.5.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" +======= resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz" integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: inherits "~2.0.1" readable-stream "~2.0.0" @@ -1050,21 +1646,36 @@ concat-stream@~1.5.1: concat-with-sourcemaps@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" +======= resolved "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz" integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: source-map "^0.6.1" config-chain@^1.1.11: version "1.1.13" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" +======= resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz" integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ini "^1.3.4" proto-list "~1.2.1" console-stream@^0.1.1: version "0.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44" + +content-disposition@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" +======= resolved "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz" integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ= @@ -1072,25 +1683,41 @@ content-disposition@^0.5.2: version "0.5.3" resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz" integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: safe-buffer "5.1.2" contentstream@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/contentstream/-/contentstream-1.0.0.tgz#0bdcfa46da30464a86ce8fa7ece565410dc6f9a5" +======= resolved "https://registry.npmjs.org/contentstream/-/contentstream-1.0.0.tgz" integrity sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "~1.0.33-1" convert-source-map@^1.5.0: version "1.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" +======= resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: safe-buffer "~5.1.1" copy-descriptor@^0.1.0: version "0.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +copy-props@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2" +======= resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= @@ -1098,12 +1725,20 @@ copy-props@^2.0.1: version "2.0.5" resolved "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz" integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: each-props "^1.3.2" is-plain-object "^5.0.0" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" +======= resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -1111,6 +1746,7 @@ cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz" integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: lru-cache "^4.0.1" shebang-command "^1.2.0" @@ -1118,8 +1754,12 @@ cross-spawn@^5.0.1: cross-spawn@^6.0.0: version "6.0.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" +======= resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: nice-try "^1.0.4" path-key "^2.0.1" @@ -1129,13 +1769,30 @@ cross-spawn@^6.0.0: cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" +======= resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-key "^3.1.0" shebang-command "^2.0.0" which "^2.0.1" +<<<<<<< HEAD +css-declaration-sorter@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14" + +css-select-base-adapter@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + +css-select@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" +======= css-declaration-sorter@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz" @@ -1150,6 +1807,7 @@ css-select@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: boolbase "^1.0.0" css-what "^3.2.1" @@ -1158,8 +1816,12 @@ css-select@^2.0.0: css-select@^4.1.3: version "4.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" +======= resolved "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz" integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: boolbase "^1.0.0" css-what "^5.1.0" @@ -1169,22 +1831,45 @@ css-select@^4.1.3: css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" +======= resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz" integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mdn-data "2.0.4" source-map "^0.6.1" css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" +======= resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz" integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mdn-data "2.0.14" source-map "^0.6.1" css-what@^3.2.1: version "3.4.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + +css-what@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + +cssnano-preset-default@^5.2.12: + version "5.2.12" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz#ebe6596ec7030e62c3eb2b3c09f533c0644a9a97" +======= resolved "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== @@ -1202,6 +1887,7 @@ cssnano-preset-default@^5.2.13: version "5.2.13" resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz" integrity sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: css-declaration-sorter "^6.3.1" cssnano-utils "^3.1.0" @@ -1235,6 +1921,13 @@ cssnano-preset-default@^5.2.13: cssnano-utils@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" + +cssnano@5.1.13: + version "5.1.13" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.13.tgz#83d0926e72955332dc4802a7070296e6258efc0a" +======= resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== @@ -1242,6 +1935,7 @@ cssnano@5.1.14: version "5.1.14" resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz" integrity sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cssnano-preset-default "^5.2.13" lilconfig "^2.0.3" @@ -1249,42 +1943,69 @@ cssnano@5.1.14: csso@^4.0.2, csso@^4.2.0: version "4.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" +======= resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz" integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: css-tree "^1.1.2" currently-unhandled@^0.4.1: version "0.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" +======= resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz" integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-find-index "^1.0.1" cwise-compiler@^1.0.0, cwise-compiler@^1.1.2: version "1.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5" +======= resolved "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz" integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: uniq "^1.0.0" d@1, d@^1.0.1: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" +======= resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz" integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: es5-ext "^0.10.50" type "^1.0.1" dashdash@^1.12.0: version "1.14.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" +======= resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assert-plus "^1.0.0" data-uri-to-buffer@0.0.3: version "0.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a" + +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" +======= resolved "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz" integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo= @@ -1292,11 +2013,21 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ms "2.0.0" debug@^3.2.7: version "3.2.7" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + dependencies: + ms "^2.1.1" + +debug@^4.1.1, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" +======= resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: @@ -1306,11 +2037,15 @@ debug@^4.1.1: version "4.3.1" resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ms "2.1.2" debug@^4.3.2: version "4.3.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" +======= resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: @@ -1320,12 +2055,24 @@ debug@^4.3.4: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ms "2.1.2" decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" - resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + +decompress-response@^3.2.0, decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" +======= + resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decode-uri-component@^0.2.0: @@ -1337,13 +2084,18 @@ decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mimic-response "^1.0.0" decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: version "4.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" +======= resolved "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz" integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: file-type "^5.2.0" is-stream "^1.1.0" @@ -1351,8 +2103,12 @@ decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: decompress-tarbz2@^4.0.0: version "4.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" +======= resolved "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz" integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decompress-tar "^4.1.0" file-type "^6.1.0" @@ -1362,8 +2118,12 @@ decompress-tarbz2@^4.0.0: decompress-targz@^4.0.0: version "4.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" +======= resolved "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz" integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decompress-tar "^4.1.1" file-type "^5.2.0" @@ -1371,8 +2131,12 @@ decompress-targz@^4.0.0: decompress-unzip@^4.0.1: version "4.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" +======= resolved "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz" integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: file-type "^3.8.0" get-stream "^2.2.0" @@ -1381,8 +2145,12 @@ decompress-unzip@^4.0.1: decompress@^4.0.0, decompress@^4.2.0: version "4.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" +======= resolved "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz" integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decompress-tar "^4.0.0" decompress-tarbz2 "^4.0.0" @@ -1395,6 +2163,13 @@ decompress@^4.0.0, decompress@^4.2.0: deep-is@^0.1.3: version "0.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" +======= resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== @@ -1402,11 +2177,19 @@ default-compare@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz" integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^5.0.2" default-resolution@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684" + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" +======= resolved "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz" integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ= @@ -1414,35 +2197,52 @@ define-properties@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: object-keys "^1.0.12" define-property@^0.2.5: version "0.2.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" +======= resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-descriptor "^0.1.0" define-property@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" +======= resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz" integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-descriptor "^1.0.0" define-property@^2.0.2: version "2.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" +======= resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz" integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-descriptor "^1.0.2" isobject "^3.0.1" del@6.1.1: version "6.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" +======= resolved "https://registry.npmjs.org/del/-/del-6.1.1.tgz" integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: globby "^11.0.1" graceful-fs "^4.2.4" @@ -1455,6 +2255,17 @@ del@6.1.1: delayed-stream@~1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" +======= resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= @@ -1467,35 +2278,52 @@ dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-type "^4.0.0" doctrine@^2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" +======= resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz" integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: esutils "^2.0.2" doctrine@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" +======= resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz" integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: esutils "^2.0.2" dom-serializer@0: version "0.2.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" +======= resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: domelementtype "^2.0.1" entities "^2.0.0" dom-serializer@^1.0.1: version "1.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" +======= resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz" integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: domelementtype "^2.0.1" domhandler "^4.2.0" @@ -1503,6 +2331,17 @@ dom-serializer@^1.0.1: domelementtype@1: version "1.3.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + +domhandler@^4.2.0, domhandler@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" +======= resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== @@ -1522,21 +2361,30 @@ domhandler@^4.3.0: version "4.3.0" resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz" integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: domelementtype "^2.2.0" domutils@^1.7.0: version "1.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" +======= resolved "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz" integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: dom-serializer "0" domelementtype "1" domutils@^2.8.0: version "2.8.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" +======= resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: dom-serializer "^1.0.1" domelementtype "^2.2.0" @@ -1544,8 +2392,12 @@ domutils@^2.8.0: download@^6.2.2: version "6.2.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714" +======= resolved "https://registry.npmjs.org/download/-/download-6.2.5.tgz" integrity sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: caw "^2.0.0" content-disposition "^0.5.2" @@ -1561,8 +2413,12 @@ download@^6.2.2: download@^7.1.0: version "7.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233" +======= resolved "https://registry.npmjs.org/download/-/download-7.1.0.tgz" integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: archive-type "^4.0.0" caw "^2.0.1" @@ -1579,6 +2435,13 @@ download@^7.1.0: duplexer3@^0.1.4: version "0.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + +duplexify@^3.6.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" +======= resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= @@ -1586,6 +2449,7 @@ duplexify@^3.6.0: version "3.7.1" resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz" integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: end-of-stream "^1.0.0" inherits "^2.0.1" @@ -1594,8 +2458,12 @@ duplexify@^3.6.0: duplexify@^4.1.1: version "4.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.1.tgz#7027dc374f157b122a8ae08c2d3ea4d2d953aa61" +======= resolved "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz" integrity sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: end-of-stream "^1.4.1" inherits "^2.0.3" @@ -1604,16 +2472,26 @@ duplexify@^4.1.1: each-props@^1.3.2: version "1.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333" +======= resolved "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz" integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-plain-object "^2.0.1" object.defaults "^1.1.0" +<<<<<<< HEAD +easymde@2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.17.0.tgz#07954ec374b2e4f873c505c2b7d82b08e8d7053c" +======= easymde@2.18.0: version "2.18.0" resolved "https://registry.npmjs.org/easymde/-/easymde-2.18.0.tgz" integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/codemirror" "^5.60.4" "@types/marked" "^4.0.7" @@ -1623,12 +2501,25 @@ easymde@2.18.0: ecc-jsbn@~0.1.1: version "0.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" +======= resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz" integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" +<<<<<<< HEAD +electron-to-chromium@^1.4.202: + version "1.4.243" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz#9d5f1b10eafd6e434b687a88f1e7b0441dee168a" + +end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" +======= electron-to-chromium@^1.3.723: version "1.3.752" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz" @@ -1643,11 +2534,19 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: once "^1.4.0" entities@^2.0.0: version "2.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + +error-ex@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" +======= resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== @@ -1655,13 +2554,18 @@ error-ex@^1.2.0: version "1.3.2" resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" +======= resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -1684,6 +2588,11 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: string.prototype.trimstart "^1.0.4" unbox-primitive "^1.0.1" +<<<<<<< HEAD +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" +======= es-abstract@^1.18.2: version "1.18.3" resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz" @@ -1710,6 +2619,7 @@ es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" @@ -1717,8 +2627,12 @@ es-to-primitive@^1.2.1: es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50: version "0.10.53" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" +======= resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz" integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: es6-iterator "~2.0.3" es6-symbol "~3.1.3" @@ -1726,8 +2640,12 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50: es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3: version "2.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" +======= resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz" integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: d "1" es5-ext "^0.10.35" @@ -1735,16 +2653,24 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3: es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" +======= resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: d "^1.0.1" ext "^1.1.2" es6-weak-map@^2.0.1: version "2.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" +======= resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz" integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: d "1" es5-ext "^0.10.46" @@ -1753,6 +2679,25 @@ es6-weak-map@^2.0.1: escalade@^3.1.1: version "3.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + +eslint-config-standard@17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf" + +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" +======= resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== @@ -1775,30 +2720,43 @@ eslint-import-resolver-node@^0.3.6: version "0.3.6" resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz" integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: debug "^3.2.7" resolve "^1.20.0" eslint-module-utils@^2.7.3: version "2.7.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" +======= resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: debug "^3.2.7" find-up "^2.1.0" eslint-plugin-es@^4.1.0: version "4.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9" +======= resolved "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz" integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: eslint-utils "^2.0.0" regexpp "^3.0.0" eslint-plugin-import@2.26.0: version "2.26.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" +======= resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz" integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" @@ -1814,10 +2772,16 @@ eslint-plugin-import@2.26.0: resolve "^1.22.0" tsconfig-paths "^3.14.1" +<<<<<<< HEAD +eslint-plugin-jsdoc@39.3.6: + version "39.3.6" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz#6ba29f32368d72a51335a3dc9ccd22ad0437665d" +======= eslint-plugin-jsdoc@39.6.4: version "39.6.4" resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.6.4.tgz" integrity sha512-fskvdLCfwmPjHb6e+xNGDtGgbF8X7cDwMtVLAP2WwSf9Htrx68OAx31BESBM1FAwsN2HTQyYQq7m4aW4Q4Nlag== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@es-joy/jsdoccomment" "~0.36.1" comment-parser "1.3.1" @@ -1827,10 +2791,16 @@ eslint-plugin-jsdoc@39.6.4: semver "^7.3.8" spdx-expression-parse "^3.0.1" +<<<<<<< HEAD +eslint-plugin-n@15.2.5: + version "15.2.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz#aa7ff8d45bb8bf2df8ea3b7d3774ae570cb794b8" +======= eslint-plugin-n@15.6.1: version "15.6.1" resolved "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz" integrity sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: builtins "^5.0.1" eslint-plugin-es "^4.1.0" @@ -1841,6 +2811,15 @@ eslint-plugin-n@15.6.1: resolve "^1.22.1" semver "^7.3.8" +<<<<<<< HEAD +eslint-plugin-promise@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz#a8cddf96a67c4059bdabf4d724a29572188ae423" + +eslint-scope@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" +======= eslint-plugin-promise@6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz" @@ -1850,26 +2829,50 @@ eslint-scope@^7.1.1: version "7.1.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz" integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" eslint-utils@^2.0.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" +======= resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: eslint-visitor-keys "^1.1.0" eslint-utils@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" +======= resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: eslint-visitor-keys "^2.0.0" eslint-visitor-keys@^1.1.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + +eslint@8.23.0: + version "8.23.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040" +======= resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== @@ -1887,6 +2890,7 @@ eslint@8.31.0: version "8.31.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz" integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@eslint/eslintrc" "^1.4.1" "@humanwhocodes/config-array" "^0.11.8" @@ -1930,8 +2934,12 @@ eslint@8.31.0: espree@^9.4.0: version "9.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" +======= resolved "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz" integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" @@ -1939,6 +2947,13 @@ espree@^9.4.0: esprima@^4.0.0: version "4.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" +======= resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -1946,18 +2961,34 @@ esquery@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: estraverse "^5.1.0" esrecurse@^4.3.0: version "4.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" +======= resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: estraverse "^5.2.0" estraverse@^5.1.0, estraverse@^5.2.0: version "5.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + +exec-buffer@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.2.0.tgz#b1686dbd904c7cf982e652c1f5a79b1e5573082b" +======= resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== @@ -1970,6 +3001,7 @@ exec-buffer@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz" integrity sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: execa "^0.7.0" p-finally "^1.0.0" @@ -1979,8 +3011,12 @@ exec-buffer@^3.0.0: execa@^0.7.0: version "0.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" +======= resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz" integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -1992,8 +3028,12 @@ execa@^0.7.0: execa@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" +======= resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz" integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cross-spawn "^6.0.0" get-stream "^4.0.0" @@ -2005,8 +3045,12 @@ execa@^1.0.0: execa@^5.0.0: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" +======= resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -2020,15 +3064,23 @@ execa@^5.0.0: executable@^4.1.0: version "4.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" +======= resolved "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz" integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pify "^2.2.0" expand-brackets@^2.1.4: version "2.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" +======= resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz" integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: debug "^2.3.3" define-property "^0.2.5" @@ -2040,50 +3092,81 @@ expand-brackets@^2.1.4: expand-tilde@^2.0.0, expand-tilde@^2.0.2: version "2.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" +======= resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz" integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: homedir-polyfill "^1.0.1" ext-list@^2.0.0: version "2.2.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" +======= resolved "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz" integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mime-db "^1.28.0" ext-name@^5.0.0: version "5.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" +======= resolved "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz" integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ext-list "^2.0.0" sort-keys-length "^1.0.0" ext@^1.1.2: version "1.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" +======= resolved "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz" integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: type "^2.0.0" extend-shallow@^2.0.1: version "2.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" +======= resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-extendable "^0.1.0" extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" +======= resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz" integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assign-symbols "^1.0.0" is-extendable "^1.0.1" extend@^3.0.0, extend@~3.0.2: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" +======= resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -2091,6 +3174,7 @@ extglob@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz" integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-unique "^0.3.2" define-property "^1.0.0" @@ -2103,6 +3187,13 @@ extglob@^2.0.4: extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +fancy-log@^1.3.2, fancy-log@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" +======= resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= @@ -2110,6 +3201,7 @@ fancy-log@^1.3.2, fancy-log@^1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz" integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-gray "^0.1.1" color-support "^1.1.3" @@ -2118,13 +3210,21 @@ fancy-log@^1.3.2, fancy-log@^1.3.3: fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" +======= resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 fast-glob@^3.0.3: version "3.2.11" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" +======= resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2134,8 +3234,12 @@ fast-glob@^3.0.3: fast-glob@^3.1.1: version "3.2.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" +======= resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz" integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2146,6 +3250,25 @@ fast-glob@^3.1.1: fast-json-stable-stringify@^2.0.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + +fast-levenshtein@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9" + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + +fast-xml-parser@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" + +fastq@^1.6.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" +======= resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -2168,33 +3291,73 @@ fastq@^1.6.0: version "1.11.0" resolved "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz" integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: reusify "^1.0.4" fd-slicer@~1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" +======= resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz" integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pend "~1.2.0" figures@^1.3.5: version "1.7.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" +======= resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: escape-string-regexp "^1.0.5" object-assign "^4.1.0" file-entry-cache@^6.0.1: version "6.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" +======= resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: flat-cache "^3.0.4" file-type@5.2.0, file-type@^5.2.0: version "5.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" + +file-type@^10.4.0: + version "10.11.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890" + +file-type@^12.0.0: + version "12.4.2" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9" + +file-type@^3.8.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + +file-type@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5" + +file-type@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" + +file-type@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c" +======= resolved "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz" integrity sha1-LdvqfHP/42No365J3DOMBYwritY= @@ -2227,14 +3390,21 @@ file-type@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz" integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filename-reserved-regex@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" + +filenamify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9" +======= resolved "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz" integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= @@ -2242,6 +3412,7 @@ filenamify@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz" integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: filename-reserved-regex "^2.0.0" strip-outer "^1.0.0" @@ -2249,8 +3420,12 @@ filenamify@^2.0.0: fill-range@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" +======= resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend-shallow "^2.0.1" is-number "^3.0.0" @@ -2259,45 +3434,69 @@ fill-range@^4.0.0: fill-range@^7.0.1: version "7.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" +======= resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: to-regex-range "^5.0.1" find-up@^1.0.0: version "1.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" +======= resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-exists "^2.0.0" pinkie-promise "^2.0.0" find-up@^2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" +======= resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: locate-path "^2.0.0" find-up@^5.0.0: version "5.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" +======= resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: locate-path "^6.0.0" path-exists "^4.0.0" find-versions@^3.0.0: version "3.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" +======= resolved "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz" integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: semver-regex "^2.0.0" findup-sync@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" +======= resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz" integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: detect-file "^1.0.0" is-glob "^3.1.0" @@ -2306,8 +3505,12 @@ findup-sync@^2.0.0: findup-sync@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" +======= resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz" integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: detect-file "^1.0.0" is-glob "^4.0.0" @@ -2316,8 +3519,12 @@ findup-sync@^3.0.0: fined@^1.0.1: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" +======= resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz" integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: expand-tilde "^2.0.2" is-plain-object "^2.0.3" @@ -2327,6 +3534,17 @@ fined@^1.0.1: first-chunk-stream@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" + +flagged-respawn@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" +======= resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz" integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= @@ -2339,12 +3557,20 @@ flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: flatted "^3.1.0" rimraf "^3.0.2" flatted@^3.1.0: version "3.2.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + +flush-write-stream@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" +======= resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== @@ -2352,12 +3578,20 @@ flush-write-stream@^1.0.2: version "1.1.1" resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz" integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: inherits "^2.0.3" readable-stream "^2.3.6" for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" +======= resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= @@ -2365,11 +3599,23 @@ for-own@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz" integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: for-in "^1.0.1" forever-agent@~0.6.1: version "0.6.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +fork-stream@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/fork-stream/-/fork-stream-0.0.4.tgz#db849fce77f6708a5f8f386ae533a0907b54ae70" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" +======= resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= @@ -2382,6 +3628,7 @@ form-data@~2.3.2: version "2.3.3" resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz" integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: asynckit "^0.4.0" combined-stream "^1.0.6" @@ -2389,6 +3636,13 @@ form-data@~2.3.2: fraction.js@^4.2.0: version "4.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" +======= resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== @@ -2396,19 +3650,31 @@ fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz" integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: map-cache "^0.2.2" from2@^2.1.1: version "2.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" +======= resolved "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz" integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: inherits "^2.0.1" readable-stream "^2.0.0" fs-constants@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + +fs-mkdirp-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" +======= resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== @@ -2416,19 +3682,23 @@ fs-mkdirp-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz" integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: graceful-fs "^4.1.11" through2 "^2.0.3" fs.realpath@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" +======= resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 fsevents@^1.2.7: version "1.2.13" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== dependencies: bindings "^1.5.0" nan "^2.12.1" @@ -2436,10 +3706,24 @@ fsevents@^1.2.7: fsevents@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== function-bind@^1.1.1: version "1.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + +get-caller-file@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" +======= resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -2452,6 +3736,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -2459,8 +3744,12 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-pixels@~3.3.0: version "3.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03" +======= resolved "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.2.tgz" integrity sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: data-uri-to-buffer "0.0.3" jpeg-js "^0.3.2" @@ -2476,13 +3765,28 @@ get-pixels@~3.3.0: get-proxy@^2.0.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" +======= resolved "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz" integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: npm-conf "^1.1.0" get-stdin@^4.0.1: version "4.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + +get-stream@3.0.0, get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" +======= resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= @@ -2495,19 +3799,31 @@ get-stream@^2.2.0: version "2.3.1" resolved "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz" integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: object-assign "^4.0.1" pinkie-promise "^2.0.0" get-stream@^4.0.0: version "4.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" +======= resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pump "^3.0.0" get-stream@^6.0.0: version "6.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" +======= resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -2515,12 +3831,20 @@ get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" get-intrinsic "^1.1.1" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" +======= resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= @@ -2528,20 +3852,29 @@ getpass@^0.1.1: version "0.1.7" resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz" integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assert-plus "^1.0.0" gif-encoder@~0.4.1: version "0.4.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gif-encoder/-/gif-encoder-0.4.3.tgz#8a2b4fe8ca895a48e3a0b6cbb340a0a6a3571899" +======= resolved "https://registry.npmjs.org/gif-encoder/-/gif-encoder-0.4.3.tgz" integrity sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "~1.1.9" gifsicle@^5.0.0: version "5.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-5.2.0.tgz#b06b25ed7530f033f6ed2c545d6f9b546cc182fb" +======= resolved "https://registry.npmjs.org/gifsicle/-/gifsicle-5.2.0.tgz" integrity sha512-vOIS3j0XoTCxq9pkGj43gEix82RkI5FveNgaFZutjbaui/HH+4fR8Y56dwXDuxYo8hR4xOo6/j2h1WHoQW6XLw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-build "^3.0.0" bin-wrapper "^4.0.0" @@ -2550,30 +3883,46 @@ gifsicle@^5.0.0: glob-parent@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" +======= resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz" integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-glob "^3.1.0" path-dirname "^1.0.0" glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0: version "5.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" +======= resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-glob "^4.0.1" glob-parent@^6.0.2: version "6.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" +======= resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-glob "^4.0.3" glob-stream@^6.1.0: version "6.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" +======= resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz" integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend "^3.0.0" glob "^7.1.1" @@ -2588,8 +3937,12 @@ glob-stream@^6.1.0: glob-watcher@^5.0.3: version "5.0.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc" +======= resolved "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz" integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: anymatch "^2.0.0" async-done "^1.2.0" @@ -2601,8 +3954,12 @@ glob-watcher@^5.0.3: glob@^7.1.1, glob@^7.1.3: version "7.1.7" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" +======= resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2613,8 +3970,12 @@ glob@^7.1.1, glob@^7.1.3: global-modules@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" +======= resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz" integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: global-prefix "^1.0.1" is-windows "^1.0.1" @@ -2622,8 +3983,12 @@ global-modules@^1.0.0: global-prefix@^1.0.1: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" +======= resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz" integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: expand-tilde "^2.0.2" homedir-polyfill "^1.0.1" @@ -2631,17 +3996,27 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" +<<<<<<< HEAD +globals@^13.15.0: + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" +======= globals@^13.19.0: version "13.19.0" resolved "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz" integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: type-fest "^0.20.2" globby@^10.0.0: version "10.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" +======= resolved "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz" integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/glob" "^7.1.1" array-union "^2.1.0" @@ -2654,8 +4029,12 @@ globby@^10.0.0: globby@^11.0.1: version "11.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" +======= resolved "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz" integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -2664,17 +4043,38 @@ globby@^11.0.1: merge2 "^1.3.0" slash "^3.0.0" +<<<<<<< HEAD +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +glogg@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" +======= glogg@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz" integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: sparkles "^1.0.0" got@^7.0.0: version "7.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" +======= resolved "https://registry.npmjs.org/got/-/got-7.1.0.tgz" integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decompress-response "^3.2.0" duplexer3 "^0.1.4" @@ -2693,8 +4093,12 @@ got@^7.0.0: got@^8.3.1: version "8.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" +======= resolved "https://registry.npmjs.org/got/-/got-8.3.2.tgz" integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@sindresorhus/is" "^0.7.0" cacheable-request "^2.1.1" @@ -2714,8 +4118,19 @@ got@^8.3.1: url-parse-lax "^3.0.0" url-to-options "^1.0.1" -graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4: +graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.4: version "4.2.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + +gulp-cli@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f" +======= resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -2733,6 +4148,7 @@ gulp-cli@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz" integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-colors "^1.0.1" archy "^1.0.0" @@ -2755,8 +4171,12 @@ gulp-cli@^2.2.0: gulp-concat@2.6.1: version "2.6.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353" +======= resolved "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz" integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: concat-with-sourcemaps "^1.0.0" through2 "^2.0.0" @@ -2764,8 +4184,12 @@ gulp-concat@2.6.1: gulp-dart-sass@1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz#20e33c236b48d557c91e8dfe67a2aef2b8a2e328" +======= resolved "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz" integrity sha512-8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: chalk "^2.3.0" lodash.clonedeep "^4.3.2" @@ -2778,8 +4202,12 @@ gulp-dart-sass@1.0.2: gulp-if@3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-if/-/gulp-if-3.0.0.tgz#6c3e7edc8bafadc34f2ebecb314bf43324ba1e40" +======= resolved "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz" integrity sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: gulp-match "^1.1.0" ternary-stream "^3.0.0" @@ -2787,8 +4215,12 @@ gulp-if@3.0.0: gulp-imagemin@7.1.0: version "7.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-imagemin/-/gulp-imagemin-7.1.0.tgz#d1810a908fb64b4fbf15a750d303d988443e68cf" +======= resolved "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-7.1.0.tgz" integrity sha512-6xBTNybmPY2YrvrhhlS8Mxi0zn0ypusLon63p9XXxDtIf7U7c6KcViz94K7Skosucr3378A6IY2kJSjJyuwylQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: chalk "^3.0.0" fancy-log "^1.3.2" @@ -2805,13 +4237,24 @@ gulp-imagemin@7.1.0: gulp-match@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.1.0.tgz#552b7080fc006ee752c90563f9fec9d61aafdf4f" +======= resolved "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz" integrity sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: minimatch "^3.0.3" gulp-options@1.1.1: version "1.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-options/-/gulp-options-1.1.1.tgz#589676e1adfaa48deef633b79b86c169f2dbbb99" + +gulp-postcss@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-9.0.1.tgz#d43caa2f2ce1018f889f7c1296faf82e9928b66f" +======= resolved "https://registry.npmjs.org/gulp-options/-/gulp-options-1.1.1.tgz" integrity sha1-WJZ24a36pI3u9jO3m4bBafLbu5k= @@ -2819,6 +4262,7 @@ gulp-postcss@9.0.1: version "9.0.1" resolved "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz" integrity sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: fancy-log "^1.3.3" plugin-error "^1.0.1" @@ -2827,8 +4271,12 @@ gulp-postcss@9.0.1: gulp-terser-js@5.2.2: version "5.2.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp-terser-js/-/gulp-terser-js-5.2.2.tgz#3d93db9b2b83f35dfcc5b209af6b1762756eb6a3" +======= resolved "https://registry.npmjs.org/gulp-terser-js/-/gulp-terser-js-5.2.2.tgz" integrity sha512-4ull0HzTWeWjRPiGmAFmdhRcEDOG+r7aXivNHOBQzElLzMaeVKQwmCPDi2juBzUUkjAkPkKb1jHVoJN/PKTvcA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: plugin-error "^1.0.1" source-map "^0.7.3" @@ -2838,8 +4286,12 @@ gulp-terser-js@5.2.2: gulp.spritesmith@6.13.0: version "6.13.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp.spritesmith/-/gulp.spritesmith-6.13.0.tgz#9cfcff00288657050feb57639fb9356c55b37cea" +======= resolved "https://registry.npmjs.org/gulp.spritesmith/-/gulp.spritesmith-6.13.0.tgz" integrity sha512-maHC3FgCiOV+9wuLAgcqzq+oZjI8b57CgFVi0/r8Ax1AM2i51nEoKXtXM8RUh9ybTjT1mcGWNYzACDOK2hC8RQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: async "~3.2.3" minimatch "~3.0.3" @@ -2852,8 +4304,12 @@ gulp.spritesmith@6.13.0: gulp@4.0.2: version "4.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa" +======= resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz" integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: glob-watcher "^5.0.3" gulp-cli "^2.2.0" @@ -2862,13 +4318,24 @@ gulp@4.0.2: gulplog@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" +======= resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz" integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: glogg "^1.0.0" handlebars-layouts@^3.1.4: version "3.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/handlebars-layouts/-/handlebars-layouts-3.1.4.tgz#26b3beb931b4b877dfbf7e6feaf4058ee6228b02" + +handlebars@^4.6.0: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" +======= resolved "https://registry.npmjs.org/handlebars-layouts/-/handlebars-layouts-3.1.4.tgz" integrity sha1-JrO+uTG0uHffv35v6vQFjuYiiwI= @@ -2876,6 +4343,7 @@ handlebars@^4.6.0: version "4.7.7" resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: minimist "^1.2.5" neo-async "^2.6.0" @@ -2886,6 +4354,13 @@ handlebars@^4.6.0: har-schema@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" +======= resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= @@ -2893,19 +4368,47 @@ har-validator@~5.1.3: version "5.1.5" resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz" integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ajv "^6.12.3" har-schema "^2.0.0" has-ansi@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" +======= resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-regex "^2.0.0" has-bigints@^1.0.1: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + +has-symbol-support-x@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + +has-to-string-tag-x@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" +======= resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== @@ -2933,20 +4436,29 @@ has-to-string-tag-x@^1.2.0: version "1.4.1" resolved "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz" integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-symbol-support-x "^1.4.1" has-tostringtag@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" +======= resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-symbols "^1.0.2" has-value@^0.3.1: version "0.3.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" +======= resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz" integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-value "^2.0.3" has-values "^0.1.4" @@ -2954,8 +4466,12 @@ has-value@^0.3.1: has-value@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" +======= resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz" integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-value "^2.0.6" has-values "^1.0.0" @@ -2963,6 +4479,13 @@ has-value@^1.0.0: has-values@^0.1.4: version "0.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" +======= resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz" integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= @@ -2970,26 +4493,46 @@ has-values@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz" integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-number "^3.0.0" kind-of "^4.0.0" has@^1.0.3: version "1.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" +======= resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: function-bind "^1.1.1" homedir-polyfill@^1.0.1: version "1.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" +======= resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz" integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: version "2.8.9" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + +http-cache-semantics@3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" +======= resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== @@ -3002,6 +4545,7 @@ http-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz" integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" @@ -3009,6 +4553,21 @@ http-signature@~1.2.0: human-signals@^2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + +ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + +imagemin-gifsicle@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz#1a7ab136a144c4678657ba3b6c412f80805d26b0" +======= resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== @@ -3031,6 +4590,7 @@ imagemin-gifsicle@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz" integrity sha512-LaP38xhxAwS3W8PFh4y5iQ6feoTSF+dTAXFRUEYQWYst6Xd+9L/iPk34QGgK/VO/objmIlmq9TStGfVY2IcHIA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: execa "^1.0.0" gifsicle "^5.0.0" @@ -3038,8 +4598,12 @@ imagemin-gifsicle@^7.0.0: imagemin-mozjpeg@^8.0.0: version "8.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.0.tgz#d2ca4e8c982c7c6eda55069af89dee4c1cebcdfd" +======= resolved "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.0.tgz" integrity sha512-+EciPiIjCb8JWjQNr1q8sYWYf7GDCNDxPYnkD11TNIjjWNzaV+oTg4DpOPQjl5ZX/KRCPMEgS79zLYAQzLitIA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: execa "^1.0.0" is-jpg "^2.0.0" @@ -3047,8 +4611,12 @@ imagemin-mozjpeg@^8.0.0: imagemin-optipng@^7.0.0: version "7.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz#2225c82c35e5c29b7fa98d4f9ecee1161a68e888" +======= resolved "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz" integrity sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: exec-buffer "^3.0.0" is-png "^2.0.0" @@ -3056,16 +4624,24 @@ imagemin-optipng@^7.0.0: imagemin-svgo@^7.0.0: version "7.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz#528a42fd3d55eff5d4af8fd1113f25fb61ad6d9a" +======= resolved "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz" integrity sha512-0JlIZNWP0Luasn1HT82uB9nU9aa+vUj6kpT+MjPW11LbprXC+iC4HDwn1r4Q2/91qj4iy9tRZNsFySMlEpLdpg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-svg "^4.2.1" svgo "^1.3.2" imagemin@^7.0.0: version "7.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.1.tgz#f6441ca647197632e23db7d971fffbd530c87dbf" +======= resolved "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz" integrity sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: file-type "^12.0.0" globby "^10.0.0" @@ -3077,14 +4653,29 @@ imagemin@^7.0.0: import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" +======= resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" import-lazy@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +indent-string@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" +======= resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz" integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ== @@ -3097,11 +4688,19 @@ indent-string@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz" integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: repeating "^2.0.0" indent-string@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" +======= resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== @@ -3109,12 +4708,24 @@ inflight@^1.0.4: version "1.0.6" resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: once "^1.3.0" wrappy "1" inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" +======= resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -3127,6 +4738,7 @@ internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz" integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-intrinsic "^1.1.0" has "^1.0.3" @@ -3134,6 +4746,13 @@ internal-slot@^1.0.3: interpret@^1.4.0: version "1.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + +into-stream@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" +======= resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== @@ -3141,12 +4760,28 @@ into-stream@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz" integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: from2 "^2.1.1" p-is-promise "^1.1.0" invert-kv@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + +iota-array@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087" + +irregular-plurals@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-2.0.0.tgz#39d40f05b00f656d0b7fa471230dd3b714af2872" + +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" +======= resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= @@ -3164,26 +4799,46 @@ is-absolute@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz" integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-relative "^1.0.0" is-windows "^1.0.1" is-accessor-descriptor@^0.1.6: version "0.1.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" +======= resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz" integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^3.0.2" is-accessor-descriptor@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" +======= resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz" integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^6.0.0" is-arrayish@^0.2.1: version "0.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + +is-bigint@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" +======= resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= @@ -3196,25 +4851,45 @@ is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz" integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: binary-extensions "^1.0.0" is-binary-path@~2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" +======= resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: version "1.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" +======= resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz" integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" is-buffer@^1.0.2, is-buffer@^1.1.5: version "1.1.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + +is-core-module@^2.10.0, is-core-module@^2.9.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" +======= resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -3239,11 +4914,15 @@ is-core-module@^2.2.0: version "2.4.0" resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz" integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has "^1.0.3" is-core-module@^2.8.1: version "2.8.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" +======= resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: @@ -3253,25 +4932,41 @@ is-core-module@^2.9.0: version "2.9.0" resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz" integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has "^1.0.3" is-data-descriptor@^0.1.4: version "0.1.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" +======= resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz" integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^3.0.2" is-data-descriptor@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" +======= resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz" integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^6.0.0" is-date-object@^1.0.1: version "1.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" +======= resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz" integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== @@ -3279,6 +4974,7 @@ is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz" integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-accessor-descriptor "^0.1.6" is-data-descriptor "^0.1.4" @@ -3286,8 +4982,12 @@ is-descriptor@^0.1.0: is-descriptor@^1.0.0, is-descriptor@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" +======= resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz" integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-accessor-descriptor "^1.0.0" is-data-descriptor "^1.0.0" @@ -3295,6 +4995,13 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" +======= resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= @@ -3302,11 +5009,23 @@ is-extendable@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz" integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-plain-object "^2.0.4" is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" +======= resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= @@ -3319,40 +5038,80 @@ is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: number-is-nan "^1.0.0" is-gif@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-3.0.0.tgz#c4be60b26a301d695bb833b20d9b5d66c6cf83b1" +======= resolved "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz" integrity sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: file-type "^10.4.0" is-glob@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" +======= resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz" integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" +======= resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-extglob "^2.1.1" -is-glob@^4.0.3: +is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" +======= resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-extglob "^2.1.1" is-jpg@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97" + +is-natural-number@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" + +is-negated-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" + +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + +is-number-object@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" +======= + resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz" integrity sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc= is-natural-number@^4.0.1: @@ -3379,11 +5138,27 @@ is-number@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz" integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^3.0.2" is-number@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + +is-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" + +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" +======= resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz" integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== @@ -3401,9 +5176,21 @@ is-path-cwd@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 is-path-inside@^3.0.2, is-path-inside@^3.0.3: version "3.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" +======= resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== @@ -3416,11 +5203,23 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isobject "^3.0.1" is-plain-object@^5.0.0: version "5.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + +is-png@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d" + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" +======= resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== @@ -3441,19 +5240,43 @@ is-regex@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" has-tostringtag "^1.0.0" is-relative@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" +======= resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz" integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-unc-path "^1.0.0" is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + +is-stream@^1.0.0, is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" +======= resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== @@ -3481,25 +5304,41 @@ is-string@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-tostringtag "^1.0.0" is-svg@^4.2.1: version "4.3.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" +======= resolved "https://registry.npmjs.org/is-svg/-/is-svg-4.3.1.tgz" integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: fast-xml-parser "^3.19.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" +======= resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-symbols "^1.0.2" is-typedarray@~1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" +======= resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -3507,11 +5346,23 @@ is-unc-path@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz" integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: unc-path-regex "^0.1.2" is-utf8@^0.2.0, is-utf8@^0.2.1: version "0.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + +is-weakref@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" +======= resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= @@ -3524,11 +5375,31 @@ is-weakref@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" +======= resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== @@ -3551,11 +5422,23 @@ isobject@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isarray "1.0.0" isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +isurl@^1.0.0-alpha5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" +======= resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= @@ -3568,12 +5451,28 @@ isurl@^1.0.0-alpha5: version "1.0.0" resolved "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz" integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" jpeg-js@0.0.4: version "0.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e" + +jpeg-js@^0.3.2: + version "0.3.7" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.7.tgz#471a89d06011640592d314158608690172b1028d" + +jquery@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" +======= resolved "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.0.4.tgz" integrity sha1-Bqr0fv7HrwsZJKWc1pWm0rXthw4= @@ -3596,19 +5495,59 @@ js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: argparse "^1.0.7" esprima "^4.0.0" js-yaml@^4.1.0: version "4.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" +======= resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: argparse "^2.0.1" jsbn@~0.1.0: version "0.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +jsdoc-type-pratt-parser@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + +json-content-demux@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/json-content-demux/-/json-content-demux-0.1.4.tgz#6d573fbb5a2b224ae225736e287f32ea91a4273d" + +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" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" +======= resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= @@ -3651,13 +5590,18 @@ json5@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: minimist "^1.2.0" jsprim@^1.2.2: version "1.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" +======= resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assert-plus "1.0.0" extsprintf "1.3.0" @@ -3666,6 +5610,17 @@ jsprim@^1.2.2: junk@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" + +just-debounce@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf" + +keyv@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" +======= resolved "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz" integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== @@ -3678,25 +5633,45 @@ keyv@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz" integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: json-buffer "3.0.0" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" +======= resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-buffer "^1.1.5" kind-of@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" +======= resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-buffer "^1.1.5" kind-of@^5.0.0, kind-of@^5.0.2: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + +last-run@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b" +======= resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== @@ -3709,50 +5684,75 @@ last-run@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz" integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: default-resolution "^2.0.0" es6-weak-map "^2.0.1" layout@~2.2.0: version "2.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/layout/-/layout-2.2.0.tgz#31e44bfc18dd1019b3ffb208e402a4bbfe2e6af4" +======= resolved "https://registry.npmjs.org/layout/-/layout-2.2.0.tgz" integrity sha1-MeRL/BjdEBmz/7II5AKku/4uavQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-pack "~1.0.1" lazystream@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" +======= resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz" integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "^2.0.5" lcid@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" +======= resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: invert-kv "^1.0.0" lead@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" +======= resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz" integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: flush-write-stream "^1.0.2" levn@^0.4.1: version "0.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" +======= resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: prelude-ls "^1.2.1" type-check "~0.4.0" liftoff@^3.1.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" +======= resolved "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz" integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend "^3.0.0" findup-sync "^3.0.0" @@ -3765,6 +5765,13 @@ liftoff@^3.1.0: lilconfig@^2.0.3, lilconfig@^2.0.4: version "2.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" +======= resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz" integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== @@ -3772,6 +5779,7 @@ load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz" integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -3781,21 +5789,48 @@ load-json-file@^1.0.0: locate-path@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" +======= resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz" integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-locate "^2.0.0" path-exists "^3.0.0" locate-path@^6.0.0: version "6.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" +======= resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-locate "^5.0.0" lodash.clonedeep@^4.3.2: version "4.5.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + +logalot@^2.0.0, logalot@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552" +======= resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== @@ -3818,12 +5853,20 @@ logalot@^2.0.0, logalot@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz" integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: figures "^1.3.5" squeak "^1.0.0" longest@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" +======= resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= @@ -3831,12 +5874,24 @@ loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz" integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" lowercase-keys@1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + +lpad-align@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/lpad-align/-/lpad-align-1.1.2.tgz#21f600ac1c3095c3c6e497ee67271ee08481fe9e" +======= resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz" integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= @@ -3849,6 +5904,7 @@ lpad-align@^1.0.1: version "1.1.2" resolved "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz" integrity sha1-IfYArBwwlcPG5JfuZyce4ISB/p4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-stdin "^4.0.1" indent-string "^2.1.0" @@ -3857,42 +5913,83 @@ lpad-align@^1.0.1: lru-cache@^4.0.1: version "4.1.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" +======= resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pseudomap "^1.0.2" yallist "^2.1.2" lru-cache@^6.0.0: version "6.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" +======= resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: yallist "^4.0.0" make-dir@^1.0.0, make-dir@^1.2.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" +======= resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz" integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pify "^3.0.0" make-dir@^3.0.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" +======= resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: semver "^6.0.0" make-iterator@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" +======= resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz" integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^6.0.2" map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + +map-obj@^1.0.0, map-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +marked@^4.0.18: + version "4.1.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.0.tgz#3fc6e7485f21c1ca5d6ec4a39de820e146954796" + +matchdep@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e" +======= resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= @@ -3917,6 +6014,7 @@ matchdep@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz" integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: findup-sync "^2.0.0" micromatch "^3.0.4" @@ -3925,6 +6023,17 @@ matchdep@^2.0.0: mdn-data@2.0.14: version "2.0.14" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + +meow@^3.3.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" +======= resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== @@ -3937,6 +6046,7 @@ meow@^3.3.0: version "3.7.0" resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz" integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -3951,11 +6061,22 @@ meow@^3.3.0: merge-stream@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" +======= resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 merge2@^1.2.3, merge2@^1.3.0: version "1.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" +======= resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -3963,6 +6084,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" @@ -3980,14 +6102,25 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" +======= resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: braces "^3.0.1" picomatch "^2.2.3" mime-db@1.48.0, mime-db@^1.28.0: version "1.48.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + +mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.7: + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" +======= resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz" integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== @@ -3995,11 +6128,31 @@ mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.7: version "2.1.31" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz" integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mime-db "1.48.0" mimic-fn@^2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + +minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + dependencies: + brace-expansion "^1.1.7" + +minimatch@~3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" +======= resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -4026,9 +6179,17 @@ minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 -minimist@^1.2.6: +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" +======= resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== @@ -4036,19 +6197,31 @@ mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz" integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: for-in "^1.0.2" is-extendable "^1.0.1" mkdirp@~0.5.1: version "0.5.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" +======= resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: minimist "^1.2.5" moment@2.29.4: version "2.29.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + +mozjpeg@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-6.0.1.tgz#56969dddb5741ef2bcb1af066cae21e61a91a27b" +======= resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -4056,6 +6229,7 @@ mozjpeg@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/mozjpeg/-/mozjpeg-6.0.1.tgz" integrity sha512-9Z59pJMi8ni+IUvSH5xQwK5tNLw7p3dwDNCZ3o1xE+of3G5Hc/yOz6Ue/YuLiBXU3ZB5oaHPURyPdqfBX/QYJA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-build "^3.0.0" bin-wrapper "^4.0.0" @@ -4063,11 +6237,34 @@ mozjpeg@^6.0.0: ms@2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" +======= resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 -ms@2.1.2: +ms@2.1.2, ms@^2.1.1: version "2.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + +mute-stdout@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331" + +nan@^2.12.1: + version "2.14.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + +nanoid@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" +======= resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -4095,6 +6292,7 @@ nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz" integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" @@ -4110,6 +6308,13 @@ nanomatch@^1.2.9: natural-compare@^1.4.0: version "1.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + +ndarray-ops@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/ndarray-ops/-/ndarray-ops-1.2.2.tgz#59e88d2c32a7eebcb1bc690fae141579557a614e" +======= resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= @@ -4117,27 +6322,59 @@ ndarray-ops@^1.2.2: version "1.2.2" resolved "https://registry.npmjs.org/ndarray-ops/-/ndarray-ops-1.2.2.tgz" integrity sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cwise-compiler "^1.0.0" ndarray-pack@^1.1.1: version "1.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a" +======= resolved "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz" integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cwise-compiler "^1.1.2" ndarray "^1.0.13" ndarray@^1.0.13, ndarray@^1.0.18, ndarray@~1.0.15: version "1.0.19" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e" +======= resolved "https://registry.npmjs.org/ndarray/-/ndarray-1.0.19.tgz" integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: iota-array "^1.0.0" is-buffer "^1.0.2" neo-async@^2.6.0: version "2.6.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + +next-tick@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + +node-bitmap@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091" + +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" +======= resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -4170,6 +6407,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: hosted-git-info "^2.1.4" resolve "^1.10.0" @@ -4178,13 +6416,28 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: normalize-path@^2.1.1: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" +======= resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz" integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: remove-trailing-separator "^1.0.1" normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + +normalize-url@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" +======= resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -4197,6 +6450,7 @@ normalize-url@2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz" integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: prepend-http "^2.0.0" query-string "^5.0.1" @@ -4204,6 +6458,17 @@ normalize-url@2.0.1: normalize-url@^6.0.1: version "6.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.0.1.tgz#a4f27f58cf8c7b287b440b8a8201f42d0b00d256" + +normalize.css@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" + +now-and-later@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c" +======= resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz" integrity sha512-VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ== @@ -4216,47 +6481,87 @@ now-and-later@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz" integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: once "^1.3.2" npm-conf@^1.1.0: version "1.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" +======= resolved "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz" integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: config-chain "^1.1.11" pify "^3.0.0" npm-run-path@^2.0.0: version "2.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" +======= resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-key "^2.0.0" npm-run-path@^4.0.1: version "4.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" +======= resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-key "^3.0.0" nth-check@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" +======= resolved "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: boolbase "~1.0.0" nth-check@^2.0.1: version "2.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" +======= resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz" integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: boolbase "^1.0.0" number-is-nan@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + +obj-extend@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/obj-extend/-/obj-extend-0.1.0.tgz#bb448a4775fb95eb34a781f908bbac2df23dbb5b" + +object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" +======= resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= @@ -4279,11 +6584,25 @@ object-copy@^0.1.0: version "0.1.0" resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz" integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: copy-descriptor "^0.1.0" define-property "^0.2.5" kind-of "^3.0.3" +<<<<<<< HEAD +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + +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" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" +======= object-inspect@^1.10.3: version "1.10.3" resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz" @@ -4303,13 +6622,18 @@ object-visit@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz" integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isobject "^3.0.0" object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" +======= resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.0" define-properties "^1.1.3" @@ -4318,8 +6642,12 @@ object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2: object.defaults@^1.0.0, object.defaults@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" +======= resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz" integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: array-each "^1.0.1" array-slice "^1.0.0" @@ -4328,8 +6656,12 @@ object.defaults@^1.0.0, object.defaults@^1.1.0: object.getownpropertydescriptors@^2.1.0: version "2.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" +======= resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz" integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" @@ -4337,27 +6669,44 @@ object.getownpropertydescriptors@^2.1.0: object.map@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" +======= resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz" integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: for-own "^1.0.0" make-iterator "^1.0.0" object.pick@^1.2.0, object.pick@^1.3.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" +======= resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz" integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isobject "^3.0.1" object.reduce@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad" +======= resolved "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz" integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: for-own "^1.0.0" make-iterator "^1.0.0" +<<<<<<< HEAD +object.values@^1.1.0, object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" +======= object.values@^1.1.0: version "1.1.4" resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz" @@ -4371,6 +6720,7 @@ object.values@^1.1.5: version "1.1.5" resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" @@ -4378,6 +6728,13 @@ object.values@^1.1.5: omggif@^1.0.5: version "1.0.10" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19" + +once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" +======= resolved "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz" integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw== @@ -4385,20 +6742,29 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: wrappy "1" onetime@^5.1.2: version "5.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" +======= resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: mimic-fn "^2.1.0" optionator@^0.9.1: version "0.9.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" +======= resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz" integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: deep-is "^0.1.3" fast-levenshtein "^2.0.6" @@ -4409,8 +6775,12 @@ optionator@^0.9.1: optipng-bin@^6.0.0: version "6.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-6.0.0.tgz#376120fa79d5e71eee2f524176efdd3a5eabd316" +======= resolved "https://registry.npmjs.org/optipng-bin/-/optipng-bin-6.0.0.tgz" integrity sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bin-build "^3.0.0" bin-wrapper "^4.0.0" @@ -4418,27 +6788,50 @@ optipng-bin@^6.0.0: ordered-read-streams@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" +======= resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz" integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "^2.0.1" os-filter-obj@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz#1c0b62d5f3a2442749a2d139e6dddee6e81d8d16" +======= resolved "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz" integrity sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arch "^2.1.0" os-locale@^1.4.0: version "1.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" +======= resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: lcid "^1.0.0" p-cancelable@^0.3.0: version "0.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" + +p-cancelable@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" + +p-event@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz#8e6b4f4f65c72bc5b6fe28b75eda874f96a4a085" +======= resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz" integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== @@ -4451,18 +6844,34 @@ p-event@^1.0.0: version "1.3.0" resolved "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz" integrity sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-timeout "^1.1.1" p-event@^2.1.0: version "2.3.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6" +======= resolved "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz" integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-timeout "^2.0.1" p-finally@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +p-is-promise@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" + +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" +======= resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= @@ -4475,46 +6884,78 @@ p-limit@^1.1.0: version "1.3.0" resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz" integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-try "^1.0.0" p-limit@^3.0.2: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" +======= resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: yocto-queue "^0.1.0" p-locate@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" +======= resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz" integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-limit "^1.1.0" p-locate@^5.0.0: version "5.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" +======= resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-limit "^3.0.2" p-map-series@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" +======= resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz" integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-reduce "^1.0.0" p-map@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" +======= resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: aggregate-error "^3.0.0" p-pipe@^3.0.0: version "3.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e" + +p-reduce@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" + +p-timeout@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" +======= resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz" integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw== @@ -4527,18 +6968,30 @@ p-timeout@^1.1.1: version "1.2.1" resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz" integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-finally "^1.0.0" p-timeout@^2.0.1: version "2.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038" +======= resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz" integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: p-finally "^1.0.0" p-try@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" +======= resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= @@ -4546,20 +6999,29 @@ parent-module@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: callsites "^3.0.0" parse-data-uri@^0.2.0: version "0.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9" +======= resolved "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz" integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: data-uri-to-buffer "0.0.3" parse-filepath@^1.0.1: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" +======= resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz" integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-absolute "^1.0.0" map-cache "^0.2.0" @@ -4567,13 +7029,36 @@ parse-filepath@^1.0.1: parse-json@^2.2.0: version "2.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" +======= resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz" integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: error-ex "^1.2.0" parse-node-version@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" +======= resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz" integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== @@ -4596,11 +7081,31 @@ path-exists@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pinkie-promise "^2.0.0" path-exists@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" +======= resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= @@ -4623,9 +7128,21 @@ path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 -path-parse@^1.0.6, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + +path-root-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + +path-root@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" +======= resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -4638,13 +7155,18 @@ path-root@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz" integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: path-root-regex "^0.1.0" path-type@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" +======= resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: graceful-fs "^4.1.2" pify "^2.0.0" @@ -4652,6 +7174,41 @@ path-type@^1.0.0: path-type@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + +pify@^2.0.0, pify@^2.2.0, pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" +======= resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== @@ -4694,11 +7251,19 @@ pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: pinkie "^2.0.0" pinkie@^2.0.0: version "2.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +pixelsmith@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/pixelsmith/-/pixelsmith-2.4.1.tgz#4ccfecf6eb5447da1d38fe26f2d70d246a40179e" +======= resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= @@ -4706,6 +7271,7 @@ pixelsmith@^2.3.0: version "2.4.1" resolved "https://registry.npmjs.org/pixelsmith/-/pixelsmith-2.4.1.tgz" integrity sha512-6lVOPf9eBd9bWfxo5efmJcAiF6y65Ui9Ir8IR8jocrj/v/8QoLWZmgnhO7KGUfqkwPLNlCBfxVdjp4QihdPmPQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: async "~0.9.0" concat-stream "~1.5.1" @@ -4718,8 +7284,12 @@ pixelsmith@^2.3.0: plugin-error@^1.0.1: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c" +======= resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz" integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-colors "^1.0.1" arr-diff "^4.0.0" @@ -4728,13 +7298,32 @@ plugin-error@^1.0.1: plur@^3.0.1: version "3.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/plur/-/plur-3.1.1.tgz#60267967866a8d811504fe58f2faaba237546a5b" +======= resolved "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz" integrity sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: irregular-plurals "^2.0.0" pngjs-nozlib@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7" + +pngjs@^3.3.3: + version "3.4.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + +postcss-calc@^8.2.3: + version "8.2.4" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" +======= resolved "https://registry.npmjs.org/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz" integrity sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c= @@ -4752,30 +7341,60 @@ postcss-calc@^8.2.3: version "8.2.4" resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz" integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-selector-parser "^6.0.9" postcss-value-parser "^4.2.0" postcss-colormin@^5.3.0: version "5.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" +======= resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz" integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" colord "^2.9.1" postcss-value-parser "^4.2.0" +<<<<<<< HEAD +postcss-convert-values@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab" +======= postcss-convert-values@^5.1.3: version "5.1.3" resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz" integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" postcss-value-parser "^4.2.0" postcss-discard-comments@^5.1.2: version "5.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" + +postcss-discard-duplicates@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" + +postcss-discard-empty@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" + +postcss-discard-overridden@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" + +postcss-load-config@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.1.tgz#2f53a17f2f543d9e63864460af42efdac0d41f87" +======= resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz" integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== @@ -4798,22 +7417,35 @@ postcss-load-config@^3.0.0: version "3.1.1" resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz" integrity sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: lilconfig "^2.0.4" yaml "^1.10.2" +<<<<<<< HEAD +postcss-merge-longhand@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce" +======= postcss-merge-longhand@^5.1.7: version "5.1.7" resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz" integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" stylehacks "^5.1.1" +<<<<<<< HEAD +postcss-merge-rules@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5" +======= postcss-merge-rules@^5.1.3: version "5.1.3" resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz" integrity sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" caniuse-api "^3.0.0" @@ -4822,24 +7454,38 @@ postcss-merge-rules@^5.1.3: postcss-minify-font-values@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" +======= resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz" integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-minify-gradients@^5.1.1: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" +======= resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz" integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: colord "^2.9.1" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" +<<<<<<< HEAD +postcss-minify-params@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9" +======= postcss-minify-params@^5.1.4: version "5.1.4" resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz" integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" cssnano-utils "^3.1.0" @@ -4847,13 +7493,24 @@ postcss-minify-params@^5.1.4: postcss-minify-selectors@^5.2.1: version "5.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" +======= resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz" integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-selector-parser "^6.0.5" postcss-normalize-charset@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" + +postcss-normalize-display-values@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" +======= resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz" integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== @@ -4861,32 +7518,54 @@ postcss-normalize-display-values@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz" integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-normalize-positions@^5.1.1: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" +======= resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz" integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-normalize-repeat-style@^5.1.1: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" +======= resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz" integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-normalize-string@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" +======= resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz" integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-normalize-timing-functions@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-unicode@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" +======= resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz" integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== dependencies: @@ -4896,43 +7575,71 @@ postcss-normalize-unicode@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz" integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" postcss-value-parser "^4.2.0" postcss-normalize-url@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" +======= resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz" integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: normalize-url "^6.0.1" postcss-value-parser "^4.2.0" postcss-normalize-whitespace@^5.1.1: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" +======= resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz" integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" postcss-ordered-values@^5.1.3: version "5.1.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" +======= resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz" integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" +<<<<<<< HEAD +postcss-reduce-initial@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" +======= postcss-reduce-initial@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz" integrity sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" caniuse-api "^3.0.0" postcss-reduce-transforms@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" + dependencies: + postcss-value-parser "^4.2.0" + +postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: + version "6.0.9" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" +======= resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz" integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== dependencies: @@ -4950,27 +7657,43 @@ postcss-selector-parser@^6.0.9: version "6.0.9" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz" integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" postcss-svgo@^5.1.0: version "5.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" +======= resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz" integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-value-parser "^4.2.0" svgo "^2.7.0" postcss-unique-selectors@^5.1.1: version "5.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" +======= resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz" integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: postcss-selector-parser "^6.0.5" postcss-value-parser@^4.2.0: version "4.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + +postcss@8.4.16: + version "8.4.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" +======= resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -4978,6 +7701,7 @@ postcss@8.4.21: version "8.4.21" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz" integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -4985,6 +7709,49 @@ postcss@8.4.21: prelude-ls@^1.2.1: version "1.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + +pretty-bytes@^5.3.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + +pretty-hrtime@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" +======= resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== @@ -5037,22 +7804,31 @@ pump@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz" integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: end-of-stream "^1.1.0" once "^1.3.1" pump@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" +======= resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: end-of-stream "^1.1.0" once "^1.3.1" pumpify@^1.3.5: version "1.5.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" +======= resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz" integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: duplexify "^3.6.0" inherits "^2.0.3" @@ -5060,6 +7836,25 @@ pumpify@^1.3.5: punycode@1.3.2: version "1.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + +query-string@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" +======= resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= @@ -5082,6 +7877,7 @@ query-string@^5.0.1: version "5.1.1" resolved "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz" integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: decode-uri-component "^0.2.0" object-assign "^4.1.0" @@ -5089,6 +7885,13 @@ query-string@^5.0.1: queue-microtask@^1.2.2: version "1.2.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" +======= resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== @@ -5096,19 +7899,29 @@ read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: find-up "^1.0.0" read-pkg "^1.0.0" read-pkg@^1.0.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" +======= resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: load-json-file "^1.0.0" normalize-package-data "^2.3.2" path-type "^1.0.0" +<<<<<<< HEAD +"readable-stream@2 || 3", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" +======= "readable-stream@2 || 3", readable-stream@^3.1.1: version "3.6.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" @@ -5122,6 +7935,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable version "2.3.7" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -5131,10 +7945,22 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.1.1: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readable-stream@~1.0.33-1: version "1.0.34" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" +======= resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -5143,8 +7969,12 @@ readable-stream@~1.0.33-1: readable-stream@~1.1.9: version "1.1.14" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" +======= resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -5153,8 +7983,12 @@ readable-stream@~1.1.9: readable-stream@~2.0.0: version "2.0.6" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" +======= resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -5165,8 +7999,12 @@ readable-stream@~2.0.0: readdirp@^2.2.1: version "2.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" +======= resolved "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz" integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: graceful-fs "^4.1.11" micromatch "^3.1.10" @@ -5174,34 +8012,59 @@ readdirp@^2.2.1: readdirp@~3.5.0: version "3.5.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" +======= resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz" integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: picomatch "^2.2.1" rechoir@^0.6.2: version "0.6.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" +======= resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: resolve "^1.1.6" redent@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" +======= resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz" integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" +======= resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz" integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend-shallow "^3.0.2" safe-regex "^1.1.0" +<<<<<<< HEAD +regexpp@^3.0.0, regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + +remove-bom-buffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" +======= regexpp@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz" @@ -5216,14 +8079,19 @@ remove-bom-buffer@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz" integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-buffer "^1.1.5" is-utf8 "^0.2.1" remove-bom-stream@^1.2.0: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" +======= resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz" integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: remove-bom-buffer "^3.0.0" safe-buffer "^5.1.0" @@ -5231,6 +8099,21 @@ remove-bom-stream@^1.2.0: remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" +======= resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz" integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= @@ -5248,11 +8131,23 @@ repeating@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz" integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-finite "^1.0.0" replace-ext@0.0.1: version "0.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" + +replace-ext@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + +replace-homedir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c" +======= resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= @@ -5265,6 +8160,7 @@ replace-homedir@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz" integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: homedir-polyfill "^1.0.1" is-absolute "^1.0.0" @@ -5272,8 +8168,12 @@ replace-homedir@^1.0.0: request@^2.44.0: version "2.88.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" +======= resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -5298,6 +8198,17 @@ request@^2.44.0: require-directory@^2.1.1: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" +======= resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= @@ -5310,12 +8221,20 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz" integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: expand-tilde "^2.0.0" global-modules "^1.0.0" resolve-from@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + +resolve-options@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" +======= resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== @@ -5323,11 +8242,19 @@ resolve-options@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz" integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: value-or-function "^3.0.0" resolve-url@^0.2.1: version "0.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.4.0: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" +======= resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= @@ -5352,6 +8279,7 @@ resolve@^1.22.0, resolve@^1.22.1: version "1.22.1" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-core-module "^2.9.0" path-parse "^1.0.7" @@ -5359,13 +8287,28 @@ resolve@^1.22.0, resolve@^1.22.1: responselike@1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" +======= resolved "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: lowercase-keys "^1.0.0" ret@~0.1.10: version "0.1.15" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + +rimraf@^2.5.4: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" +======= resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== @@ -5378,25 +8321,41 @@ rimraf@^2.5.4: version "2.7.1" resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: glob "^7.1.3" rimraf@^3.0.2: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" +======= resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: glob "^7.1.3" run-parallel@^1.1.9: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" +======= resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: queue-microtask "^1.2.2" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" +======= resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -5409,11 +8368,19 @@ safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz" integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ret "~0.1.10" safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +sass@^1.26.3: + version "1.34.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.34.1.tgz#30f45c606c483d47b634f1e7371e13ff773c96ef" +======= resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -5421,13 +8388,18 @@ sass@^1.26.3: version "1.34.1" resolved "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz" integrity sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: chokidar ">=3.0.0 <4.0.0" save-pixels@~2.3.0: version "2.3.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/save-pixels/-/save-pixels-2.3.4.tgz#49d349c06b8d7c0127dbf0da24b44aca5afb59fe" +======= resolved "https://registry.npmjs.org/save-pixels/-/save-pixels-2.3.4.tgz" integrity sha1-SdNJwGuNfAEn2/DaJLRKylr7Wf4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: contentstream "^1.0.0" gif-encoder "~0.4.1" @@ -5439,6 +8411,13 @@ save-pixels@~2.3.0: sax@~1.2.4: version "1.2.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +seek-bzip@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" +======= resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -5446,18 +8425,30 @@ seek-bzip@^1.0.5: version "1.0.6" resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz" integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: commander "^2.8.1" semver-greatest-satisfied-range@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b" +======= resolved "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz" integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: sver-compat "^1.5.0" semver-regex@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" + +semver-truncate@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8" +======= resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz" integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== @@ -5465,11 +8456,23 @@ semver-truncate@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz" integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: semver "^5.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a" + +semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: version "5.7.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + +semver@^6.0.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" +======= resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -5477,9 +8480,23 @@ semver@^6.0.0: version "6.3.0" resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 semver@^7.0.0: version "7.3.7" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + dependencies: + lru-cache "^6.0.0" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" +======= resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: @@ -5506,6 +8523,7 @@ set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz" integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" @@ -5514,20 +8532,39 @@ set-value@^2.0.0, set-value@^2.0.1: shebang-command@^1.2.0: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" +======= resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: shebang-regex "^1.0.0" shebang-command@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" +======= resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: shebang-regex "^3.0.0" shebang-regex@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" +======= resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= @@ -5540,6 +8577,7 @@ side-channel@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.0" get-intrinsic "^1.0.2" @@ -5547,6 +8585,17 @@ side-channel@^1.0.4: signal-exit@^3.0.0, signal-exit@^3.0.3: version "3.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" +======= resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -5559,6 +8608,7 @@ snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz" integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: define-property "^1.0.0" isobject "^3.0.0" @@ -5566,15 +8616,23 @@ snapdragon-node@^2.0.1: snapdragon-util@^3.0.1: version "3.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" +======= resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz" integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^3.2.0" snapdragon@^0.8.1: version "0.8.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" +======= resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz" integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: base "^0.11.1" debug "^2.2.0" @@ -5587,27 +8645,46 @@ snapdragon@^0.8.1: sort-keys-length@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" +======= resolved "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz" integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: sort-keys "^1.0.0" sort-keys@^1.0.0: version "1.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" +======= resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz" integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-plain-obj "^1.0.0" sort-keys@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" +======= resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz" integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-plain-obj "^1.0.0" source-map-js@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" +======= resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -5615,6 +8692,7 @@ source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: atob "^2.1.2" decode-uri-component "^0.2.0" @@ -5624,14 +8702,41 @@ source-map-resolve@^0.5.0: source-map-support@~0.5.12: version "0.5.19" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" +======= resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.4.0: version "0.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + +source-map@^0.5.1, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + +sparkles@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" +======= resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz" integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== @@ -5659,12 +8764,20 @@ spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz" integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: version "2.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + +spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" +======= resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz" integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== @@ -5672,12 +8785,20 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz" integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: version "3.0.9" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" +======= resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz" integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== @@ -5685,11 +8806,23 @@ split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz" integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: extend-shallow "^3.0.0" sprintf-js@^1.0.3: version "1.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +spritesheet-templates@^10.3.0: + version "10.5.2" + resolved "https://registry.yarnpkg.com/spritesheet-templates/-/spritesheet-templates-10.5.2.tgz#b7526d1cdcede3c2cbfccb2963be9bec6066ec49" +======= resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== @@ -5702,6 +8835,7 @@ spritesheet-templates@^10.3.0: version "10.5.2" resolved "https://registry.npmjs.org/spritesheet-templates/-/spritesheet-templates-10.5.2.tgz" integrity sha512-dMrLgS5eHCEDWqo1c3mDM5rGdJpBNf1JAJrxTKA4qR54trNTtxqGZlH3ZppS5FHTgjKgOtEmycqE2vGSkCYiVw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: handlebars "^4.6.0" handlebars-layouts "^3.1.4" @@ -5711,8 +8845,12 @@ spritesheet-templates@^10.3.0: spritesmith@^3.4.0: version "3.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/spritesmith/-/spritesmith-3.4.0.tgz#5cfa004278c9072ab4900a0cd800141c7cf296e2" +======= resolved "https://registry.npmjs.org/spritesmith/-/spritesmith-3.4.0.tgz" integrity sha512-epa/Ib2GzkrzOA6ZMKH+YOX4ooBlRz8JwIV5NQDt9FvqXVHTh4dVn/0oA+n5eeu6wem1CCrtZWODlOqvwXXpyA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: concat-stream "~1.5.1" layout "~2.2.0" @@ -5722,8 +8860,12 @@ spritesmith@^3.4.0: squeak@^1.0.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/squeak/-/squeak-1.3.0.tgz#33045037b64388b567674b84322a6521073916c3" +======= resolved "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz" integrity sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: chalk "^1.0.0" console-stream "^0.1.1" @@ -5731,8 +8873,12 @@ squeak@^1.0.0: sshpk@^1.7.0: version "1.16.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" +======= resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz" integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -5746,6 +8892,17 @@ sshpk@^1.7.0: stable@^0.1.8: version "0.1.8" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + +stack-trace@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" +======= resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== @@ -5758,12 +8915,28 @@ static-extend@^0.1.1: version "0.1.2" resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz" integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: define-property "^0.2.5" object-copy "^0.1.0" stream-exhaust@^1.0.1: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" + +stream-shift@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" +======= resolved "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz" integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw== @@ -5781,6 +8954,7 @@ string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -5788,29 +8962,50 @@ string-width@^1.0.1, string-width@^1.0.2: string.prototype.trimend@^1.0.4: version "1.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" +======= resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz" integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" string.prototype.trimstart@^1.0.4: version "1.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" +======= resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz" integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: call-bind "^1.0.2" define-properties "^1.1.3" +<<<<<<< HEAD +string_decoder@^1.1.1, string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" +======= string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: - safe-buffer "~5.2.0" + safe-buffer "~5.1.0" string_decoder@~0.10.x: version "0.10.31" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" +======= resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= @@ -5825,40 +9020,64 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" +======= resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-regex "^3.0.0" strip-ansi@^6.0.1: version "6.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" +======= resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: ansi-regex "^5.0.1" strip-bom-stream@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee" +======= resolved "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz" integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: first-chunk-stream "^1.0.0" strip-bom "^2.0.0" strip-bom@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" +======= resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-utf8 "^0.2.0" strip-bom@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + +strip-dirs@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" +======= resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= @@ -5866,11 +9085,23 @@ strip-dirs@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz" integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-natural-number "^4.0.1" strip-eof@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + +strip-indent@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" +======= resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= @@ -5883,11 +9114,25 @@ strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: get-stdin "^4.0.1" strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + +strip-outer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" + dependencies: + escape-string-regexp "^1.0.2" + +stylehacks@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" +======= resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -5902,12 +9147,20 @@ stylehacks@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz" integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: browserslist "^4.21.4" postcss-selector-parser "^6.0.4" supports-color@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" +======= resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= @@ -5915,18 +9168,30 @@ supports-color@^5.3.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-flag "^3.0.0" supports-color@^7.1.0: version "7.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" +======= resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-flag "^4.0.0" supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + +sver-compat@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8" +======= resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== @@ -5934,14 +9199,19 @@ sver-compat@^1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz" integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: es6-iterator "^2.0.1" es6-symbol "^3.1.1" svgo@^1.3.2: version "1.3.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" +======= resolved "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: chalk "^2.4.1" coa "^2.0.2" @@ -5959,8 +9229,12 @@ svgo@^1.3.2: svgo@^2.7.0: version "2.8.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" +======= resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz" integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" @@ -5972,8 +9246,12 @@ svgo@^2.7.0: tar-stream@^1.5.2: version "1.6.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" +======= resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz" integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: bl "^1.0.0" buffer-alloc "^1.2.0" @@ -5985,6 +9263,13 @@ tar-stream@^1.5.2: temp-dir@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + +tempfile@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" +======= resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= @@ -5992,14 +9277,19 @@ tempfile@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: temp-dir "^1.0.0" uuid "^3.0.1" ternary-stream@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/ternary-stream/-/ternary-stream-3.0.0.tgz#7951930ea9e823924d956f03d516151a2d516253" +======= resolved "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz" integrity sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: duplexify "^4.1.1" fork-stream "^0.0.4" @@ -6008,8 +9298,12 @@ ternary-stream@^3.0.0: terser@^4.6.12: version "4.8.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" +======= resolved "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -6017,6 +9311,13 @@ terser@^4.6.12: text-table@^0.2.0: version "0.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + +through2-concurrent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/through2-concurrent/-/through2-concurrent-2.0.0.tgz#c9dd2c146504ec9962dbc86a5168b63d662669fa" +======= resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== @@ -6024,35 +9325,63 @@ through2-concurrent@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/through2-concurrent/-/through2-concurrent-2.0.0.tgz" integrity sha512-R5/jLkfMvdmDD+seLwN7vB+mhbqzWop5fAjx5IX8/yQq7VhBhzDmhXgaHAOnhnWkCpRMM7gToYHycB0CS/pd+A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: through2 "^2.0.0" through2-filter@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" +======= resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz" integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: through2 "~2.0.0" xtend "~4.0.0" through2@^2.0.0, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3: version "2.0.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" +======= resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: readable-stream "~2.3.6" xtend "~4.0.1" through2@^3.0.1: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" +======= resolved "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz" integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: inherits "^2.0.4" readable-stream "2 || 3" through@^2.3.4, through@^2.3.8: version "2.3.8" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +time-stamp@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" + +timed-out@^4.0.0, timed-out@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + +to-absolute-glob@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" +======= resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== @@ -6070,12 +9399,20 @@ to-absolute-glob@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz" integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-absolute "^1.0.0" is-negated-glob "^1.0.0" to-buffer@^1.1.1: version "1.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" +======= resolved "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== @@ -6083,28 +9420,41 @@ to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: kind-of "^3.0.2" to-regex-range@^2.1.0: version "2.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" +======= resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz" integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-number "^3.0.0" repeat-string "^1.6.1" to-regex-range@^5.0.1: version "5.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" +======= resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-number "^7.0.0" to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" +======= resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz" integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: define-property "^2.0.2" extend-shallow "^3.0.2" @@ -6113,21 +9463,36 @@ to-regex@^3.0.1, to-regex@^3.0.2: to-through@^2.0.0: version "2.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" +======= resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz" integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: through2 "^2.0.3" tough-cookie@~2.5.0: version "2.5.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" +======= resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: psl "^1.1.28" punycode "^2.1.1" trim-newlines@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + +trim-repeated@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" +======= resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= @@ -6135,13 +9500,18 @@ trim-repeated@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz" integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: escape-string-regexp "^1.0.2" tsconfig-paths@^3.14.1: version "3.14.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" +======= resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz" integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" @@ -6150,13 +9520,24 @@ tsconfig-paths@^3.14.1: tunnel-agent@^0.6.0: version "0.6.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" +======= resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" +======= resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= @@ -6164,11 +9545,39 @@ type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: prelude-ls "^1.2.1" type-fest@^0.20.2: version "0.20.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + +type@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" + +type@^2.0.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" + +typedarray@^0.0.6, typedarray@~0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + +typo-js@*: + version "1.2.1" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b" + +uglify-js@^3.1.4: + version "3.13.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.9.tgz#4d8d21dcd497f29cfd8e9378b9df123ad025999b" + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" +======= resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== @@ -6201,6 +9610,7 @@ unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz" integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: function-bind "^1.1.1" has-bigints "^1.0.1" @@ -6209,14 +9619,25 @@ unbox-primitive@^1.0.1: unbzip2-stream@^1.0.9: version "1.4.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" +======= resolved "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz" integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer "^5.2.1" through "^2.3.8" unc-path-regex@^0.1.2: version "0.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + +underscore.string@~3.3.0: + version "3.3.5" + resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023" +======= resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz" integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= @@ -6224,12 +9645,24 @@ underscore.string@~3.3.0: version "3.3.5" resolved "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz" integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: sprintf-js "^1.0.3" util-deprecate "^1.0.2" underscore@~1.13.1: version "1.13.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" + +undertaker-registry@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50" + +undertaker@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18" +======= resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz" integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== @@ -6242,6 +9675,7 @@ undertaker@^1.2.1: version "1.3.0" resolved "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz" integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-flatten "^1.0.1" arr-map "^2.0.0" @@ -6256,8 +9690,12 @@ undertaker@^1.2.1: union-value@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" +======= resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz" integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: arr-union "^3.1.0" get-value "^2.0.6" @@ -6266,6 +9704,13 @@ union-value@^1.0.0: uniq@^1.0.0: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + +unique-stream@^2.0.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac" +======= resolved "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz" integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= @@ -6273,12 +9718,20 @@ unique-stream@^2.0.2: version "2.3.1" resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz" integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: json-stable-stringify-without-jsonify "^1.0.1" through2-filter "^3.0.0" unquote@~1.1.1: version "1.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" +======= resolved "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= @@ -6286,12 +9739,20 @@ unset-value@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz" integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: has-value "^0.3.1" isobject "^3.0.0" upath@^1.1.1: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + +update-browserslist-db@^1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d" +======= resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== @@ -6299,19 +9760,31 @@ update-browserslist-db@^1.0.9: version "1.0.10" resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: escalade "^3.1.1" picocolors "^1.0.0" uri-js@^4.2.2: version "4.4.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" +======= resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: punycode "^2.1.0" urix@^0.1.0: version "0.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" +======= resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= @@ -6319,18 +9792,30 @@ url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz" integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: prepend-http "^1.0.1" url-parse-lax@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" +======= resolved "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: prepend-http "^2.0.0" url-to-options@^1.0.1: version "1.0.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" + +url2@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/url2/-/url2-1.0.4.tgz#df2284ae15c749ba809751510e5e25da9ebb80d8" +======= resolved "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz" integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= @@ -6338,18 +9823,34 @@ url2@~1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/url2/-/url2-1.0.4.tgz" integrity sha1-3yKErhXHSbqAl1FRDl4l2p67gNg= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: url "0.10.2" url@0.10.2: version "0.10.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/url/-/url-0.10.2.tgz#68621d6929ea1cad344ebf135d82fcf7eb1a7469" +======= resolved "https://registry.npmjs.org/url/-/url-0.10.2.tgz" integrity sha1-aGIdaSnqHK00Tr8TXYL89+sadGk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: punycode "1.3.2" use@^3.1.0: version "3.1.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + +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" + +util.promisify@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" +======= resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== @@ -6362,6 +9863,7 @@ util.promisify@~1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz" integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: define-properties "^1.1.3" es-abstract "^1.17.2" @@ -6370,6 +9872,13 @@ util.promisify@~1.0.0: uuid@^3.0.1, uuid@^3.3.2: version "3.4.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + +v8flags@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" +======= resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -6377,19 +9886,31 @@ v8flags@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz" integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: homedir-polyfill "^1.0.1" validate-npm-package-license@^3.0.1: version "3.0.4" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" +======= resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" value-or-function@^3.0.0: version "3.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" +======= resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz" integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= @@ -6397,6 +9918,7 @@ verror@1.10.0: version "1.10.0" resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -6404,8 +9926,12 @@ verror@1.10.0: vinyl-file@~1.3.0: version "1.3.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-1.3.0.tgz#aa05634d3a867ba91447bedbb34afcb26f44f6e7" +======= resolved "https://registry.npmjs.org/vinyl-file/-/vinyl-file-1.3.0.tgz" integrity sha1-qgVjTTqGe6kUR77bs0r8sm9E9uc= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: graceful-fs "^4.1.2" strip-bom "^2.0.0" @@ -6414,8 +9940,12 @@ vinyl-file@~1.3.0: vinyl-fs@^3.0.0: version "3.0.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7" +======= resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz" integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: fs-mkdirp-stream "^1.0.0" glob-stream "^6.1.0" @@ -6437,8 +9967,12 @@ vinyl-fs@^3.0.0: vinyl-sourcemap@^1.1.0: version "1.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" +======= resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz" integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: append-buffer "^1.0.2" convert-source-map "^1.5.0" @@ -6450,15 +9984,23 @@ vinyl-sourcemap@^1.1.0: vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1: version "0.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" +======= resolved "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz" integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: source-map "^0.5.1" vinyl@^1.1.0: version "1.2.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" +======= resolved "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz" integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: clone "^1.0.0" clone-stats "^0.0.1" @@ -6466,8 +10008,12 @@ vinyl@^1.1.0: vinyl@^2.0.0: version "2.2.1" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" +======= resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz" integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: clone "^2.1.1" clone-buffer "^1.0.0" @@ -6478,8 +10024,12 @@ vinyl@^2.0.0: vinyl@~2.1.0: version "2.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" +======= resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz" integrity sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: clone "^2.1.1" clone-buffer "^1.0.0" @@ -6490,8 +10040,12 @@ vinyl@~2.1.0: which-boxed-primitive@^1.0.2: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" +======= resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: is-bigint "^1.0.1" is-boolean-object "^1.1.0" @@ -6501,6 +10055,13 @@ which-boxed-primitive@^1.0.2: which-module@^1.0.0: version "1.0.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + +which@^1.2.14, which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" +======= resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= @@ -6508,18 +10069,34 @@ which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isexe "^2.0.0" which@^2.0.1: version "2.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" +======= resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: isexe "^2.0.0" word-wrap@^1.2.3: version "1.2.3" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" +======= resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -6532,12 +10109,40 @@ wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz" integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" wrappy@1: version "1.0.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + +y18n@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + +yargs-parser@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" +======= resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= @@ -6570,14 +10175,19 @@ yargs-parser@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz" integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: camelcase "^3.0.0" object.assign "^4.1.0" yargs@^7.1.0: version "7.1.2" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" +======= resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz" integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -6595,13 +10205,21 @@ yargs@^7.1.0: yauzl@^2.4.2: version "2.10.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" +======= resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz" integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" yocto-queue@^0.1.0: version "0.1.0" +<<<<<<< HEAD + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" +======= resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +>>>>>>> b85811238b5c8f1b786618cc191c7237340c4000 diff --git a/zds/tutorialv2/epub_utils.py b/zds/tutorialv2/epub_utils.py index 82769479af..d73ad8bb97 100644 --- a/zds/tutorialv2/epub_utils.py +++ b/zds/tutorialv2/epub_utils.py @@ -63,7 +63,7 @@ def build_html_chapter_file(published_object, versioned_object, working_dir, roo :param versioned_object: the object representing the public version in git file system :type versioned_object: zds.tutorialv2.models.models_versioned.VersionedContent :param published_object: the published content as saved in database - :type published_object: zds.tutorialv2.models.models_database.PublishedContent + :type published_object: zds.tutorialv2.models.models_database.PublishableCOntent :type image_handler: ImageHandling :return: a generator of tuples composed as ``[splitted_html_file_relative_path, chapter-identifier, chapter-title]`` """ diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py index d1088fbaa5..3dd816717f 100644 --- a/zds/tutorialv2/forms.py +++ b/zds/tutorialv2/forms.py @@ -42,6 +42,19 @@ def clean(self): return cleaned_data +class QuizzStatsForm(forms.Form): + url = forms.CharField(required=False) + + def __init__(self, *args, json_dict=None, **kwargs): + super().__init__(data=json_dict, *args, **kwargs) + + def clean(self): + super().clean() + self.cleaned_data["result"] = self.data["result"] + self.cleaned_data["expected"] = self.data["expected"] + return self.cleaned_data + + class ReviewerTypeModelChoiceField(forms.ModelChoiceField): def label_from_instance(self, obj): return obj.title diff --git a/zds/tutorialv2/migrations/0031_quizzstat.py b/zds/tutorialv2/migrations/0031_quizzstat.py new file mode 100644 index 0000000000..23ed354d75 --- /dev/null +++ b/zds/tutorialv2/migrations/0031_quizzstat.py @@ -0,0 +1,34 @@ +# Generated by Django 2.2.16 on 2020-09-26 15:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0030_contentsuggestion"), + ] + + operations = [ + migrations.CreateModel( + name="QuizzStat", + fields=[ + ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("url", models.TextField(verbose_name="url")), + ("question", models.TextField(verbose_name="question")), + ("answer", models.TextField(verbose_name="anwser")), + ("date_answer", models.DateField(auto_now=True, verbose_name="Date of answer")), + ( + "related_content", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="tutorialv2.PublishableContent", + verbose_name="Tutoriel lié", + ), + ), + ], + ), + ] diff --git a/zds/tutorialv2/migrations/0032_auto_20200927_1015.py b/zds/tutorialv2/migrations/0032_auto_20200927_1015.py new file mode 100644 index 0000000000..df5e093c6b --- /dev/null +++ b/zds/tutorialv2/migrations/0032_auto_20200927_1015.py @@ -0,0 +1,66 @@ +# Generated by Django 2.2.16 on 2020-09-27 10:15 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0031_quizzstat"), + ] + + operations = [ + migrations.CreateModel( + name="QuizzAvailableAnswer", + fields=[ + ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("answer_label", models.TextField(verbose_name="Intitulé de la réponse")), + ("is_good", models.BooleanField(default=False, verbose_name="Est une réponse attendue")), + ], + ), + migrations.CreateModel( + name="QuizzQuestion", + fields=[ + ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("url", models.TextField(verbose_name="url")), + ("question", models.TextField(verbose_name="question")), + ], + ), + migrations.CreateModel( + name="QuizzUserAnswer", + fields=[ + ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("answer", models.TextField(verbose_name="anwser")), + ("date_answer", models.DateField(auto_now=True, verbose_name="Date of answer")), + ( + "related_content", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="tutorialv2.PublishableContent", + verbose_name="Tutoriel lié", + ), + ), + ( + "related_question", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="tutorialv2.QuizzQuestion", + verbose_name="Question liée", + ), + ), + ], + ), + migrations.DeleteModel( + name="QuizzStat", + ), + migrations.AddField( + model_name="quizzavailableanswer", + name="related_question", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="tutorialv2.QuizzQuestion", verbose_name="Question liée" + ), + ), + ] diff --git a/zds/tutorialv2/migrations/0033_quizzuseranswer_full_answer_id.py b/zds/tutorialv2/migrations/0033_quizzuseranswer_full_answer_id.py new file mode 100644 index 0000000000..1796f4fd8b --- /dev/null +++ b/zds/tutorialv2/migrations/0033_quizzuseranswer_full_answer_id.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2020-09-27 11:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0032_auto_20200927_1015"), + ] + + operations = [ + migrations.AddField( + model_name="quizzuseranswer", + name="full_answer_id", + field=models.CharField(default="id", max_length=64, verbose_name="Indentifiant de la réponse utilisateur"), + ), + ] diff --git a/zds/tutorialv2/migrations/0034_auto_20200927_1105.py b/zds/tutorialv2/migrations/0034_auto_20200927_1105.py new file mode 100644 index 0000000000..0c31ee2e15 --- /dev/null +++ b/zds/tutorialv2/migrations/0034_auto_20200927_1105.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2020-09-27 11:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0033_quizzuseranswer_full_answer_id"), + ] + + operations = [ + migrations.RenameField( + model_name="quizzavailableanswer", + old_name="answer_label", + new_name="label", + ), + ] diff --git a/zds/tutorialv2/migrations/0035_merge_20201219_1959.py b/zds/tutorialv2/migrations/0035_merge_20201219_1959.py new file mode 100644 index 0000000000..a1d799f858 --- /dev/null +++ b/zds/tutorialv2/migrations/0035_merge_20201219_1959.py @@ -0,0 +1,13 @@ +# Generated by Django 2.2.17 on 2020-12-19 19:59 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0031_source_is_url"), + ("tutorialv2", "0034_auto_20200927_1105"), + ] + + operations = [] diff --git a/zds/tutorialv2/migrations/0035_merge_20210601_1744.py b/zds/tutorialv2/migrations/0035_merge_20210601_1744.py new file mode 100644 index 0000000000..d9af1801a3 --- /dev/null +++ b/zds/tutorialv2/migrations/0035_merge_20210601_1744.py @@ -0,0 +1,13 @@ +# Generated by Django 2.2.19 on 2021-06-01 17:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0034_auto_20200927_1105"), + ("tutorialv2", "0031_source_is_url"), + ] + + operations = [] diff --git a/zds/tutorialv2/migrations/0036_quizzquestion_question_type.py b/zds/tutorialv2/migrations/0036_quizzquestion_question_type.py new file mode 100644 index 0000000000..aba2905361 --- /dev/null +++ b/zds/tutorialv2/migrations/0036_quizzquestion_question_type.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.17 on 2021-01-01 20:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0035_merge_20201219_1959"), + ] + + operations = [ + migrations.AddField( + model_name="quizzquestion", + name="question_type", + field=models.TextField( + db_index=True, default="qcm", editable=False, max_length=15, verbose_name="Type de question" + ), + ), + ] diff --git a/zds/tutorialv2/migrations/0037_merge_20210601_1830.py b/zds/tutorialv2/migrations/0037_merge_20210601_1830.py new file mode 100644 index 0000000000..9d16e64521 --- /dev/null +++ b/zds/tutorialv2/migrations/0037_merge_20210601_1830.py @@ -0,0 +1,13 @@ +# Generated by Django 2.2.19 on 2021-06-01 18:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0036_quizzquestion_question_type"), + ("tutorialv2", "0035_merge_20210601_1744"), + ] + + operations = [] diff --git a/zds/tutorialv2/migrations/0038_merge_20221030_2030.py b/zds/tutorialv2/migrations/0038_merge_20221030_2030.py new file mode 100644 index 0000000000..81b84e508d --- /dev/null +++ b/zds/tutorialv2/migrations/0038_merge_20221030_2030.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.15 on 2022-10-30 20:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0035_alter_publishablecontent_goals"), + ("tutorialv2", "0037_merge_20210601_1830"), + ] + + operations = [] diff --git a/zds/tutorialv2/models/quizz.py b/zds/tutorialv2/models/quizz.py new file mode 100644 index 0000000000..cf5ee7a485 --- /dev/null +++ b/zds/tutorialv2/models/quizz.py @@ -0,0 +1,46 @@ +from django.db import models + +from zds.tutorialv2.models.database import PublishableContent + + +class QuizzQuestion(models.Model): + url = models.TextField(name="url", verbose_name="url", null=False, blank=False) + question = models.TextField(name="question", verbose_name="question", null=False, blank=False) + # use max_length 15 to help with indexation, question type must not be too verbose. You may want to implement + # choices later + question_type = models.TextField( + name="question_type", + verbose_name="Type de question", + null=False, + blank=False, + default="qcm", + db_index=True, + editable=False, + max_length=15, + ) + + +class QuizzAvailableAnswer(models.Model): + label = models.TextField(name="label", verbose_name="Intitulé de la réponse") + good_answer = models.BooleanField(name="is_good", verbose_name="Est une réponse attendue", default=False) + related_question = models.ForeignKey( + QuizzQuestion, name="related_question", verbose_name="Question liée", on_delete=models.CASCADE + ) + + +class QuizzUserAnswer(models.Model): + related_content = models.ForeignKey( + PublishableContent, verbose_name="Tutoriel lié", blank=True, null=True, on_delete=models.CASCADE + ) + answer = models.TextField(name="answer", verbose_name="answer", null=False, blank=False) + date_answer = models.DateField(name="date_answer", verbose_name="Date of answer", null=False, auto_now=True) + related_question = models.ForeignKey( + QuizzQuestion, name="related_question", verbose_name="Question liée", on_delete=models.CASCADE + ) + full_answer_id = models.CharField( + name="full_answer_id", + verbose_name="Indentifiant de la réponse utilisateur", + blank=False, + max_length=64, + default="id", + ) diff --git a/zds/tutorialv2/models/versioned.py b/zds/tutorialv2/models/versioned.py index 77e2e57cc4..ee421d6668 100644 --- a/zds/tutorialv2/models/versioned.py +++ b/zds/tutorialv2/models/versioned.py @@ -46,6 +46,7 @@ class Container: children = [] children_dict = {} slug_pool = {} + is_quizz = False def __init__(self, title, slug="", parent=None, position_in_parent=1): """Initialize the data model that will handle the dialog with raw versionned data at level container. @@ -618,13 +619,14 @@ def repo_add_container( title, introduction, conclusion, commit_message=commit_message, do_commit=do_commit ) - def repo_add_extract(self, title, text, commit_message="", do_commit=True, slug=None): + def repo_add_extract(self, title, text, commit_message="", do_commit=True, slug=None, quizz=False): """ :param title: title of the new extract :param text: text of the new extract :param commit_message: commit message that will be used instead of the default one :param do_commit: perform the commit in repository if ``True`` :param generate_slug: indicates that is must generate slug + :param quizz: if is ``True`` marks the extract as quizz :return: commit sha :rtype: str """ @@ -632,6 +634,7 @@ def repo_add_extract(self, title, text, commit_message="", do_commit=True, slug= extract = Extract(title) else: extract = Extract(title, slug) + extract.is_quizz = quizz # can an extract be added ? try: self.add_extract(extract, generate_slug=slug is None) @@ -924,6 +927,7 @@ class Extract: container = None position_in_parent = 1 text = None + is_quizz = False def __init__(self, title, slug="", container=None, position_in_parent=1): self.title = title diff --git a/zds/tutorialv2/publish_container.py b/zds/tutorialv2/publish_container.py index 28e2195bc0..f612694854 100644 --- a/zds/tutorialv2/publish_container.py +++ b/zds/tutorialv2/publish_container.py @@ -20,7 +20,7 @@ def publish_use_manifest(db_object, base_dir, versionable_content: VersionedCont md, metadata, __ = render_markdown( base_content, disable_jsfiddle=not db_object.js_support, full_json=True, stats=True ) - publish_container_new(db_object, base_dir, versionable_content, md) + publish_container_new(db_object, base_dir, versionable_content, md, content=db_object) return metadata.get("stats", {}).get("signs", 0) @@ -122,7 +122,7 @@ def render_chapter_or_minituto(base_dir, container, ctx, rendered, template): def publish_container( - db_object, + db_object: PublishableContent, base_dir, container, template="tutorialv2/export/chapter.html", @@ -151,6 +151,8 @@ def publish_container( path_to_title_dict = collections.OrderedDict() ctx["relative"] = ctx.get("relative", ".") + ctx["content"] = db_object + ctx["public_content"] = db_object.public_version if not isinstance(container, Container): raise FailureDuringPublication(_("Le conteneur n'en est pas un !")) diff --git a/zds/tutorialv2/tests/factories.py b/zds/tutorialv2/tests/factories.py index c3c275f074..0fd99c4b2b 100644 --- a/zds/tutorialv2/tests/factories.py +++ b/zds/tutorialv2/tests/factories.py @@ -8,6 +8,7 @@ from zds.forum.tests.factories import PostFactory, TopicFactory from zds.gallery.tests.factories import GalleryFactory, UserGalleryFactory from zds.tutorialv2.models.goals import Goal +from zds.tutorialv2.models.quizz import QuizzQuestion, QuizzAvailableAnswer, QuizzUserAnswer from zds.tutorialv2.models.help_requests import HelpWriting from zds.utils import old_slugify from zds.utils.tests.factories import LicenceFactory, SubCategoryFactory @@ -314,6 +315,34 @@ class Meta: slug = factory.Sequence("mon-objectif-{}".format) +class QuizzQuestionFactory(factory.django.DjangoModelFactory): + class Meta: + model = QuizzQuestion + + url = factory.Faker("url") + question = factory.Faker("text", max_nb_chars=200) + question_type = factory.Faker("random_element", elements=("qcm", "open", "bool")) + + +class QuizzAvailableAnswerFactory(factory.django.DjangoModelFactory): + class Meta: + model = QuizzAvailableAnswer + + label = factory.Faker("text", max_nb_chars=100) + is_good = factory.Faker("boolean") + related_question = factory.SubFactory(QuizzQuestionFactory) + + +class QuizzUserAnswerFactory(factory.django.DjangoModelFactory): + class Meta: + model = QuizzUserAnswer + + related_content = factory.SubFactory(PublishableContentFactory) + answer = factory.Faker("text", max_nb_chars=200) + related_question = factory.SubFactory(QuizzQuestionFactory) + full_answer_id = factory.Faker("uuid4") + + class ContentContributionRoleFactory(factory.django.DjangoModelFactory): """Factory that create a role in contributions to contents, for use in tests.""" diff --git a/zds/tutorialv2/tests/tests_views/tests_published.py b/zds/tutorialv2/tests/tests_views/tests_published.py index e8817e7448..f57c019d9e 100644 --- a/zds/tutorialv2/tests/tests_views/tests_published.py +++ b/zds/tutorialv2/tests/tests_views/tests_published.py @@ -22,6 +22,7 @@ HelpWritingFactory, ) from zds.tutorialv2.models.database import ( + PickListOperation, PublishableContent, Validation, PublishedContent, @@ -1878,13 +1879,52 @@ def test_opinion_link_is_not_related_to_the_author(self): into accounts and not only the ones of the author. """ + opinion_not_picked = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + opinion_not_picked.save() + user_1_opinion_1 = PublishedContentFactory(author_list=[self.user_author], type="OPINION") - user_2_opinion_1 = PublishedContentFactory(author_list=[self.user_guest], type="OPINION") - user_1_opinion_2 = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + user_1_opinion_1.sha_picked = user_1_opinion_1.sha_public user_1_opinion_1.save() + + opinion_not_picked = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + opinion_not_picked.save() + + user_2_opinion_1 = PublishedContentFactory(author_list=[self.user_guest], type="OPINION") + user_2_opinion_1.sha_picked = user_2_opinion_1.sha_public user_2_opinion_1.save() + + opinion_not_picked = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + opinion_not_picked.save() + + user_1_opinion_2 = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + user_1_opinion_2.sha_picked = user_1_opinion_2.sha_public user_1_opinion_2.save() + opinion_not_picked = PublishedContentFactory(author_list=[self.user_author], type="OPINION") + opinion_not_picked.save() + + PickListOperation.objects.create( + content=user_1_opinion_1, + operation="PICK", + staff_user=self.user_staff, + operation_date=datetime.datetime.now(), + version=user_1_opinion_1.sha_public, + ) + PickListOperation.objects.create( + content=user_2_opinion_1, + operation="PICK", + staff_user=self.user_staff, + operation_date=datetime.datetime.now(), + version=user_2_opinion_1.sha_public, + ) + PickListOperation.objects.create( + content=user_1_opinion_2, + operation="PICK", + staff_user=self.user_staff, + operation_date=datetime.datetime.now(), + version=user_1_opinion_2.sha_public, + ) + result = self.client.get( reverse("opinion:view", kwargs={"pk": user_1_opinion_2.pk, "slug": user_1_opinion_2.slug}) ) diff --git a/zds/tutorialv2/tests/tests_views/tests_quizz.py b/zds/tutorialv2/tests/tests_views/tests_quizz.py new file mode 100644 index 0000000000..b500a1fa14 --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/tests_quizz.py @@ -0,0 +1,78 @@ +from django.test import TestCase +from zds.tutorialv2.models.quizz import QuizzAvailableAnswer, QuizzQuestion, QuizzUserAnswer +from zds.tutorialv2.tests.factories import QuizzQuestionFactory, QuizzAvailableAnswerFactory, QuizzUserAnswerFactory + + +class QuizzQuestionTestCase(TestCase): + def setUp(self): + self.question_1 = QuizzQuestionFactory() + self.question_2 = QuizzQuestionFactory() + + self.answer_1 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=False) + self.answer_2 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=False) + self.answer_3 = QuizzAvailableAnswerFactory(related_question=self.question_2, is_good=True) + self.answer_4 = QuizzAvailableAnswerFactory(related_question=self.question_2, is_good=False) + + self.user_answer_1 = QuizzUserAnswerFactory(related_question=self.question_1) + self.user_answer_2 = QuizzUserAnswerFactory(related_question=self.question_2) + + def test_question_count(self): + # Vérifiez qu'il y a bien deux questions créées dans la base de données + self.assertEqual(QuizzQuestion.objects.count(), 2) + + def test_answer_count(self): + # Vérifiez qu'il y a bien quatre réponses créées dans la base de données + self.assertEqual(QuizzAvailableAnswer.objects.count(), 4) + + def test_user_answer_count(self): + # Vérifiez qu'il y a bien deux réponses d'utilisateur créées dans la base de données + self.assertEqual(QuizzUserAnswer.objects.count(), 2) + + def test_related_user_answers(self): + # Vérifiez que les réponses d'utilisateur sont bien liées aux bonnes questions + self.assertEqual(self.user_answer_1.related_question, self.question_1) + self.assertEqual(self.user_answer_2.related_question, self.question_2) + + def test_related_answers(self): + self.assertEqual(self.answer_1.related_question, self.question_1) + self.assertEqual(self.answer_2.related_question, self.question_1) + self.assertEqual(self.answer_3.related_question, self.question_2) + self.assertEqual(self.answer_4.related_question, self.question_2) + + def test_answer_is_good(self): + # Vérifiez qu'au moins une réponse disponible pour chaque question est marquée comme bonne + self.assertFalse(self.question_1.quizzavailableanswer_set.filter(is_good=True).exists()) + self.assertTrue(self.question_2.quizzavailableanswer_set.filter(is_good=True).exists()) + + # def test_at_least_one_good_answer(self): + # # Vérifiez qu'au moins une réponse disponible pour chaque question est marquée comme bonne + # question_1_answers = QuizzAvailableAnswer.objects.filter(related_question=self.question_1) + # question_2_answers = QuizzAvailableAnswer.objects.filter(related_question=self.question_2) + + # self.assertFalse(any(answer.is_good for answer in question_1_answers)) + # self.assertTrue(any(answer.is_good for answer in question_2_answers)) + + def test_user_answer_unique_id(self): + # Vérifiez que chaque réponse d'utilisateur a un ID unique + self.assertNotEqual(self.user_answer_1.full_answer_id, self.user_answer_2.full_answer_id) + + +class QuizzSeveralGoodAnswers(TestCase): + def setUp(self): + self.question_1 = QuizzQuestionFactory() + + self.answer_1 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=False) + self.answer_2 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=False) + self.answer_3 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=True) + self.answer_4 = QuizzAvailableAnswerFactory(related_question=self.question_1, is_good=True) + + self.user_answer_1 = QuizzUserAnswerFactory(related_question=self.question_1) + + def test_answer_count(self): + # Vérifiez qu'il y a bien quatre réponses créées dans la base de données + self.assertEqual(QuizzAvailableAnswer.objects.count(), 4) + + def test_nb_good_answers(self): + # Vérifier qu'il y a bien 2 bonnes et 2 mauvaises réponses + self.assertEqual(self.question_1.quizzavailableanswer_set.filter(is_good=True).count(), 2) + self.assertEqual(self.question_1.quizzavailableanswer_set.filter(is_good=False).count(), 2) diff --git a/zds/tutorialv2/tests/tests_views/tests_stats.py b/zds/tutorialv2/tests/tests_views/tests_stats.py index d05c1b38ed..e57d0a1d3b 100644 --- a/zds/tutorialv2/tests/tests_views/tests_stats.py +++ b/zds/tutorialv2/tests/tests_views/tests_stats.py @@ -1,9 +1,12 @@ import datetime from copy import deepcopy +import json from random import randint from unittest import mock + from django.conf import settings +from django.http import Http404 from django.test import TestCase from django.test.utils import override_settings from django.urls import reverse @@ -11,10 +14,12 @@ from zds.gallery.tests.factories import UserGalleryFactory from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.quizz import QuizzQuestion, QuizzUserAnswer from zds.tutorialv2.tests.factories import PublishableContentFactory, ContainerFactory, ExtractFactory from zds.tutorialv2.models.database import Validation, PublishedContent from zds.tutorialv2.publication_utils import publish_content from zds.tutorialv2.tests import TutorialTestMixin +from zds.tutorialv2.views.statistics import DeleteQuizz from zds.utils.tests.factories import LicenceFactory overridden_zds_app = deepcopy(settings.ZDS_APP) @@ -375,3 +380,77 @@ def get_small_opinion(self): opinion.save() opinion_draft = opinion.load_version() return publish_content(opinion, opinion_draft) + + +class DeleteQuizzTestCase(TestCase): + def setUp(self): + self.view = DeleteQuizz() + self.url = "/contenus/delete_quizz/" + + def test_invalid_start_date_format(self): + # Edge case test for invalid start date format + view = self.view + view.request = type("Request", (), {"GET": {"start_date": "invalid_date_format", "end_date": "2022-01-07"}})() + + with self.assertRaises(Http404): + start_date, end_date = view.get_start_and_end_dates() + + def test_invalid_end_date_format(self): + # Edge case test for invalid end date format + view = self.view + view.request = type("Request", (), {"GET": {"start_date": "2022-01-07", "end_date": "invalid_date_format"}})() + + with self.assertRaises(Http404): + start_date, end_date = view.get_start_and_end_dates() + + def test_get_start_and_end_dates_no_dates(self): + view = self.view + view.request = type("Request", (), {"GET": {}})() + start_date, end_date = view.get_start_and_end_dates() + assert end_date == datetime.date.today() + assert start_date == (end_date - datetime.timedelta(days=7)) + + def test_get_start_and_end_dates_valid_dates(self): + view = self.view + view.request = type("Request", (), {"GET": {"start_date": "2022-01-01", "end_date": "2022-01-07"}})() + start_date, end_date = view.get_start_and_end_dates() + assert start_date == datetime.date(2022, 1, 1) + assert end_date == datetime.date(2022, 1, 7) + + def test_delete_quizz_with_question(self): + + quizz_name = "example" + question_text = "What is your name?" + question = QuizzQuestion.objects.create(url=quizz_name, question=question_text) + QuizzUserAnswer.objects.create(related_question=question, date_answer=datetime.date.today()) + QuizzUserAnswer.objects.create( + related_question=question, date_answer=datetime.date.today() - datetime.timedelta(days=1) + ) + data = {"quizzName": quizz_name, "question": question_text} + # Send a request to delete the user answers for the question + response = self.client.post(self.url, data=json.dumps(data), content_type="application/json") + + # Assert that the response status code is 200 OK + self.assertEqual(response.status_code, 200) + # Assert that the user answers have been deleted + self.assertEqual(QuizzUserAnswer.objects.filter(related_question=question).count(), 0) + + def test_delete_quizz_without_question(self): + + quizz_name = "example" + question1 = QuizzQuestion.objects.create(url=quizz_name, question="What is your name?") + QuizzUserAnswer.objects.create(related_question=question1, date_answer=datetime.date.today()) + question2 = QuizzQuestion.objects.create(url=quizz_name, question="What is your age?") + QuizzUserAnswer.objects.create( + related_question=question2, date_answer=datetime.date.today() - datetime.timedelta(days=1) + ) + + data = {"quizzName": quizz_name} + # Send a request to delete all user answers for the quizz + response = self.client.post(self.url, data=json.dumps(data), content_type="application/json") + + # Assert that the response status code is 200 OK + self.assertEqual(response.status_code, 200) + + # Assert that all user answers have been deleted + self.assertEqual(QuizzUserAnswer.objects.filter(related_question__url=quizz_name).count(), 0) diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py index 3addce26df..9b172617d9 100644 --- a/zds/tutorialv2/urls/urls_contents.py +++ b/zds/tutorialv2/urls/urls_contents.py @@ -1,7 +1,13 @@ -from django.urls import path, re_path +from django.urls import path from django.views.generic.base import RedirectView -from zds.tutorialv2.views.contents import DisplayContent, CreateContent, EditContent, EditContentLicense, DeleteContent +from zds.tutorialv2.views.contents import ( + DisplayContent, + CreateContent, + EditContent, + EditContentLicense, + DeleteContent, +) from zds.tutorialv2.views.events import EventsList from zds.tutorialv2.views.goals import EditGoals, MassEditGoals, ViewContentsByGoal from zds.tutorialv2.views.validations_contents import ActivateJSFiddleInContent @@ -31,7 +37,12 @@ from zds.tutorialv2.views.lists import TagsListView, ContentOfAuthor, ListContentReactions from zds.tutorialv2.views.alerts import SendContentAlert, SolveContentAlert from zds.tutorialv2.views.misc import RequestFeaturedContent, FollowNewContent, WarnTypo -from zds.tutorialv2.views.statistics import ContentStatisticsView +from zds.tutorialv2.views.statistics import ( + ContentStatisticsView, + ContentQuizzStatistics, + DeleteQuizz, + QuizzContentStatistics, +) from zds.tutorialv2.views.comments import ( SendNoteFormView, UpdateNoteView, @@ -117,7 +128,18 @@ CreateExtract.as_view(), name="create-extract", ), + path( + "nouveau-quizz/////", + CreateExtract.as_view(quizz=True), + name="create-quizz", + ), + path( + "nouveau-quizz/(///", + CreateExtract.as_view(quizz=True), + name="create-quizz", + ), path("nouvelle-section///", CreateExtract.as_view(), name="create-extract"), + path("nouveau-quizz///", CreateExtract.as_view(quizz=True), name="create-quizz"), # edit: path( "editer-conteneur////" r"/", @@ -189,4 +211,8 @@ path("modifier-objectifs/", MassEditGoals.as_view(), name="mass-edit-goals"), path("modifier-objectifs//", EditGoals.as_view(), name="edit-goals"), path("objectifs/", ViewContentsByGoal.as_view(), name="view-goals"), + # quizz + path("reponses///", ContentQuizzStatistics.as_view(), name="answer-quizz"), + path("stats_quizz///", QuizzContentStatistics.as_view(), name="stats-quizz"), + path("delete_quizz/", DeleteQuizz.as_view(), name="delete_quizz"), ] diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 5914138369..3305c75092 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -319,7 +319,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_le from zds.tutorialv2.models.versioned import Container, Extract, VersionedContent, PublicContent - if "version" in json and json["version"] in (2, 2.1): # add newest version of manifest + if "version" in json and json["version"] in (2, 2.1, 2.2): # add newest version of manifest if not all_is_string_appart_from_given_keys(json, ("children", "ready_to_publish", "version")): raise BadManifestError(_("Le fichier manifest n'est pas bien formaté.")) # create and fill the container @@ -397,6 +397,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_le extract = Extract("text", "") if "text" in json: extract.text = json["text"] # probably 'text.md' ! + extract.is_quizz = json.get("is_quizz", False) versioned.add_extract(extract, generate_slug=True) else: # it's a tutorial @@ -408,6 +409,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_le ) if "text" in extract: new_extract.text = extract["text"] + new_extract.is_quizz = extract.get("is_quizz", False) versioned.add_extract(new_extract, generate_slug=False) elif json["type"] == "BIG" and "parts" in json: @@ -444,6 +446,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_le if "text" in extract: new_extract.text = extract["text"] + new_extract.is_quizz = extract.get("is_quizz", False) new_chapter.add_extract(new_extract, generate_slug=False) return versioned @@ -463,7 +466,7 @@ def fill_containers_from_json(json_sub, parent): if "children" in json_sub: for child in json_sub["children"]: - if not all_is_string_appart_from_given_keys(child, ("children", "ready_to_publish")): + if not all_is_string_appart_from_given_keys(child, ("children", "ready_to_publish", "is_quizz")): raise BadManifestError( _("Le fichier manifest n'est pas bien formaté dans le conteneur " + str(json_sub["title"])) ) @@ -496,7 +499,7 @@ def fill_containers_from_json(json_sub, parent): except KeyError: pass new_extract = Extract(child["title"], slug) - + new_extract.is_quizz = child.get("is_quizz", False) if "text" in child: new_extract.text = child["text"] try: @@ -614,7 +617,7 @@ def export_extract(extract, with_text): dct["object"] = "extract" dct["slug"] = extract.slug dct["title"] = extract.title - + dct["is_quizz"] = extract.is_quizz if extract.text and not with_text: dct["text"] = extract.text elif extract.text: @@ -680,7 +683,7 @@ def export_content(content, with_text=False, ready_to_publish_only=False): dct = export_container(content, with_text, ready_to_publish_only) # append metadata : - dct["version"] = 2.1 + dct["version"] = 2.2 dct["description"] = content.description dct["type"] = content.type if content.licence: diff --git a/zds/tutorialv2/views/containers_extracts.py b/zds/tutorialv2/views/containers_extracts.py index ef56962a2d..2e3bb528cf 100644 --- a/zds/tutorialv2/views/containers_extracts.py +++ b/zds/tutorialv2/views/containers_extracts.py @@ -196,12 +196,13 @@ class CreateExtract(LoggedWithReadWriteHability, SingleContentFormViewMixin, For form_class = ExtractForm content = None authorized_for_staff = True + quizz = False def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["container"] = search_container_or_404(self.versioned_object, self.kwargs) context["gallery"] = self.object.gallery - + context["quizz"] = self.quizz return context def render_to_response(self, context, **response_kwargs): @@ -216,7 +217,7 @@ def form_valid(self, form): parent = search_container_or_404(self.versioned_object, self.kwargs) sha = parent.repo_add_extract( - form.cleaned_data["title"], form.cleaned_data["text"], form.cleaned_data["msg_commit"] + form.cleaned_data["title"], form.cleaned_data["text"], form.cleaned_data["msg_commit"], quizz=self.quizz ) # then save diff --git a/zds/tutorialv2/views/display.py b/zds/tutorialv2/views/display.py index ad7804d058..3541281902 100644 --- a/zds/tutorialv2/views/display.py +++ b/zds/tutorialv2/views/display.py @@ -1,5 +1,5 @@ import logging - +from django.db.models import F from django.conf import settings from django.http import Http404 from django.utils.translation import gettext_lazy as _ @@ -86,6 +86,8 @@ def get_context_data(self, **kwargs): content_type=self.current_content_type, must_redirect=False ) + if self.current_content_type == "OPINION": + queryset_pagination = queryset_pagination.filter(content__sha_picked=F("sha_public")) context["previous_content"] = ( queryset_pagination.filter(publication_date__lt=self.public_content_object.publication_date) .order_by("-publication_date") diff --git a/zds/tutorialv2/views/statistics.py b/zds/tutorialv2/views/statistics.py index 90ecd4058e..3b20e3fcbc 100644 --- a/zds/tutorialv2/views/statistics.py +++ b/zds/tutorialv2/views/statistics.py @@ -1,17 +1,28 @@ import itertools +import uuid +from collections import OrderedDict, Counter import logging import urllib.parse from datetime import timedelta, datetime, date - +from json import loads, dumps import requests + +from django.views import View +from django.db.models import Subquery from django.conf import settings from django.contrib import messages from django.core.exceptions import PermissionDenied +from django.db.models import Count +from django.http import Http404, StreamingHttpResponse from django.utils.translation import gettext_lazy as _ from django.views.generic import FormView -from zds.tutorialv2.forms import ContentCompareStatsURLForm -from zds.tutorialv2.mixins import SingleOnlineContentDetailViewMixin +from zds.tutorialv2.forms import ContentCompareStatsURLForm, QuizzStatsForm +from zds.tutorialv2.mixins import ( + SingleOnlineContentDetailViewMixin, + SingleOnlineContentFormViewMixin, +) +from zds.tutorialv2.models.quizz import QuizzUserAnswer, QuizzQuestion, QuizzAvailableAnswer from zds.tutorialv2.utils import NamedUrl @@ -24,6 +35,47 @@ def __init__(self, logger, msg): super().__init__(logger, msg) +class ContentQuizzStatistics(SingleOnlineContentFormViewMixin): + form_class = QuizzStatsForm + + def get_form_kwargs(self): + return { + "json_dict": loads(self.request.body.decode("utf-8")), + } + + def form_valid(self, form): + url = form.cleaned_data["url"] + answers = {k: v for k, v in form.cleaned_data["result"].items()} + resp_id = str(uuid.uuid4()) + for question, answers in answers.items(): + db_question = QuizzQuestion.objects.filter(question=question, url=url).first() + if not db_question: + db_question = QuizzQuestion(question=question, url=url, question_type="qcm") + db_question.save() + given_available_answers = form.cleaned_data["expected"][question] + answers_labels = list(given_available_answers.keys()) + known_labels = QuizzAvailableAnswer.objects.filter( + related_question=db_question, label__in=answers_labels + ).values_list("label", flat=True) + + not_existing_answers = [label for label in answers_labels if label not in known_labels] + + QuizzUserAnswer.objects.exclude(answer__in=answers_labels).filter(related_question=db_question).delete() + QuizzAvailableAnswer.objects.exclude(label__in=answers_labels).filter(related_question=db_question).delete() + + for label in not_existing_answers: + db_answer = QuizzAvailableAnswer( + related_question=db_question, label=label, is_good=given_available_answers[label] + ) + db_answer.save() + for answer in answers["labels"]: + stat = QuizzUserAnswer( + related_content=self.object, related_question=db_question, full_answer_id=resp_id, answer=answer + ) + stat.save() + return StreamingHttpResponse(dumps({"status": "ok"})) + + class ContentStatisticsView(SingleOnlineContentDetailViewMixin, FormView): template_name = "tutorialv2/stats/index.html" form_class = ContentCompareStatsURLForm @@ -117,7 +169,7 @@ def get_stat_metrics(data, metric_name): else: y.append(val[0].get(metric_name, 0)) - return (x, y) + return x, y @staticmethod def get_ref_metrics(data): @@ -132,26 +184,19 @@ def get_ref_metrics(data): return refs def get_start_and_end_dates(self): - end_date = self.request.GET.get("end_date", None) + try: - end_date = datetime.strptime(end_date, "%Y-%m-%d").date() - except TypeError: - end_date = date.today() - except ValueError: - end_date = date.today() - messages.error(self.request, _("La date de fin fournie est invalide.")) - - start_date = self.request.GET.get("start_date", None) + end_date = self.request.GET.get("end_date", None) or date.today() + end_date = datetime.strptime(str(end_date), "%Y-%m-%d").date() + except (TypeError, ValueError) as e: + raise Http404("Invalid end date format") from e + try: - start_date = datetime.strptime(start_date, "%Y-%m-%d").date() - except TypeError: - start_date = end_date - timedelta(days=7) - except ValueError: - start_date = end_date - timedelta(days=7) - messages.error(self.request, _("La date de début fournie est invalide.")) + start_date = self.request.GET.get("start_date", None) or (end_date - timedelta(days=7)) + start_date = datetime.strptime(str(start_date), "%Y-%m-%d").date() - if start_date > end_date: - end_date, start_date = start_date, end_date + except (TypeError, ValueError) as e: + raise Http404("Invalid start date format") from e return start_date, end_date @@ -262,7 +307,7 @@ def get_context_data(self, **kwargs): if display_mode.lower() == "global": reports = {NamedUrl(display_mode, "", 0): self.merge_report_to_global(reports, report_field)} - + quizz_stats = self.build_quizz_stats(end_date, start_date) context.update( { "display": display_mode, @@ -272,6 +317,99 @@ def get_context_data(self, **kwargs): "referrers": referrers, "type_referrers": type_referrers, "keywords": keywords, + "quizz": quizz_stats, } ) return context + + def build_quizz_stats(self, end_date, start_date): + quizz_stats = {} + base_questions = list( + QuizzUserAnswer.objects.filter( + date_answer__range=(start_date, end_date), related_content__pk=self.object.pk + ).values_list("related_question", flat=True) + ) + total_per_question = list( + QuizzUserAnswer.objects.values("related_question__pk", "full_answer_id") + .filter(related_question__pk__in=base_questions, date_answer__range=(start_date, end_date)) + .annotate(nb=Count("full_answer_id")) + ) + total_per_question = Counter([a["related_question__pk"] for a in total_per_question]) + total_per_label = list( + QuizzUserAnswer.objects.values( + "related_question__pk", "related_question__question", "related_question__url", "answer" + ) + .filter(related_question__in=base_questions, date_answer__range=(start_date, end_date)) + .annotate(nb=Count("answer")) + ) + for base_question in set(base_questions): + full_answers_total = {} + name = "" + question = "" + for available_answer in ( + QuizzAvailableAnswer.objects.filter(related_question__pk=base_question) + .prefetch_related("related_question") + .all() + ): + full_answers_total[available_answer.label] = {"good": available_answer.is_good, "nb": 0} + name = available_answer.related_question.url + question = available_answer.related_question.question + for r in total_per_label: + if ( + r["related_question__pk"] == base_question + and r["answer"].strip() == available_answer.label.strip() + ): + full_answers_total[available_answer.label]["nb"] = r["nb"] + if name not in quizz_stats: + quizz_stats[name] = OrderedDict() + quizz_stats[name][question] = {"total": total_per_question[base_question], "responses": full_answers_total} + sorted_quizz_stats = {} + for name in sorted(quizz_stats.keys()): + sorted_quizz_stats[name] = quizz_stats[name] + return sorted_quizz_stats + + +class QuizzContentStatistics(ContentStatisticsView): + template_name = "tutorialv2/stats/quizz_stats.html" + + +class DeleteQuizz(View): + def get_start_and_end_dates(self): + + try: + end_date = self.request.GET.get("end_date", None) or date.today() + end_date = datetime.strptime(str(end_date), "%Y-%m-%d").date() + except (TypeError, ValueError) as e: + raise Http404("Invalid end date format") from e + + try: + start_date = self.request.GET.get("start_date", None) or (end_date - timedelta(days=7)) + start_date = datetime.strptime(str(start_date), "%Y-%m-%d").date() + + except (TypeError, ValueError) as e: + raise Http404("Invalid start date format") from e + + return start_date, end_date + + def post(self, request): + + start_date, end_date = self.get_start_and_end_dates() + + data = loads(request.body) + + # Extract the quizzName from the data + quizz_name = data.get("quizzName") + question = data.get("question") + + if question: + related_question_ids = QuizzQuestion.objects.filter(url=quizz_name, question=question).values_list( + "id", flat=True + ) + else: + related_question_ids = QuizzQuestion.objects.filter(url=quizz_name).values_list("id", flat=True) + + QuizzUserAnswer.objects.filter( + related_question_id__in=Subquery(related_question_ids), date_answer__range=(start_date, end_date) + ).delete() + + return StreamingHttpResponse(dumps({"status": "ok"})) diff --git a/zds/utils/templatetags/dict_get.py b/zds/utils/templatetags/dict_get.py new file mode 100644 index 0000000000..e69de29bb2