From c5896536d74e9080dc46aab14c099598c4bcdb5e Mon Sep 17 00:00:00 2001 From: Dominik Seeger <dominik.seeger@gmx.net> Date: Wed, 2 Oct 2019 11:34:15 +0200 Subject: [PATCH 1/2] configured eslint and updated dependencies --- frontend/.eslintrc.js | 33 +- frontend/package.json | 23 +- frontend/src/App.vue | 12 +- frontend/src/api.ts | 8 +- frontend/src/components/AutoLogout.vue | 34 +- frontend/src/components/BaseLayout.vue | 72 +- .../src/components/CorrectionStatistics.vue | 25 +- frontend/src/components/GDPRNotice.vue | 206 +- frontend/src/components/LabelStatistics.vue | 56 +- .../src/components/PasswordChangeDialog.vue | 97 +- frontend/src/components/RegisterDialog.vue | 28 +- frontend/src/components/SubmissionTests.vue | 69 +- frontend/src/components/UserOptions.vue | 9 +- frontend/src/components/export/DataExport.vue | 56 +- .../src/components/export/ExportDialog.vue | 36 +- .../src/components/export/InstanceExport.vue | 44 +- .../feedback_labels/FeedbackLabel.vue | 22 +- .../feedback_labels/FeedbackLabelForm.vue | 87 +- .../feedback_labels/FeedbackLabelUpdater.vue | 26 +- .../feedback_labels/FeedbackLabelsList.vue | 44 +- .../feedback_labels/LabelSelector.vue | 40 +- .../feedback_list/FeedbackListHelpCard.vue | 13 +- .../feedback_list/FeedbackSearchOptions.vue | 69 +- .../feedback_list/FeedbackTable.vue | 39 +- .../components/mixins/commentLabelSelector.ts | 18 +- frontend/src/components/mixins/exportMixin.ts | 2 +- .../student/NonFinalFeedbackAlert.vue | 12 +- .../src/components/student/SubmissionList.vue | 37 +- .../components/student_list/StudentList.vue | 100 +- .../student_list/StudentListHelpCard.vue | 2 +- .../student_list/StudentListMenu.vue | 19 +- .../student_list/StudentListReverseMapper.vue | 15 +- .../submission_notes/CorrectionHelpCard.vue | 49 +- .../RouteChangeConfirmation.vue | 61 +- .../submission_notes/SubmissionCorrection.vue | 80 +- .../base/BaseAnnotatedSubmission.vue | 10 +- .../submission_notes/base/CommentForm.vue | 60 +- .../submission_notes/base/FeedbackComment.vue | 118 +- .../submission_notes/base/SubmissionLine.vue | 10 +- .../AnnotatedSubmissionBottomToolbar.vue | 154 +- .../AnnotatedSubmissionTopToolbar.vue | 24 +- .../ToggleFeedbackVisibilityButton.vue | 17 +- .../submission_type/SubmissionType.vue | 35 +- .../SubmissionTypesOverview.vue | 57 +- .../submission_type/solution/Solution.vue | 73 +- .../solution/SolutionComment.vue | 96 +- .../subscriptions/SubscriptionCreation.vue | 33 +- .../subscriptions/SubscriptionEnded.vue | 7 +- .../subscriptions/SubscriptionForList.vue | 7 +- .../subscriptions/SubscriptionList.vue | 47 +- .../subscriptions/SubscriptionsForStage.vue | 11 +- .../src/components/tutor_list/TutorList.vue | 66 +- frontend/src/components/util/FileSelect.vue | 4 +- frontend/src/main.ts | 2 +- frontend/src/models.ts | 4 +- frontend/src/pages/LayoutSelector.vue | 8 +- frontend/src/pages/Login.vue | 73 +- frontend/src/pages/PageNotFound.vue | 27 +- frontend/src/pages/StartPageSelector.vue | 4 +- frontend/src/pages/Statistics.vue | 14 +- .../src/pages/StudentSubmissionSideView.vue | 10 +- frontend/src/pages/SubscriptionWorkPage.vue | 22 +- .../src/pages/base/FeedbackHistoryPage.vue | 12 +- .../pages/base/TutorReviewerBaseLayout.vue | 23 +- .../src/pages/reviewer/ReviewerLayout.vue | 15 +- .../src/pages/reviewer/ReviewerStartPage.vue | 15 +- .../pages/reviewer/StudentOverviewPage.vue | 80 +- .../src/pages/reviewer/TutorOverviewPage.vue | 4 +- frontend/src/pages/student/StudentLayout.vue | 37 +- frontend/src/pages/student/StudentPage.vue | 37 +- .../pages/student/StudentSubmissionPage.vue | 94 +- frontend/src/pages/tutor/TutorLayout.vue | 6 +- frontend/src/pages/tutor/TutorStartPage.vue | 27 +- frontend/src/router/index.ts | 2 +- frontend/src/store/modules/feedback-labels.ts | 8 +- .../feedback_list/feedback-search-options.ts | 2 +- .../modules/feedback_list/feedback-table.ts | 2 +- .../src/store/modules/submission-notes.ts | 14 +- frontend/src/store/modules/subscriptions.ts | 14 +- frontend/src/store/store.ts | 4 +- frontend/src/util/helpers.ts | 18 +- frontend/src/util/interceptor.ts | 4 +- frontend/src/util/shortkeys.ts | 8 +- .../tests/unit/components/DataExport.spec.ts | 2 +- frontend/tests/unit/helpers/helpers.spec.ts | 58 +- frontend/tests/utils/testUtils.ts | 20 +- frontend/yarn.lock | 3425 +++++++++++------ 87 files changed, 4128 insertions(+), 2339 deletions(-) diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 5cfdc93a..d2fb930e 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -1,18 +1,35 @@ module.exports = { root: true, env: { - node: true + node: true, }, - 'extends': [ - 'plugin:vue/essential', - '@vue/standard', - '@vue/typescript' + extends: [ + 'plugin:vue/recommended', + '@vue/typescript', ], rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'semi': ['error', 'never'], + 'quotes': ['error', 'single'], + 'eqeqeq': 'error', + 'default-case': 'error', + 'guard-for-in': 'error', + 'yoda': 'error', + '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'as' }] }, parserOptions: { - parser: 'typescript-eslint-parser' - } + parser: '@typescript-eslint/parser', + }, + plugins: ['@typescript-eslint'], + overrides: [ + { + files: [ + '**/__tests__/*.{j,t}s?(x)', + ], + env: { + mocha: true, + }, + }, + ], } diff --git a/frontend/package.json b/frontend/package.json index 57e1a8b1..0f0fdcd0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,19 +35,22 @@ "@types/mocha": "^5.2.5", "@types/nightwatch": "^0.9.8", "@types/sinon": "^7.0.2", - "@vue/cli-plugin-eslint": "^3.0.0-rc.10", - "@vue/cli-plugin-typescript": "^3.2.0", - "@vue/cli-plugin-unit-mocha": "^3.2.0", - "@vue/cli-service": "^3.2.0", - "@vue/eslint-config-standard": "^3.0.0-rc.10", - "@vue/eslint-config-typescript": "^3.2.0", - "@vue/test-utils": "^1.0.0-beta.27", + "@vue/cli-plugin-eslint": "^3.11.0", + "@vue/cli-plugin-typescript": "^3.11.0", + "@vue/cli-plugin-unit-mocha": "^3.11.0", + "@vue/cli-service": "^3.11.0", + "@vue/test-utils": "^1.0.0-beta.29", + "@vue/eslint-config-typescript": "^4.0.0", + "@typescript-eslint/parser": "^2.3.2", + "@typescript-eslint/eslint-plugin": "^2.3.2", "chai": "^4.2.0", "mocha": "^5.2.0", - "mocha-webpack": "^1.1.0", "mock-local-storage": "^1.1.8", "sinon": "^7.2.2", - "typescript": "^3.2.2", - "vue-template-compiler": "^2.5.16" + "eslint": "^5.16.0", + "eslint-plugin-vue": "^5.0.0", + "typescript": "^3.4.3", + "vue-template-compiler": "^2.5.16", + "webpack": "^4.41.0" } } diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 1e46ec6e..c8171566 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,24 +1,24 @@ <template> <div id="app"> <v-app :dark="darkMode"> - <notifications/> - <router-view/> - <auto-logout/> + <notifications /> + <router-view /> + <auto-logout /> </v-app> </div> </template> <script> // load fonts and icons so that webpack processes them -import "@/assets/material-icons.css" -import "@/assets/fonts.css" +import '@/assets/material-icons.css' +import '@/assets/fonts.css' import { UI } from '@/store/modules/ui' import AutoLogout from '@/components/AutoLogout' export default { + name: 'App', components: { AutoLogout }, - name: 'app', computed: { darkMode () { return UI.state.darkMode diff --git a/frontend/src/api.ts b/frontend/src/api.ts index c616cf07..7f1fa9a9 100644 --- a/frontend/src/api.ts +++ b/frontend/src/api.ts @@ -100,7 +100,7 @@ export async function fetchFeedback ({ ofSubmission }: {ofSubmission: string}): } export async function fetchExamTypes (): Promise<Array<Exam>> { - const url = `/api/examtype/` + const url = '/api/examtype/' return (await ax.get(url)).data } @@ -143,7 +143,7 @@ export async function createAssignment ( const data = { subscription: subscription ? subscription.pk : subscriptionPk } - return (await ax.post(`/api/assignment/`, data)).data + return (await ax.post('/api/assignment/', data)).data } export async function submitFeedbackForAssignment ({ feedback, assignment }: @@ -157,7 +157,7 @@ export async function submitUpdatedFeedback ({ feedback }: } export async function submitFeedback ({ feedback }: {feedback: CreateUpdateFeedback}): Promise<Feedback> { - return (await ax.post(`/api/feedback/`, feedback)).data + return (await ax.post('/api/feedback/', feedback)).data } export async function fetchSubmissionTypes (): Promise<Array<SubmissionType>> { @@ -176,7 +176,7 @@ export async function deleteSolutionComment (pk: number): Promise<AxiosResponse< } export async function createSolutionComment(comment: Partial<SolutionComment>): Promise<SolutionComment> { - const url = `/api/solution-comment/` + const url = '/api/solution-comment/' return (await ax.post(url, comment)).data } diff --git a/frontend/src/components/AutoLogout.vue b/frontend/src/components/AutoLogout.vue index fa7d52a8..b3d591eb 100644 --- a/frontend/src/components/AutoLogout.vue +++ b/frontend/src/components/AutoLogout.vue @@ -1,28 +1,36 @@ <template> <v-dialog + v-model="logoutDialog" persistent max-width="30%" - v-model="logoutDialog" > <v-card id="logout-dialog"> <v-card-title class="headline"> You'll be logged out! </v-card-title> <v-card-text> - Due to inactivity you'll be logged out in a couple of moments.<br/> + Due to inactivity you'll be logged out in a couple of moments.<br> Any unsaved work will be lost. Click Continue to stay logged in. </v-card-text> <v-card-actions> - <v-btn flat color="grey lighten-0" - id="logout-btn" - @click="logout" - >Logout now</v-btn> - <v-spacer/> - <v-btn flat color="blue darken-2" - id="continue-btn" - @click="continueWork" - >Continue</v-btn> + <v-btn + id="logout-btn" + flat + color="grey lighten-0" + @click="logout" + > + Logout now + </v-btn> + <v-spacer /> + <v-btn + id="continue-btn" + flat + color="blue darken-2" + @click="continueWork" + > + Continue + </v-btn> </v-card-actions> </v-card> </v-dialog> @@ -72,7 +80,7 @@ export default class AutoLogout extends Vue { mounted () { // show notification on unload if logged in - window.onbeforeunload = event => { + window.onbeforeunload = (event: BeforeUnloadEvent) => { if (Authentication.isLoggedIn) { // return something to trigger the confirmation dialog // since firefox 44 it is no longer possible to show a custom confirmation message @@ -87,7 +95,7 @@ export default class AutoLogout extends Vue { if (this.$route.name !== 'login' && Authentication.isLoggedIn) { if (Date.now() > this.lastTokenRefreshTry + this.jwtTimeDelta) { this.logoutDialog = false - actions.logout("You've been logged out due to inactivity.") + actions.logout('You\'ve been logged out due to inactivity.') } else if (Date.now() + timeDialogAppearsBeforeLogout > this.lastTokenRefreshTry + this.jwtTimeDelta) { this.logoutDialog = true } diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index 789b03e5..4c8f897c 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -11,42 +11,56 @@ <v-list> <v-list-tile> <v-list-tile-action v-if="mini"> - <v-btn icon @click.native.stop="mini = !mini"> + <v-btn + icon + @click.native.stop="mini = !mini" + > <v-icon>chevron_right</v-icon> </v-btn> </v-list-tile-action> <v-list-tile-content class="title" > - <slot name="header"></slot> + <slot name="header" /> </v-list-tile-content> <v-list-tile-action v-if="!mini"> - <v-btn icon @click.native.stop="mini = !mini"> + <v-btn + icon + @click.native.stop="mini = !mini" + > <v-icon>chevron_left</v-icon> </v-btn> </v-list-tile-action> </v-list-tile> </v-list> </v-toolbar> - <slot name="sidebar-content"></slot> + <slot name="sidebar-content" /> <div class="sidebar-footer"> - <v-tooltip top style="min-width: 150px"> + <v-tooltip + top + style="min-width: 150px" + > <v-switch - class="ml-3" slot="activator" + v-model="darkMode" + class="ml-3" :disabled="!darkModeUnlocked" - v-model="darkMode" label="dark mode"/> + label="dark mode" + /> <span v-if="darkModeUnlocked">Experimental: styling issues may occur!</span> <span v-else>You need to visit the feedback site below first!</span> </v-tooltip> - <v-footer v-if="!mini" @click.native="logFeedbackClick"> - <v-spacer/> + <v-footer + v-if="!mini" + @click.native="logFeedbackClick" + > + <v-spacer /> <a href="https://gitlab.gwdg.de/j.michal/grady/issues" target="_blank" class="feedback-link" >Give us Feedback!</a> - <v-spacer/> + <v-spacer /> </v-footer> </div> </v-navigation-drawer> @@ -61,27 +75,45 @@ <v-toolbar-title> <router-link to="/home"> <v-avatar> - <img v-if="production" :src="productionBrandUrl"/> - <img v-else src="../assets/brand.png"/> + <img + v-if="production" + :src="productionBrandUrl" + > + <img + v-else + src="../assets/brand.png" + > </v-avatar> </router-link> </v-toolbar-title> <span class="pl-2 grady-speak">{{ gradySpeak }}</span> - <v-spacer/> - <slot name="toolbar-center"/> + <v-spacer /> + <slot name="toolbar-center" /> <div class="toolbar-content"> <v-menu bottom offset-y v-if="!isStudent"> <v-btn id="user-options" slot="activator" color="cyan" style="text-transform: none"> {{ userRole }} | {{ username }} <v-icon>arrow_drop_down</v-icon> </v-btn> - <user-options class="mt-1" v-if="!isStudent"/> + <user-options + v-if="!isStudent" + class="mt-1" + /> </v-menu> - <span v-else style="color:#595959"> - {{username}} + <span + v-else + style="color:#595959" + > + {{ username }} </span> </div> - <slot name="toolbar-right"></slot> - <v-btn color="blue darken-1" id="logout" @click.native="logout">Logout</v-btn> + <slot name="toolbar-right" /> + <v-btn + id="logout" + color="blue darken-1" + @click.native="logout" + > + Logout + </v-btn> </v-toolbar> </div> </template> @@ -95,7 +127,7 @@ import { Authentication } from '@/store/modules/authentication' import { actions } from '@/store/actions' export default { - name: 'base-layout', + name: 'BaseLayout', components: { UserOptions }, computed: { username () { return Authentication.state.user.username }, diff --git a/frontend/src/components/CorrectionStatistics.vue b/frontend/src/components/CorrectionStatistics.vue index fe55e9fa..bf827c0a 100644 --- a/frontend/src/components/CorrectionStatistics.vue +++ b/frontend/src/components/CorrectionStatistics.vue @@ -1,22 +1,29 @@ <template> - <v-card class="py-2" id="correction-statistics"> + <v-card + id="correction-statistics" + class="py-2" + > <v-card-title> <span class="title">Statistics</span> </v-card-title> <div v-if="loaded"> <ul class="inline-list mx-3"> - <li>Submissions per participant: <span>{{statistics.submissionsPerStudent}}</span></li> - <li>Submissions per type: <span>{{statistics.submissionsPerType}}</span></li> - <li>Curr. mean score: + <li>Submissions per participant: <span>{{ statistics.submissionsPerStudent }}</span></li> + <li>Submissions per type: <span>{{ statistics.submissionsPerType }}</span></li> + <li> + Curr. mean score: <span> - {{statistics.currentMeanScore === null ? 'N.A.' : statistics.currentMeanScore.toFixed(2)}} + {{ statistics.currentMeanScore === null ? 'N.A.' : statistics.currentMeanScore.toFixed(2) }} </span> </li> </ul> - <v-divider class="mx-2 my-2"></v-divider> - <div v-for="(progress, index) in statistics.submissionTypeProgress" :key="index"> + <v-divider class="mx-2 my-2" /> + <div + v-for="(progress, index) in statistics.submissionTypeProgress" + :key="index" + > <v-card-title class="py-0"> - {{progress.name}} + {{ progress.name }} </v-card-title> <div class="mx-3"> <v-progress-linear @@ -35,7 +42,7 @@ import { actions } from '@/store/actions' export default { - name: 'correction-statistics', + name: 'CorrectionStatistics', data () { return { loaded: false diff --git a/frontend/src/components/GDPRNotice.vue b/frontend/src/components/GDPRNotice.vue index d82c479f..46677c70 100644 --- a/frontend/src/components/GDPRNotice.vue +++ b/frontend/src/components/GDPRNotice.vue @@ -1,99 +1,133 @@ <template> - <div> - <p><strong>Allgemeiner Hinweis und Pflichtinformationen</strong></p> - <p><strong>Benennung der verantwortlichen Stelle</strong></p> - <p>Die verantwortliche Stelle für die Datenverarbeitung auf dieser Website ist:</p> - <p><span id="s3-t-firma">Institut für Informatik - Georg-August-Universität Göttingen</span><br> - <span id="s3-t-ansprechpartner">Dr. Henrik Brosenne</span><br><span id="s3-t-strasse">Goldschmidtstraße 7</span><br> - <span id="s3-t-plz">37077</span> <span id="s3-t-ort">Göttingen</span></p><p></p> - <p>Die verantwortliche Stelle entscheidet allein oder gemeinsam mit anderen über die Zwecke und Mittel der - Verarbeitung von personenbezogenen Daten (z.B. Namen, Kontaktdaten o. Ä.).</p> + <div> + <p><strong>Allgemeiner Hinweis und Pflichtinformationen</strong></p> + <p><strong>Benennung der verantwortlichen Stelle</strong></p> + <p>Die verantwortliche Stelle für die Datenverarbeitung auf dieser Website ist:</p> + <p> + <span id="s3-t-firma">Institut für Informatik - Georg-August-Universität Göttingen</span><br> + <span id="s3-t-ansprechpartner">Dr. Henrik Brosenne</span><br><span id="s3-t-strasse">Goldschmidtstraße 7</span><br> + <span id="s3-t-plz">37077</span> <span id="s3-t-ort">Göttingen</span> + </p><p /> + <p> + Die verantwortliche Stelle entscheidet allein oder gemeinsam mit anderen über die Zwecke und Mittel der + Verarbeitung von personenbezogenen Daten (z.B. Namen, Kontaktdaten o. Ä.). + </p> - <p><strong>Recht auf Beschwerde bei der zuständigen Aufsichtsbehörde</strong></p> - <p>Als Betroffener steht Ihnen im Falle eines datenschutzrechtlichen Verstoßes ein Beschwerderecht bei der zuständigen - Aufsichtsbehörde zu. Zuständige Aufsichtsbehörde bezüglich datenschutzrechtlicher Fragen ist:<br> - Die Landesbeauftragte für den Datenschutz Niedersachsen<br> - Prinzenstraße 5<br> - 30159 Hannover<br> - <p><strong>Recht auf Datenübertragbarkeit</strong></p> - <p>Ihnen steht das Recht zu, Daten, die wir auf Grundlage der Erfüllung eines Vertrags - automatisiert verarbeiten, an sich oder an Dritte aushändigen zu lassen. Die Bereitstellung erfolgt in einem - maschinenlesbaren Format. Sofern Sie die direkte Übertragung der Daten an einen anderen Verantwortlichen verlangen, erfolgt dies nur, soweit es technisch machbar ist.</p> + <p><strong>Recht auf Beschwerde bei der zuständigen Aufsichtsbehörde</strong></p> + <p> + Als Betroffener steht Ihnen im Falle eines datenschutzrechtlichen Verstoßes ein Beschwerderecht bei der zuständigen + Aufsichtsbehörde zu. Zuständige Aufsichtsbehörde bezüglich datenschutzrechtlicher Fragen ist:<br> + Die Landesbeauftragte für den Datenschutz Niedersachsen<br> + Prinzenstraße 5<br> + 30159 Hannover<br> + </p><p><strong>Recht auf Datenübertragbarkeit</strong></p> + <p> + Ihnen steht das Recht zu, Daten, die wir auf Grundlage der Erfüllung eines Vertrags + automatisiert verarbeiten, an sich oder an Dritte aushändigen zu lassen. Die Bereitstellung erfolgt in einem + maschinenlesbaren Format. Sofern Sie die direkte Übertragung der Daten an einen anderen Verantwortlichen verlangen, erfolgt dies nur, soweit es technisch machbar ist. + </p> - <p><strong>Recht auf Auskunft, Berichtigung, Sperrung, Löschung</strong></p> - <p>Sie haben jederzeit im Rahmen der geltenden gesetzlichen Bestimmungen das Recht auf unentgeltliche Auskunft über - Ihre gespeicherten personenbezogenen Daten, Herkunft der Daten, deren Empfänger und den Zweck der - Datenverarbeitung und ggf. ein Recht auf Berichtigung, Sperrung oder Löschung dieser Daten. Diesbezüglich und - auch zu weiteren Fragen zum Thema personenbezogene Daten können Sie sich jederzeit über die im Impressum aufgeführten Kontaktmöglichkeiten an uns wenden.</p> + <p><strong>Recht auf Auskunft, Berichtigung, Sperrung, Löschung</strong></p> + <p> + Sie haben jederzeit im Rahmen der geltenden gesetzlichen Bestimmungen das Recht auf unentgeltliche Auskunft über + Ihre gespeicherten personenbezogenen Daten, Herkunft der Daten, deren Empfänger und den Zweck der + Datenverarbeitung und ggf. ein Recht auf Berichtigung, Sperrung oder Löschung dieser Daten. Diesbezüglich und + auch zu weiteren Fragen zum Thema personenbezogene Daten können Sie sich jederzeit über die im Impressum aufgeführten Kontaktmöglichkeiten an uns wenden. + </p> - <p><strong>SSL- bzw. TLS-Verschlüsselung</strong></p> - <p>Aus Sicherheitsgründen und zum Schutz der Übertragung vertraulicher Inhalte, die Sie an uns als Seitenbetreiber - senden, nutzt unsere Website eine SSL-bzw. TLS-Verschlüsselung. Damit sind Daten, die Sie über diese Website - übermitteln, für Dritte nicht mitlesbar. Sie erkennen eine verschlüsselte Verbindung an der „https://“ - Adresszeile Ihres Browsers und am Schloss-Symbol in der Browserzeile.</p> + <p><strong>SSL- bzw. TLS-Verschlüsselung</strong></p> + <p> + Aus Sicherheitsgründen und zum Schutz der Übertragung vertraulicher Inhalte, die Sie an uns als Seitenbetreiber + senden, nutzt unsere Website eine SSL-bzw. TLS-Verschlüsselung. Damit sind Daten, die Sie über diese Website + übermitteln, für Dritte nicht mitlesbar. Sie erkennen eine verschlüsselte Verbindung an der „https://“ + Adresszeile Ihres Browsers und am Schloss-Symbol in der Browserzeile. + </p> - <p><strong>Datenschutzbeauftragter</strong></p> - <p>Wir haben einen Datenschutzbeauftragten bestellt.</p> - Datenschutzbeauftragter der Universität<br> - Prof. Dr. Andreas Wiebe<br> - Lehrstuhl für Bürgerliches Recht, Wettbewerbs- und Immaterialgüterrecht, Medien- und Informationsrecht<br> - Platz der Göttinger Sieben 6<br> - 37073 Göttingen<br> - Tel.: 0551 39 - 7381<br> - Fax: 0551 39 - 4437<br> - E-Mail: lehrstuhl.wiebe@jura.uni-goettingen.de<br> + <p><strong>Datenschutzbeauftragter</strong></p> + <p>Wir haben einen Datenschutzbeauftragten bestellt.</p> + Datenschutzbeauftragter der Universität<br> + Prof. Dr. Andreas Wiebe<br> + Lehrstuhl für Bürgerliches Recht, Wettbewerbs- und Immaterialgüterrecht, Medien- und Informationsrecht<br> + Platz der Göttinger Sieben 6<br> + 37073 Göttingen<br> + Tel.: 0551 39 - 7381<br> + Fax: 0551 39 - 4437<br> + E-Mail: lehrstuhl.wiebe@jura.uni-goettingen.de<br> - <p><strong>Server-Log-Dateien</strong></p> - <p>Der Provider der Website erhebt automatisch Informationen, die Ihr Browser automatisch an uns übermittelt. Dies sind:</p> - <ul> - <li>Besuchte Seite auf unserer Domain</li> - <li>Datum und Uhrzeit der Serveranfrage</li> - <li>Browsertyp und Browserversion</li> - <li>Verwendetes Betriebssystem</li> - <li>Referrer URL</li> - <li>Hostname des zugreifenden Rechners</li> - <li>IP-Adresse</li> - </ul> - <p>Es findet keine Zusammenführung dieser Daten mit anderen Datenquellen statt. Grundlage der Datenverarbeitung - bildet Art. 6 Abs. 1 lit. b DSGVO, der die Verarbeitung von Daten zur Erfüllung eines Vertrags oder - vorvertraglicher Maßnahmen gestattet.</p> + <p><strong>Server-Log-Dateien</strong></p> + <p>Der Provider der Website erhebt automatisch Informationen, die Ihr Browser automatisch an uns übermittelt. Dies sind:</p> + <ul> + <li>Besuchte Seite auf unserer Domain</li> + <li>Datum und Uhrzeit der Serveranfrage</li> + <li>Browsertyp und Browserversion</li> + <li>Verwendetes Betriebssystem</li> + <li>Referrer URL</li> + <li>Hostname des zugreifenden Rechners</li> + <li>IP-Adresse</li> + </ul> + <p> + Es findet keine Zusammenführung dieser Daten mit anderen Datenquellen statt. Grundlage der Datenverarbeitung + bildet Art. 6 Abs. 1 lit. b DSGVO, der die Verarbeitung von Daten zur Erfüllung eines Vertrags oder + vorvertraglicher Maßnahmen gestattet. + </p> - <p><strong>Registrierung auf dieser Website</strong></p> - <p>Zur Nutzung bestimmter Funktionen müssen Sie sich auf unserer Website registrieren. Die übermittelten Daten - dienen ausschließlich zum Zwecke der Nutzung des jeweiligen Angebotes oder Dienstes. Bei der Registrierung - abgefragte Pflichtangaben sind vollständig anzugeben. Andernfalls werden wir die Registrierung ablehnen.</p> - <p>Im Falle wichtiger Änderungen, etwa aus technischen Gründen, informieren wir Sie</p> - <p>Wir speichern die bei der Registrierung erfassten Daten während des Zeitraums, den Sie auf unserer Website - registriert sind. - Gesetzliche Aufbewahrungsfristen bleiben unberührt.</p> + <p><strong>Registrierung auf dieser Website</strong></p> + <p> + Zur Nutzung bestimmter Funktionen müssen Sie sich auf unserer Website registrieren. Die übermittelten Daten + dienen ausschließlich zum Zwecke der Nutzung des jeweiligen Angebotes oder Dienstes. Bei der Registrierung + abgefragte Pflichtangaben sind vollständig anzugeben. Andernfalls werden wir die Registrierung ablehnen. + </p> + <p>Im Falle wichtiger Änderungen, etwa aus technischen Gründen, informieren wir Sie</p> + <p> + Wir speichern die bei der Registrierung erfassten Daten während des Zeitraums, den Sie auf unserer Website + registriert sind. + Gesetzliche Aufbewahrungsfristen bleiben unberührt. + </p> - <p><strong>Speicherdauer von Beiträgen und Kommentaren</strong></p> - <p>Beiträge und Kommentare sowie damit in Verbindung stehende Daten, wie beispielsweise der Benutzername, - werden gespeichert. Der Inhalt verbleibt auf unserer Website, bis er vollständig gelöscht wurde oder aus - rechtlichen Gründen gelöscht werden musste.</p> - <p>Die Speicherung der Beiträge und Kommentare erfolgt auf Grundlage Art. 6 Abs. 1 lit. b DSGVO zur Erfüllung des - Arbeitsvertrages.</p> + <p><strong>Speicherdauer von Beiträgen und Kommentaren</strong></p> + <p> + Beiträge und Kommentare sowie damit in Verbindung stehende Daten, wie beispielsweise der Benutzername, + werden gespeichert. Der Inhalt verbleibt auf unserer Website, bis er vollständig gelöscht wurde oder aus + rechtlichen Gründen gelöscht werden musste. + </p> + <p> + Die Speicherung der Beiträge und Kommentare erfolgt auf Grundlage Art. 6 Abs. 1 lit. b DSGVO zur Erfüllung des + Arbeitsvertrages. + </p> - <p><strong>Session storage</strong></p> - <p>Unsere Website verwendet den Session storage des Browsers. In diesem werden für die Dauer einer Sitzun (Session) - Daten auf Ihrem Endgerät gespeichert.</p> + <p><strong>Session storage</strong></p> + <p> + Unsere Website verwendet den Session storage des Browsers. In diesem werden für die Dauer einer Sitzun (Session) + Daten auf Ihrem Endgerät gespeichert. + </p> - <p><strong>Google Web Fonts</strong></p> - <p>Unsere Website verwendet Web Fonts von Google. Anbieter ist die Google Inc., 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA.</p> - <p>Durch den Einsatz dieser Web Fonts wird es möglich Ihnen die von uns gewünschte Darstellung unserer Website - zu präsentieren, unabhängig davon welche Schriften Ihnen lokal zur Verfügung stehen. Dies erfolgt über - den Abruf der Google Web Fonts von einem Server von Google in den USA und der damit verbundenen Weitergabe - Ihrer Daten an Google. Dabei handelt es sich um Ihre IP-Adresse und welche Seite Sie bei uns besucht haben. - Der Einsatz von Google Web Fonts erfolgt auf Grundlage von Art. 6 Abs. 1 lit. f DSGVO. Als Betreiber dieser - Website haben wir ein berechtigtes Interesse an der optimalen Darstellung und Übertragung unseres Webauftritts.</p> - <p>Das Unternehmen Google ist für das us-europäische Datenschutzübereinkommen "Privacy Shield" zertifiziert. - Dieses Datenschutzübereinkommen soll die Einhaltung des in der EU geltenden Datenschutzniveaus gewährleisten.</p> - <p>Einzelheiten über Google Web Fonts finden Sie unter: - <a href="https://www.google.com/fonts#AboutPlace:about">https://www.google.com/fonts#AboutPlace:about</a> - und weitere Informationen in den Datenschutzbestimmungen von Google: - <a href="https://policies.google.com/privacy/partners?hl=de">https://policies.google.com/privacy/partners?hl=de</a></p> - <p><small>Quelle: Datenschutz-Konfigurator von <a href="http://www.mein-datenschutzbeauftragter.de" target="_blank">mein-datenschutzbeauftragter.de</a></small></p> - </div> + <p><strong>Google Web Fonts</strong></p> + <p>Unsere Website verwendet Web Fonts von Google. Anbieter ist die Google Inc., 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA.</p> + <p> + Durch den Einsatz dieser Web Fonts wird es möglich Ihnen die von uns gewünschte Darstellung unserer Website + zu präsentieren, unabhängig davon welche Schriften Ihnen lokal zur Verfügung stehen. Dies erfolgt über + den Abruf der Google Web Fonts von einem Server von Google in den USA und der damit verbundenen Weitergabe + Ihrer Daten an Google. Dabei handelt es sich um Ihre IP-Adresse und welche Seite Sie bei uns besucht haben. + Der Einsatz von Google Web Fonts erfolgt auf Grundlage von Art. 6 Abs. 1 lit. f DSGVO. Als Betreiber dieser + Website haben wir ein berechtigtes Interesse an der optimalen Darstellung und Übertragung unseres Webauftritts. + </p> + <p> + Das Unternehmen Google ist für das us-europäische Datenschutzübereinkommen "Privacy Shield" zertifiziert. + Dieses Datenschutzübereinkommen soll die Einhaltung des in der EU geltenden Datenschutzniveaus gewährleisten. + </p> + <p> + Einzelheiten über Google Web Fonts finden Sie unter: + <a href="https://www.google.com/fonts#AboutPlace:about">https://www.google.com/fonts#AboutPlace:about</a> + und weitere Informationen in den Datenschutzbestimmungen von Google: + <a href="https://policies.google.com/privacy/partners?hl=de">https://policies.google.com/privacy/partners?hl=de</a> + </p> + <p> + <small>Quelle: Datenschutz-Konfigurator von <a + href="http://www.mein-datenschutzbeauftragter.de" + target="_blank" + >mein-datenschutzbeauftragter.de</a></small> + </p> + </div> </template> <script> diff --git a/frontend/src/components/LabelStatistics.vue b/frontend/src/components/LabelStatistics.vue index 46ebca5f..446218aa 100644 --- a/frontend/src/components/LabelStatistics.vue +++ b/frontend/src/components/LabelStatistics.vue @@ -1,36 +1,50 @@ <template> <v-card> - <v-card-title class="title">Accumulated Label Statistics</v-card-title> + <v-card-title class="title"> + Accumulated Label Statistics + </v-card-title> <v-data-table - :headers=headers + :headers="headers" :pagination="pagination" :loading="loading" :items="summedLabelCounts" hide-actions > - <template slot="items" slot-scope="props"> + <template + slot="items" + slot-scope="props" + > <td>{{ props.item.name }}</td> - <td class="text-xs-center">{{ props.item.count }}</td> + <td class="text-xs-center"> + {{ props.item.count }} + </td> </template> </v-data-table> - <div v-for="([subType, labelCounts]) in mappedLabelCounts" :key="subType"> + <div + v-for="([subType, labelCounts]) in mappedLabelCounts" + :key="subType" + > <v-card-title class="title"> Statistics for: {{ subType }} </v-card-title> <v-data-table - :headers=headers - :pagination.sync="pagination" - :loading="loading" - :items="labelCounts" - hide-actions - > - <template slot="items" slot-scope="props"> - <td>{{ props.item.name }}</td> - <td class="text-xs-center">{{ props.item.count }}</td> - </template> - </v-data-table> - + :headers="headers" + :pagination.sync="pagination" + :loading="loading" + :items="labelCounts" + hide-actions + > + <template + slot="items" + slot-scope="props" + > + <td>{{ props.item.name }}</td> + <td class="text-xs-center"> + {{ props.item.count }} + </td> + </template> + </v-data-table> </div> </v-card> </template> @@ -40,9 +54,9 @@ import Vue from 'vue' import Component from 'vue-class-component' import * as api from '@/api' -import { LabelStatisticsForSubType } from '../models'; -import { getters } from '../store/getters'; -import { FeedbackLabels } from '../store/modules/feedback-labels'; +import { LabelStatisticsForSubType } from '../models' +import { getters } from '../store/getters' +import { FeedbackLabels } from '../store/modules/feedback-labels' @Component @@ -70,7 +84,7 @@ export default class LabelStatistics extends Vue{ ] get loading(): boolean { - return this.labelStatistics.length == 0 + return this.labelStatistics.length === 0 } get summedLabelCounts () { diff --git a/frontend/src/components/PasswordChangeDialog.vue b/frontend/src/components/PasswordChangeDialog.vue index 5a14e10e..bc3763a8 100644 --- a/frontend/src/components/PasswordChangeDialog.vue +++ b/frontend/src/components/PasswordChangeDialog.vue @@ -1,37 +1,52 @@ <template> - <v-dialog v-model="show" width="30%"> - <v-card> - <v-card-title class="title">Change your password</v-card-title> - <v-card-text> - <v-form class="mx-4"> - <v-text-field - label="Current password" - type="password" - v-model="currentPassword" - autofocus - required - /> - <v-text-field - label="New password" - type="password" - v-model="newPassword" - required - /> - <v-text-field - label="Repeat new password" - type="password" - v-model="newPasswordRepeated" - :error-messages="errorMessageRepeat" - required - /> - </v-form> - </v-card-text> - <v-card-actions> - <v-btn @click="submitChange" :disabled="!allowChange">Change password</v-btn> - <v-btn @click="$emit('hide')" color="red">Cancel</v-btn> - </v-card-actions> - </v-card> - </v-dialog> + <v-dialog + v-model="show" + width="30%" + > + <v-card> + <v-card-title class="title"> + Change your password + </v-card-title> + <v-card-text> + <v-form class="mx-4"> + <v-text-field + v-model="currentPassword" + label="Current password" + type="password" + autofocus + required + /> + <v-text-field + v-model="newPassword" + label="New password" + type="password" + required + /> + <v-text-field + v-model="newPasswordRepeated" + label="Repeat new password" + type="password" + :error-messages="errorMessageRepeat" + required + /> + </v-form> + </v-card-text> + <v-card-actions> + <v-btn + :disabled="!allowChange" + @click="submitChange" + > + Change password + </v-btn> + <v-btn + color="red" + @click="$emit('hide')" + > + Cancel + </v-btn> + </v-card-actions> + </v-card> + </v-dialog> </template> <script> @@ -61,6 +76,15 @@ export default { if (!this.equalNewPasswords) { return 'Repeated new password is different than new one' } + + return '' + } + }, + watch: { + show (val) { + if (!val) { + this.$emit('hide') + } } }, methods: { @@ -89,13 +113,6 @@ export default { }) }) } - }, - watch: { - show (val) { - if (!val) { - this.$emit('hide') - } - } } } </script> diff --git a/frontend/src/components/RegisterDialog.vue b/frontend/src/components/RegisterDialog.vue index b5c1f760..2206d095 100644 --- a/frontend/src/components/RegisterDialog.vue +++ b/frontend/src/components/RegisterDialog.vue @@ -4,10 +4,15 @@ Datenschutzerklärung </v-card-title> <v-card-text> - <GDPRNotice id="gdpr-notice"/> + <GDPRNotice id="gdpr-notice" /> </v-card-text> <v-card-actions> - <v-btn @click="acceptedGDPR = true" id="accept-gdpr-notice">Einwilligen</v-btn> + <v-btn + id="accept-gdpr-notice" + @click="acceptedGDPR = true" + > + Einwilligen + </v-btn> </v-card-actions> </v-card> <v-card v-else> @@ -16,22 +21,29 @@ </v-card-title> <v-card-text> <v-text-field + id="input-register-username" + v-model="credentials.username" label="Username" required autofocus - v-model="credentials.username" - id="input-register-username" /> <v-text-field + id="input-register-password" + v-model="credentials.password" label="Password" required type="password" - v-model="credentials.password" - id="input-register-password" /> </v-card-text> <v-card-actions class="justify-center"> - <v-btn flat :loading="loading" @click="register" id="register-submit">submit</v-btn> + <v-btn + id="register-submit" + flat + :loading="loading" + @click="register" + > + submit + </v-btn> </v-card-actions> </v-card> </template> @@ -41,7 +53,7 @@ import { registerTutor } from '@/api' import GDPRNotice from '@/components/GDPRNotice' export default { - name: 'register-dialog', + name: 'RegisterDialog', components: { GDPRNotice }, data () { return { diff --git a/frontend/src/components/SubmissionTests.vue b/frontend/src/components/SubmissionTests.vue index 65c6882b..daa9a95c 100644 --- a/frontend/src/components/SubmissionTests.vue +++ b/frontend/src/components/SubmissionTests.vue @@ -1,34 +1,51 @@ <template> - <v-card id="submission-tests"> - <v-card-title class="title py-0" v-if="tests.length > 0"> - Tests - <v-spacer/> - <v-btn icon @click="expanded = !expanded"> - <v-icon v-if="expanded">keyboard_arrow_up</v-icon> - <v-icon v-else>keyboard_arrow_down</v-icon> - </v-btn> - </v-card-title> - <v-card-title v-else> - No Tests available - </v-card-title> - <v-card-text v-if="expanded"> - <v-flex sm12 v-for="item in tests" :key="item.pk"> - <div name="test-name-label"> - <v-layout row class="pr-4"> - <h3>{{item.name}}</h3> - <v-spacer/> - <h3>{{item.label}}</h3> - </v-layout> - </div> - <span class="test-output">{{item.annotation}}</span> - </v-flex> - </v-card-text> - </v-card> + <v-card id="submission-tests"> + <v-card-title + v-if="tests.length > 0" + class="title py-0" + > + Tests + <v-spacer /> + <v-btn + icon + @click="expanded = !expanded" + > + <v-icon v-if="expanded"> + keyboard_arrow_up + </v-icon> + <v-icon v-else> + keyboard_arrow_down + </v-icon> + </v-btn> + </v-card-title> + <v-card-title v-else> + No Tests available + </v-card-title> + <v-card-text v-if="expanded"> + <v-flex + v-for="item in tests" + :key="item.pk" + sm12 + > + <div name="test-name-label"> + <v-layout + row + class="pr-4" + > + <h3>{{ item.name }}</h3> + <v-spacer /> + <h3>{{ item.label }}</h3> + </v-layout> + </div> + <span class="test-output">{{ item.annotation }}</span> + </v-flex> + </v-card-text> + </v-card> </template> <script> export default { - name: 'submission-tests', + name: 'SubmissionTests', props: { tests: { type: Array, diff --git a/frontend/src/components/UserOptions.vue b/frontend/src/components/UserOptions.vue index db59c490..7dbab930 100644 --- a/frontend/src/components/UserOptions.vue +++ b/frontend/src/components/UserOptions.vue @@ -7,12 +7,17 @@ @click="opt.action" :id="opt.id" :key="i" + @click="opt.action" > - {{opt.display}} + {{ opt.display }} </v-list-tile> </template> </v-list> - <component v-if="displayComponent" :is="displayComponent" @hide="hideComponent"/> + <component + :is="displayComponent" + v-if="displayComponent" + @hide="hideComponent" + /> </div> </template> diff --git a/frontend/src/components/export/DataExport.vue b/frontend/src/components/export/DataExport.vue index 4b4be7cd..ec734f82 100644 --- a/frontend/src/components/export/DataExport.vue +++ b/frontend/src/components/export/DataExport.vue @@ -1,5 +1,9 @@ <template> - <v-dialog v-model="exportDialog" max-width="31vw" @update:returnValue="hide"> + <v-dialog + v-model="exportDialog" + max-width="31vw" + @update:returnValue="hide" + > <v-card id="data-export-modal"> <v-card-title class="title"> Student Data Export @@ -8,10 +12,17 @@ <div v-if="!mapFileLoaded"> If you select a mapping file, the anonymized data will be mapped back automatically and locally on your machine. - <v-layout row align-center> - <file-select v-model="mapFile" display-text="Select map file" class="ma-3"/> + <v-layout + row + align-center + > + <file-select + v-model="mapFile" + display-text="Select map file" + class="ma-3" + /> <span>Without the mapping, the data will still be obfuscated.</span> - </v-layout> + </v-layout> </div> <span> <b>NOTE:</b> Mapping / setting passwords can take some time depending on course size. @@ -20,9 +31,9 @@ <v-flex xs4> <v-tooltip top> <v-checkbox - label="Set passwords" - v-model="setPasswords" slot="activator" + v-model="setPasswords" + label="Set passwords" /> <span>Setting this will cause all student passwords to be reset upon export. The new passwords will be contained in the @@ -30,23 +41,40 @@ </span> </v-tooltip> </v-flex> - <v-flex xs3 offset-xs1 id="type-select"> + <v-flex + id="type-select" + xs3 + offset-xs1 + > <v-select + v-model="exportType" label="Export file format" :items="availableExportTypes" - v-model="exportType" /> </v-flex> </v-layout> <v-card-actions> <v-btn - flat color="blue lighten-2" + flat + color="blue lighten-2" @click="exportDialog = false" - >close</v-btn> - <v-spacer/> - <v-progress-circular v-if="loading" indeterminate/> - <v-btn v-else id="export-data-download-btn" flat outline @click="getExportFile('data')" - >{{mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping'}}</v-btn> + > + close + </v-btn> + <v-spacer /> + <v-progress-circular + v-if="loading" + indeterminate + /> + <v-btn + v-else + id="export-data-download-btn" + flat + outline + @click="getExportFile('data')" + > + {{ mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping' }} + </v-btn> </v-card-actions> </v-card-text> </v-card> diff --git a/frontend/src/components/export/ExportDialog.vue b/frontend/src/components/export/ExportDialog.vue index a62a099e..86bb10b3 100644 --- a/frontend/src/components/export/ExportDialog.vue +++ b/frontend/src/components/export/ExportDialog.vue @@ -1,19 +1,43 @@ <template> <div> <v-menu offset-y> - <v-tooltip bottom slot="activator"> - <v-btn id="export-btn" :color="exportColor" slot="activator"> + <v-tooltip + slot="activator" + bottom + > + <v-btn + id="export-btn" + slot="activator" + :color="exportColor" + > export <v-icon>file_download</v-icon> </v-btn> - <span id="corrected-tooltip" v-if="corrected">All submissions have been corrected!</span> - <span id="uncorrected-tooltip" v-else>UNCORRECTED submissions left! Export will be incomplete.</span> + <span + v-if="corrected" + id="corrected-tooltip" + >All submissions have been corrected!</span> + <span + v-else + id="uncorrected-tooltip" + >UNCORRECTED submissions left! Export will be incomplete.</span> </v-tooltip> <v-list> - <v-list-tile :id="'export-list' + i" v-for="(item, i) in menuItems" :key="i" @click="item.action">{{item.display}}</v-list-tile> + <v-list-tile + v-for="(item, i) in menuItems" + :id="'export-list' + i" + :key="i" + @click="item.action" + > + {{ item.display }} + </v-list-tile> </v-list> </v-menu> - <component v-if="displayComponent" :is="displayComponent" @hide="displayComponent = null"/> + <component + :is="displayComponent" + v-if="displayComponent" + @hide="displayComponent = null" + /> </div> </template> diff --git a/frontend/src/components/export/InstanceExport.vue b/frontend/src/components/export/InstanceExport.vue index 4cd0378a..c6b0f92f 100644 --- a/frontend/src/components/export/InstanceExport.vue +++ b/frontend/src/components/export/InstanceExport.vue @@ -1,5 +1,9 @@ <template> - <v-dialog v-model="exportDialog" max-width="31vw" @update:returnValue="hide"> + <v-dialog + v-model="exportDialog" + max-width="31vw" + @update:returnValue="hide" + > <v-card id="instance-export-modal"> <v-card-title class="title"> Instance Data Export @@ -8,23 +12,43 @@ <div v-if="!mapFileLoaded"> If you select a mapping file, the anonymized data will be mapped back automatically and locally on your machine. - <v-layout row align-center> - <file-select v-model="mapFile" display-text="Select map file" class="ma-3"/> + <v-layout + row + align-center + > + <file-select + v-model="mapFile" + display-text="Select map file" + class="ma-3" + /> <span>Without the mapping, the data will still be obfuscated.</span> - </v-layout> + </v-layout> </div> <span> <b>NOTE:</b> Mapping can take some time depending on course size. </span> <v-card-actions> <v-btn - flat color="blue lighten-2" + flat + color="blue lighten-2" @click="exportDialog = false" - >close</v-btn> - <v-spacer/> - <v-progress-circular v-if="loading" indeterminate/> - <v-btn v-else id="instance-export-dl" flat outline @click="getExportFile('instance')" - >{{mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping'}}</v-btn> + > + close + </v-btn> + <v-spacer /> + <v-progress-circular + v-if="loading" + indeterminate + /> + <v-btn + v-else + id="instance-export-dl" + flat + outline + @click="getExportFile('instance')" + > + {{ mapFile || mapFileLoaded ? 'Download and apply mapping' : 'Download without mapping' }} + </v-btn> </v-card-actions> </v-card-text> </v-card> diff --git a/frontend/src/components/feedback_labels/FeedbackLabel.vue b/frontend/src/components/feedback_labels/FeedbackLabel.vue index bd97e85f..3b16edb6 100644 --- a/frontend/src/components/feedback_labels/FeedbackLabel.vue +++ b/frontend/src/components/feedback_labels/FeedbackLabel.vue @@ -1,19 +1,21 @@ <template> <v-tooltip top> - <v-chip - :close=removable - :color="colour" - slot="activator" - @input="onClose" - > {{ name }} </v-chip> + <v-chip + slot="activator" + :close="removable" + :color="colour" + @input="onClose" + > + {{ name }} + </v-chip> <span> {{ description }} </span> </v-tooltip> </template> <script lang="ts"> -import Vue from "vue" -import Component from "vue-class-component" -import { Prop } from "vue-property-decorator" +import Vue from 'vue' +import Component from 'vue-class-component' +import { Prop } from 'vue-property-decorator' @Component export default class FeedbackLabel extends Vue { @@ -24,7 +26,7 @@ export default class FeedbackLabel extends Vue { @Prop({ type: Boolean, default: false }) readonly removable!: boolean onClose() { - this.$emit("remove-clicked", this.pk) + this.$emit('remove-clicked', this.pk) } } </script> diff --git a/frontend/src/components/feedback_labels/FeedbackLabelForm.vue b/frontend/src/components/feedback_labels/FeedbackLabelForm.vue index ad64966a..45295f57 100644 --- a/frontend/src/components/feedback_labels/FeedbackLabelForm.vue +++ b/frontend/src/components/feedback_labels/FeedbackLabelForm.vue @@ -1,36 +1,73 @@ <template> - <v-layout wrap justify-start> - <v-flex ml-3 xs9> - <v-text-field id="label-name" - label="Name" + <v-layout + wrap + justify-start + > + <v-flex + ml-3 + xs9 + > + <v-text-field + id="label-name" v-model="mutableName" + label="Name" /> </v-flex> - <v-flex ml-3 xs9> - <v-textarea id="label-description" - label="Description" + <v-flex + ml-3 + xs9 + > + <v-textarea + id="label-description" v-model="mutableDescription" + label="Description" placeholder="The description can be seen when hovering above the label" auto-grow /> </v-flex> - <v-flex ml-2 xs12> - <compact-picker style="width:85%;box-shadow:none;" v-model="mutableColour"/> + <v-flex + ml-2 + xs12 + > + <compact-picker + v-model="mutableColour" + style="width:85%;box-shadow:none;" + /> </v-flex> - <v-flex ml-1 mb-3 xs4> - <v-btn id="create-label-btn" v-if="!is_update" :loading="loading" color="teal" @click="createLabel">Create</v-btn> - <v-btn id="update-label-btn" v-else color="teal" :loading="loading" @click="updateLabel">Update</v-btn> + <v-flex + ml-1 + mb-3 + xs4 + > + <v-btn + v-if="!is_update" + id="create-label-btn" + :loading="loading" + color="teal" + @click="createLabel" + > + Create + </v-btn> + <v-btn + v-else + id="update-label-btn" + color="teal" + :loading="loading" + @click="updateLabel" + > + Update + </v-btn> </v-flex> </v-layout> </template> <script lang="ts"> -import Vue from "vue" -import Component from "vue-class-component" -import { Prop, Watch } from "vue-property-decorator" -import * as api from "@/api"; -import { Compact } from "vue-color" -import { FeedbackLabels } from "@/store/modules/feedback-labels"; +import Vue from 'vue' +import Component from 'vue-class-component' +import { Prop, Watch } from 'vue-property-decorator' +import * as api from '@/api' +import { Compact } from 'vue-color' +import { FeedbackLabels } from '@/store/modules/feedback-labels' @Component({ components: { @@ -81,15 +118,15 @@ export default class FeedbackLabelForm extends Vue { if (duplicate) { this.$notify({ - title: "Label creation error", - text: "A label with the same name already exists. " + - "You can, however, update the label", + title: 'Label creation error', + text: 'A label with the same name already exists. ' + + 'You can, however, update the label', type: 'error', duration: -1 }) this.resetFields() this.loading = false - return; + return } let res @@ -99,7 +136,7 @@ export default class FeedbackLabelForm extends Vue { // user will be notified by the interceptor this.resetFields() this.loading = false - return; + return } FeedbackLabels.ADD_LABEL(res) @@ -120,11 +157,11 @@ export default class FeedbackLabelForm extends Vue { } catch (ex) { // user will be notified by the interceptor this.loading = false - return; + return } FeedbackLabels.UPDATE_LABEL(label) - this.$emit("label-updated", label.pk) + this.$emit('label-updated', label.pk) this.loading = false } } diff --git a/frontend/src/components/feedback_labels/FeedbackLabelUpdater.vue b/frontend/src/components/feedback_labels/FeedbackLabelUpdater.vue index f0074bd2..e53c4572 100644 --- a/frontend/src/components/feedback_labels/FeedbackLabelUpdater.vue +++ b/frontend/src/components/feedback_labels/FeedbackLabelUpdater.vue @@ -1,6 +1,9 @@ <template> <v-layout wrap> - <v-flex mx-2 xs12> + <v-flex + mx-2 + xs12 + > <v-autocomplete id="label-update-autocomplete" :items="feedbackLabels" @@ -11,7 +14,10 @@ @input="setLabel" /> </v-flex> - <v-flex xs12 v-if="label.pk !== -1"> + <v-flex + v-if="label.pk !== -1" + xs12 + > <feedback-label-form is_update v-bind="currentLabel" @@ -22,11 +28,11 @@ </template> <script lang="ts"> -import Vue from "vue" -import Component from "vue-class-component" -import { FeedbackLabels } from "@/store/modules/feedback-labels" -import FeedbackLabelForm from "./FeedbackLabelForm.vue" -import { FeedbackLabel } from '../../models'; +import Vue from 'vue' +import Component from 'vue-class-component' +import { FeedbackLabels } from '@/store/modules/feedback-labels' +import FeedbackLabelForm from './FeedbackLabelForm.vue' +import { FeedbackLabel } from '../../models' @Component({ components: { @@ -36,9 +42,9 @@ import { FeedbackLabel } from '../../models'; export default class FeedbackLabelUpdater extends Vue { label: FeedbackLabel = { pk: -1, - name: "", - description: "", - colour: "#4d4d4d", + name: '', + description: '', + colour: '#4d4d4d', } loading = false diff --git a/frontend/src/components/feedback_labels/FeedbackLabelsList.vue b/frontend/src/components/feedback_labels/FeedbackLabelsList.vue index d111225e..293102e9 100644 --- a/frontend/src/components/feedback_labels/FeedbackLabelsList.vue +++ b/frontend/src/components/feedback_labels/FeedbackLabelsList.vue @@ -1,26 +1,48 @@ <template> <v-card> - <v-toolbar color="teal" :dense="sidebar"> + <v-toolbar + color="teal" + :dense="sidebar" + > <v-toolbar-side-icon> <v-icon>label</v-icon> </v-toolbar-side-icon> - <v-toolbar-title v-if="showDetail" style="min-width: fit-content;"> + <v-toolbar-title + v-if="showDetail" + style="min-width: fit-content;" + > Labels </v-toolbar-title> <v-spacer /> - <v-btn icon @click="refreshLabels"> - <v-icon v-if="!updating">refresh</v-icon> - <v-progress-circular v-else indeterminate color="black" size="20" /> + <v-btn + icon + @click="refreshLabels" + > + <v-icon v-if="!updating"> + refresh + </v-icon> + <v-progress-circular + v-else + indeterminate + color="black" + size="20" + /> </v-btn> </v-toolbar> - <v-tabs grow color="teal lighten-1" v-if="showDetail"> + <v-tabs + v-if="showDetail" + grow + color="teal lighten-1" + > <v-tab>Create</v-tab> - <v-tab id="update-label-section">Update</v-tab> + <v-tab id="update-label-section"> + Update + </v-tab> <v-tab-item> - <feedback-label-form/> + <feedback-label-form /> </v-tab-item> <v-tab-item> - <feedback-label-updater/> + <feedback-label-updater /> </v-tab-item> </v-tabs> </v-card> @@ -33,8 +55,8 @@ import { Prop } from 'vue-property-decorator' import { getLabels } from '@/api' import { FeedbackLabels } from '@/store/modules/feedback-labels' import { UI } from '@/store/modules/ui' -import FeedbackLabelForm from "./FeedbackLabelForm.vue" -import FeedbackLabelUpdater from "./FeedbackLabelUpdater.vue" +import FeedbackLabelForm from './FeedbackLabelForm.vue' +import FeedbackLabelUpdater from './FeedbackLabelUpdater.vue' @Component({ components: { diff --git a/frontend/src/components/feedback_labels/LabelSelector.vue b/frontend/src/components/feedback_labels/LabelSelector.vue index 7cd1c29c..c738a7b8 100644 --- a/frontend/src/components/feedback_labels/LabelSelector.vue +++ b/frontend/src/components/feedback_labels/LabelSelector.vue @@ -1,9 +1,12 @@ <template> <v-card> <v-card-title>Assign labels</v-card-title> - <v-divider/> + <v-divider /> <v-layout wrap> - <v-flex ml-2 sm10> + <v-flex + ml-2 + sm10 + > <v-autocomplete id="label-add-autocomplete" :items="feedbackLabels" @@ -15,16 +18,19 @@ @input="addLabel" /> </v-flex> - <v-layout ml-2 mb-3> + <v-layout + ml-2 + mb-3 + > <v-flex sm4> <v-flex sm12> UNCHANGED </v-flex> <feedback-label - removable v-for="label in unchangedMapped" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="removeLabel" /> </v-flex> @@ -33,10 +39,10 @@ WILL BE REMOVED </v-flex> <feedback-label - removable v-for="label in removedMapped" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="addLabel" /> </v-flex> @@ -45,10 +51,10 @@ WILL BE ADDED </v-flex> <feedback-label - removable v-for="label in addedMapped" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="removeLabel" /> </v-flex> @@ -58,13 +64,13 @@ </template> <script lang="ts"> -import Vue from "vue"; -import Component from "vue-class-component"; -import { Prop } from "vue-property-decorator"; +import Vue from 'vue' +import Component from 'vue-class-component' +import { Prop } from 'vue-property-decorator' import { FeedbackLabels } from '@/store/modules/feedback-labels' import { SubmissionNotes } from '@/store/modules/submission-notes' -import FeedbackLabel from "@/components/feedback_labels/FeedbackLabel.vue" -import { FeedbackComment, SubmissionType } from '../../models'; +import FeedbackLabel from '@/components/feedback_labels/FeedbackLabel.vue' +import { FeedbackComment, SubmissionType } from '../../models' @Component({ components: { @@ -186,7 +192,7 @@ export default class LabelSelector extends Vue { SubmissionNotes.REMOVE_FEEDBACK_LABEL(pk) } else { - this.$emit("label-removed", pk) + this.$emit('label-removed', pk) } } @@ -207,7 +213,7 @@ export default class LabelSelector extends Vue { SubmissionNotes.ADD_FEEDBACK_LABEL(pk) } } else { - this.$emit("label-added", pk) + this.$emit('label-added', pk) } } @@ -216,7 +222,7 @@ export default class LabelSelector extends Vue { * the submit shortcut was pressed */ submitFeedback() { - this.$emit("submit-shortcut") + this.$emit('submit-shortcut') } } </script> diff --git a/frontend/src/components/feedback_list/FeedbackListHelpCard.vue b/frontend/src/components/feedback_list/FeedbackListHelpCard.vue index e36cca5c..745d7d75 100644 --- a/frontend/src/components/feedback_list/FeedbackListHelpCard.vue +++ b/frontend/src/components/feedback_list/FeedbackListHelpCard.vue @@ -1,6 +1,9 @@ <template> <v-layout justify-center> - <v-card class="mt-5" v-if="isReviewer"> + <v-card + v-if="isReviewer" + class="mt-5" + > <v-card-title class="title"> This is the history of all the feedback! </v-card-title> @@ -9,7 +12,8 @@ <ol style="padding-left: 30px;"> <li>click on one of the rows to see the submission, including the feedback.</li> <li>sort the table via clicking on the table headers</li> - <li>search the type names and also the <b>content</b> of the feedback that was written<br/> + <li> + search the type names and also the <b>content</b> of the feedback that was written<br> (e.g. you're looking for a feedback where someone mentioned a segmentation fault, just type it into the search!) </li> <li>filter by assigned labels</li> @@ -26,7 +30,8 @@ <ol style="padding-left: 30px;"> <li>click on one of the rows tp see the submission, including your feedback and potentially a second tutor's feedback.</li> <li>sort the table via clicking on the table headers</li> - <li>search the type names and also the <b>content</b> of the feedback that you wrote<br/> + <li> + search the type names and also the <b>content</b> of the feedback that you wrote<br> (e.g. you're looking for a feedback where you mentioned a segmentation fault, just type it into the search!) </li> </ol> @@ -38,7 +43,7 @@ <script lang="ts"> import Vue from 'vue' import Component from 'vue-class-component' -import { Authentication } from '../../store/modules/authentication'; +import { Authentication } from '../../store/modules/authentication' @Component export default class FeedbackListHelpCard extends Vue { diff --git a/frontend/src/components/feedback_list/FeedbackSearchOptions.vue b/frontend/src/components/feedback_list/FeedbackSearchOptions.vue index 2087580a..19601ccc 100644 --- a/frontend/src/components/feedback_list/FeedbackSearchOptions.vue +++ b/frontend/src/components/feedback_list/FeedbackSearchOptions.vue @@ -1,34 +1,51 @@ <template> - <v-layout row wrap> - <v-flex md6 lg3> + <v-layout + row + wrap + > + <v-flex + md6 + lg3 + > <v-checkbox - label="show final" v-model="showFinal" + label="show final" /> </v-flex> - <v-flex md6 lg3> + <v-flex + md6 + lg3 + > <v-checkbox - label="search all comments" v-model="searchOtherUserComments" + label="search all comments" /> </v-flex> - <v-flex md6 lg3> + <v-flex + md6 + lg3 + > <v-checkbox - label="case sensitive" v-model="caseSensitive" + label="case sensitive" /> </v-flex> - <v-flex md6 lg3> + <v-flex + md6 + lg3 + > <v-layout row> <v-checkbox - label="use RegEx" v-model="useRegex" + label="use RegEx" style="max-width: 60%" /> <v-tooltip top> - <a slot="activator" - href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#character-classes" - target="_blank"> + <a + slot="activator" + href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#character-classes" + target="_blank" + > <v-icon>help</v-icon> </a> <span>Go to RegEx documentation</span> @@ -39,20 +56,23 @@ <v-layout row> <v-flex md5> <v-select + v-model="filterByLabels" label="Label" :items="labels" - v-model="filterByLabels" multiple hint="Filter by label" persistent-hint clearable /> </v-flex> - <v-flex md5 offset-md1> + <v-flex + md5 + offset-md1 + > <v-select + v-model="filterByExcludingLabels" label="Exclude label" :items="labels" - v-model="filterByExcludingLabels" multiple hint="Filter by excluding labels" persistent-hint @@ -63,22 +83,31 @@ </v-container> <v-container pa-0> <v-layout row> - <v-flex md12 lg5 v-if="isReviewer"> + <v-flex + v-if="isReviewer" + md12 + lg5 + > <v-select + v-model="filterByTutors" label="Tutors" :items="tutorNames" - v-model="filterByTutors" multiple hint="Filter by tutors" persistent-hint clearable /> </v-flex> - <v-flex md12 lg5 offset-lg1 v-if="filterByTutors.length > 0"> + <v-flex + v-if="filterByTutors.length > 0" + md12 + lg5 + offset-lg1 + > <v-select + v-model="filterByStage" label="Stage" :items="feedbackStages" - v-model="filterByStage" placeholder="All" hint="Filter after initial feedback or validated" persistent-hint @@ -100,7 +129,7 @@ import { Authentication } from '@/store/modules/authentication' import { actions } from '@/store/actions' import { getters } from '@/store/getters' import { TutorOverview } from '@/store/modules/tutor-overview' -import { FeedbackLabels } from '../../store/modules/feedback-labels'; +import { FeedbackLabels } from '../../store/modules/feedback-labels' @Component export default class FeedbackSearchOptions extends Vue { diff --git a/frontend/src/components/feedback_list/FeedbackTable.vue b/frontend/src/components/feedback_list/FeedbackTable.vue index af1f5b9b..e3030c81 100644 --- a/frontend/src/components/feedback_list/FeedbackTable.vue +++ b/frontend/src/components/feedback_list/FeedbackTable.vue @@ -2,16 +2,16 @@ <v-card> <v-card-title class="title"> <span v-if="isTutor">Your</span><span>All</span> feedback history - <v-spacer/> + <v-spacer /> <v-text-field + v-model="search" append-icon="search" label="Search" single-line hide-details - v-model="search" /> </v-card-title> - <feedback-search-options class="mx-3"/> + <feedback-search-options class="mx-3" /> <v-data-table :headers="headers" :items="feedback" @@ -20,16 +20,24 @@ :filter="containsSearch" hide-actions > - <template slot="items" slot-scope="props"> - <tr @click="showSubmission(props.item.ofSubmission)" - class="feedback-row" + <template + slot="items" + slot-scope="props" + > + <tr + class="feedback-row" + @click="showSubmission(props.item.ofSubmission)" > - <td>{{props.item.ofSubmissionType}}</td> - <td>{{props.item.score}}</td> - <td>{{new Date(props.item.created).toLocaleString()}}</td> + <td>{{ props.item.ofSubmissionType }}</td> + <td>{{ props.item.score }}</td> + <td>{{ new Date(props.item.created).toLocaleString() }}</td> <td> - <v-icon v-if="props.item.isFinal">check</v-icon> - <v-icon v-else>clear</v-icon> + <v-icon v-if="props.item.isFinal"> + check + </v-icon> + <v-icon v-else> + clear + </v-icon> </td> </tr> </template> @@ -48,7 +56,7 @@ import { FeedbackTable as FeedbackModule, FeedbackHistoryItem } from '@/store/mo import { Subscription, Feedback } from '@/models' import { actions } from '@/store/actions' import { getters } from '@/store/getters' -import { Authentication } from '../../store/modules/authentication'; +import { Authentication } from '../../store/modules/authentication' @Component({ components: { @@ -104,8 +112,9 @@ export default class FeedbackTable extends Vue { } const associatedTutors = this.stageFilterString === 'all' ? Object.values(feedback.history).filter(histEntry => !!histEntry).map(histEntry => histEntry!.owner) - : feedback.history[<Subscription.FeedbackStageEnum> this.stageFilterString] - ? [feedback.history[<Subscription.FeedbackStageEnum> this.stageFilterString]!.owner] : [] + : feedback.history[this.stageFilterString as Subscription.FeedbackStageEnum] + ? [feedback.history[this.stageFilterString as Subscription.FeedbackStageEnum]!.owner] : [] + return this.filterByTutors.length === 0 || associatedTutors.some(tutor => this.filterByTutors.includes(tutor)) } @@ -128,7 +137,7 @@ export default class FeedbackTable extends Vue { } filterFeedbackByLabels (feedback: FeedbackHistoryItem): boolean { - if (this.filterByLabels.length == 0) { + if (this.filterByLabels.length === 0) { return true } const labelsInFeedback = this.extractLabelsFromFeedback(feedback) diff --git a/frontend/src/components/mixins/commentLabelSelector.ts b/frontend/src/components/mixins/commentLabelSelector.ts index 2b630830..7fc8da56 100644 --- a/frontend/src/components/mixins/commentLabelSelector.ts +++ b/frontend/src/components/mixins/commentLabelSelector.ts @@ -1,13 +1,13 @@ import Vue from 'vue' import Component from 'vue-class-component' -import { Prop } from "vue-property-decorator" -import { SubmissionNotes } from "@/store/modules/submission-notes" -import { FeedbackComment, FeedbackLabel } from "@/models" -import { FeedbackLabels } from "@/store/modules/feedback-labels" +import { Prop } from 'vue-property-decorator' +import { SubmissionNotes } from '@/store/modules/submission-notes' +import { FeedbackComment, FeedbackLabel } from '@/models' +import { FeedbackLabels } from '@/store/modules/feedback-labels' enum FeedbackType { - original = "origFeedback", - updated = "updatedFeedback", + original = 'origFeedback', + updated = 'updatedFeedback', } @Component @@ -39,7 +39,7 @@ export default class commentLabelSelector extends Vue { // helper used to determine the correct type to reduce redundancy function isArray(val: FeedbackComment | FeedbackComment[]): val is FeedbackComment[] { - return (<FeedbackComment[]>val).length !== undefined + return (val as FeedbackComment[]).length !== undefined } const stateLines = SubmissionNotes.state[feedbackType].feedbackLines @@ -121,13 +121,13 @@ export default class commentLabelSelector extends Vue { } }).filter((val): val is FeedbackLabel => { if (!val) { - console.error("Encountered invalid label pk. This should be investigated.") + console.error('Encountered invalid label pk. This should be investigated.') return false } return true }) - return mappedLabels; + return mappedLabels } } diff --git a/frontend/src/components/mixins/exportMixin.ts b/frontend/src/components/mixins/exportMixin.ts index 867a94ab..dc536992 100644 --- a/frontend/src/components/mixins/exportMixin.ts +++ b/frontend/src/components/mixins/exportMixin.ts @@ -6,7 +6,7 @@ import { mutations as mut } from '@/store/mutations' import parseCSVMapMixin from '@/components/mixins/parseCSVMapMixin' import { saveAs } from 'file-saver' -let download = saveAs; +let download = saveAs export enum ExportType { JSON = 'application/json', diff --git a/frontend/src/components/student/NonFinalFeedbackAlert.vue b/frontend/src/components/student/NonFinalFeedbackAlert.vue index fc58ae20..76c55311 100644 --- a/frontend/src/components/student/NonFinalFeedbackAlert.vue +++ b/frontend/src/components/student/NonFinalFeedbackAlert.vue @@ -1,12 +1,16 @@ <template> - <v-alert type="warning" :value="value" class="non-final-alert "> - This feedback is not final! Changes will likely occur! - </v-alert> + <v-alert + type="warning" + :value="value" + class="non-final-alert " + > + This feedback is not final! Changes will likely occur! + </v-alert> </template> <script> export default { - name: 'non-final-feedback-alert', + name: 'NonFinalFeedbackAlert', props: { value: { type: Boolean, diff --git a/frontend/src/components/student/SubmissionList.vue b/frontend/src/components/student/SubmissionList.vue index bd927b48..61a6a7e4 100644 --- a/frontend/src/components/student/SubmissionList.vue +++ b/frontend/src/components/student/SubmissionList.vue @@ -6,18 +6,31 @@ :items="submissions" item-key="type.pk" > - <template slot="items" slot-scope="props"> + <template + slot="items" + slot-scope="props" + > <td>{{ props.item.type.name }}</td> - <td class="text-xs-right">{{ props.item.feedback ? props.item.feedback.score : 'N/A'}}</td> - <td class="text-xs-right">{{ props.item.type.fullScore }}</td> <td class="text-xs-right"> - <v-btn :to="`/submission/${props.item.type.pk}`" color="orange lighten-2"> + {{ props.item.feedback ? props.item.feedback.score : 'N/A' }} + </td> + <td class="text-xs-right"> + {{ props.item.type.fullScore }} + </td> + <td class="text-xs-right"> + <v-btn + :to="`/submission/${props.item.type.pk}`" + color="orange lighten-2" + > <v-icon>chevron_right</v-icon> </v-btn> </td> </template> </v-data-table> - <v-alert color="info" value="true"> + <v-alert + color="info" + value="true" + > You reached <b>{{ sumScore }}</b> of <b>{{ sumFullScore }}</b> possible points ( {{ pointRatio }}% ). </v-alert> </div> @@ -25,7 +38,13 @@ <script> export default { - name: 'submission-list', + name: 'SubmissionList', + props: { + submissions: { + type: Array, + required: true + } + }, data () { return { headers: [ @@ -53,12 +72,6 @@ export default { ] } }, - props: { - submissions: { - type: Array, - required: true - } - }, computed: { sumScore () { return this.submissions.map(a => a.feedback && a.feedback.score).reduce((a, b) => a + b) diff --git a/frontend/src/components/student_list/StudentList.vue b/frontend/src/components/student_list/StudentList.vue index 9f4ca8f5..c55cca60 100644 --- a/frontend/src/components/student_list/StudentList.vue +++ b/frontend/src/components/student_list/StudentList.vue @@ -4,18 +4,23 @@ <span class="title"> Participants </span> - <student-list-reverse-mapper class="ml-4"/> - <v-spacer/> + <student-list-reverse-mapper class="ml-4" /> + <v-spacer /> <v-text-field + v-model="search" append-icon="search" label="Search" single-line hide-details - v-model="search" - ></v-text-field> + /> <v-card-actions> - <v-btn icon @click="refresh"><v-icon>refresh</v-icon></v-btn> - <student-list-menu/> + <v-btn + icon + @click="refresh" + > + <v-icon>refresh</v-icon> + </v-btn> + <student-list-menu /> </v-card-actions> </v-card-title> <v-data-table @@ -27,10 +32,14 @@ item-key="name" hide-actions > - <template slot="headers" slot-scope="props"> + <template + slot="headers" + slot-scope="props" + > <tr> <th - v-for="(header, i) in props.headers" :key="i" + v-for="(header, i) in props.headers" + :key="i" :class="['column sortable', pagination.descending ? 'desc' : 'asc', header.value === pagination.sortBy ? 'active' : '']" style="padding: 0;" @click="changeSort(header.value)" @@ -40,18 +49,39 @@ </th> </tr> </template> - <template slot="items" slot-scope="props"> + <template + slot="items" + slot-scope="props" + > <tr> <td> - <v-btn small icon @click="props.expanded = !props.expanded"> - <v-icon v-if="props.expanded">keyboard_arrow_up</v-icon> - <v-icon v-else>keyboard_arrow_down</v-icon> + <v-btn + small + icon + @click="props.expanded = !props.expanded" + > + <v-icon v-if="props.expanded"> + keyboard_arrow_up + </v-icon> + <v-icon v-else> + keyboard_arrow_down + </v-icon> </v-btn> - {{props.item.name}} + {{ props.item.name }} <v-tooltip top> <template slot="activator"> - <v-icon small v-if="!props.item.isActive">lock</v-icon> - <v-icon small v-else>lock_open</v-icon> + <v-icon + v-if="!props.item.isActive" + small + > + lock + </v-icon> + <v-icon + v-else + small + > + lock_open + </v-icon> </template> <span v-if="!props.item.isActive">Participant doesn't have access.</span> <span v-else>Participant has access.</span> @@ -59,43 +89,51 @@ </td> <td v-for="type in submissionTypeHeaders" - style="padding: 0" :key="type.pk" + style="padding: 0" class="text-xs-right" > <v-btn - small round outline class="submission-button" - exact v-if="props.item[type.pk]" - v-on:click="showSubmissionDetails" + small + round + outline + class="submission-button" + exact :to="{name: 'submission-side-view', params: { studentPk: props.item.pk, submissionPk: props.item[type.pk].pk - }}" + }}" :color="props.item[type.pk].final ? 'green darken-2' : 'grey'" + @click="showSubmissionDetails" > - {{props.item[type.pk].score}} + {{ props.item[type.pk].score }} </v-btn> <span v-else>N.A</span> </td> <td style="padding: 0 15px;" class="text-xs-right" - >{{props.item.total}}</td> + > + {{ props.item.total }} + </td> </tr> </template> - <template slot="expand" slot-scope="props"> + <template + slot="expand" + slot-scope="props" + > <v-card flat> <v-card-text> <v-btn @click="changeActiveStatus(props.item)"> - {{props.item.isActive ? 'Revoke access' : 'Grant access'}} + {{ props.item.isActive ? 'Revoke access' : 'Grant access' }} </v-btn> <ul class="student-info-list"> <li> - <b>Modul:</b> {{props.item.exam}} + <b>Modul:</b> {{ props.item.exam }} </li> <li> - <b>MatrikelNr:</b> {{props.item.matrikelNo}} + <b>MatrikelNr:</b> {{ props.item.matrikelNo }} </li> </ul> </v-card-text> @@ -113,10 +151,10 @@ import { changeActiveForUser } from '@/api' import { getters } from '@/store/getters' export default { + name: 'StudentList', components: { StudentListReverseMapper, StudentListMenu }, - name: 'student-list', data () { return { loading: true, @@ -177,8 +215,13 @@ export default { } }) } + + return {} } }, + created () { + this.getStudents().then(() => { this.loading = false }) + }, methods: { ...mapActions([ 'getStudents' @@ -227,9 +270,6 @@ export default { this.$emit('detail-click') } }, - created () { - this.getStudents().then(() => { this.loading = false }) - } } </script> diff --git a/frontend/src/components/student_list/StudentListHelpCard.vue b/frontend/src/components/student_list/StudentListHelpCard.vue index 79f156cd..9ff4de2c 100644 --- a/frontend/src/components/student_list/StudentListHelpCard.vue +++ b/frontend/src/components/student_list/StudentListHelpCard.vue @@ -20,7 +20,7 @@ <script> export default { - name: 'student-list-help-card' + name: 'StudentListHelpCard' } </script> diff --git a/frontend/src/components/student_list/StudentListMenu.vue b/frontend/src/components/student_list/StudentListMenu.vue index 85905bce..4b60c8f1 100644 --- a/frontend/src/components/student_list/StudentListMenu.vue +++ b/frontend/src/components/student_list/StudentListMenu.vue @@ -1,10 +1,21 @@ <template> - <v-menu open-on-hover bottom offset-y> - <v-btn icon slot="activator"> + <v-menu + open-on-hover + bottom + offset-y + > + <v-btn + slot="activator" + icon + > <v-icon>menu</v-icon> </v-btn> <v-list> - <v-list-tile v-for="item in items" :key="item.title" @click="item.action"> + <v-list-tile + v-for="item in items" + :key="item.title" + @click="item.action" + > <v-list-tile-title>{{ item.title }}</v-list-tile-title> </v-list-tile> </v-list> @@ -17,7 +28,7 @@ import { activateAllStudentAccess, import { actions } from '@/store/actions' export default { - name: 'student-list-menu', + name: 'StudentListMenu', computed: { studentsActive () { const firstStudent = Object.values(this.$store.state.students)[0] diff --git a/frontend/src/components/student_list/StudentListReverseMapper.vue b/frontend/src/components/student_list/StudentListReverseMapper.vue index c0119eff..0f647636 100644 --- a/frontend/src/components/student_list/StudentListReverseMapper.vue +++ b/frontend/src/components/student_list/StudentListReverseMapper.vue @@ -1,9 +1,16 @@ <template> - <v-layout row align-center> - <file-select v-model="file" display-text="Select map file"/> + <v-layout + row + align-center + > + <file-select + v-model="file" + display-text="Select map file" + /> <v-tooltip top> <v-btn - icon slot="activator" + slot="activator" + icon @click="readMapFileAndApply" > <v-icon>vpn_key</v-icon> @@ -18,8 +25,8 @@ import FileSelect from '@/components/util/FileSelect' import parseCSVMapMixin from '@/components/mixins/parseCSVMapMixin' export default { + name: 'StudentListReverseMapper', components: { FileSelect }, - name: 'student-list-reverse-mapper', mixins: [parseCSVMapMixin], data () { return { diff --git a/frontend/src/components/submission_notes/CorrectionHelpCard.vue b/frontend/src/components/submission_notes/CorrectionHelpCard.vue index 93d74c6e..0be45efe 100644 --- a/frontend/src/components/submission_notes/CorrectionHelpCard.vue +++ b/frontend/src/components/submission_notes/CorrectionHelpCard.vue @@ -1,33 +1,32 @@ <template> - <v-card class="help-card"> - <v-card-title> - <v-icon>help_outline</v-icon> - <h3>Tips on using the correction interface</h3> - </v-card-title> - <v-card-text> - Never trade an ale. - The sea-dog leads with yellow fever, crush the captain's quarters until it waves.<br> - Ho-ho-ho! malaria of life.<br> - Halitosis, adventure, and yellow fever.<br> - The girl drinks with halitosis, pull the galley before it laughs.<br> - The moon fires with life, vandalize the bikini atoll before it travels.<br> - The tuna blows with fight, haul the freighter before it whines.<br> - The cannibal robs with hunger, fire the lighthouse until it whines.<br> - The captain loves with death, vandalize the lighthouse before it whines.<br> - The anchor loots with treasure, raid the freighter before it grows.<br> - The reef commands with endurance, view the quarter-deck until it whines.<br> - The scallywag loots with passion, crush the bikini atoll before it falls.<br> - The sea leads with treasure, ransack the brig until it dies.<br> - The parrot robs with desolation, view the seychelles before it screams.<br> - The warm anchor quirky blows the landlubber.<br> - - </v-card-text> - </v-card> + <v-card class="help-card"> + <v-card-title> + <v-icon>help_outline</v-icon> + <h3>Tips on using the correction interface</h3> + </v-card-title> + <v-card-text> + Never trade an ale. + The sea-dog leads with yellow fever, crush the captain's quarters until it waves.<br> + Ho-ho-ho! malaria of life.<br> + Halitosis, adventure, and yellow fever.<br> + The girl drinks with halitosis, pull the galley before it laughs.<br> + The moon fires with life, vandalize the bikini atoll before it travels.<br> + The tuna blows with fight, haul the freighter before it whines.<br> + The cannibal robs with hunger, fire the lighthouse until it whines.<br> + The captain loves with death, vandalize the lighthouse before it whines.<br> + The anchor loots with treasure, raid the freighter before it grows.<br> + The reef commands with endurance, view the quarter-deck until it whines.<br> + The scallywag loots with passion, crush the bikini atoll before it falls.<br> + The sea leads with treasure, ransack the brig until it dies.<br> + The parrot robs with desolation, view the seychelles before it screams.<br> + The warm anchor quirky blows the landlubber.<br> + </v-card-text> + </v-card> </template> <script> export default { - name: 'correction-help-card' + name: 'CorrectionHelpCard' } </script> diff --git a/frontend/src/components/submission_notes/RouteChangeConfirmation.vue b/frontend/src/components/submission_notes/RouteChangeConfirmation.vue index 9abcee3b..098f72f7 100644 --- a/frontend/src/components/submission_notes/RouteChangeConfirmation.vue +++ b/frontend/src/components/submission_notes/RouteChangeConfirmation.vue @@ -1,28 +1,41 @@ <template> - <v-dialog - v-model="dialog" - max-width="30%" - > - <v-card class="text-xs-center"> - <v-card-title class="title"> - Are you sure? - </v-card-title> - <v-card-text> - Not submitted feedback will be lost! - </v-card-text> - <v-card-actions> - <v-btn flat outline color="red lighten-1" @click="changeRoute">Change page</v-btn> - <v-btn flat outline @click="dialog = false">Stay here</v-btn> - </v-card-actions> - </v-card> - </v-dialog> + <v-dialog + v-model="dialog" + max-width="30%" + > + <v-card class="text-xs-center"> + <v-card-title class="title"> + Are you sure? + </v-card-title> + <v-card-text> + Not submitted feedback will be lost! + </v-card-text> + <v-card-actions> + <v-btn + flat + outline + color="red lighten-1" + @click="changeRoute" + > + Change page + </v-btn> + <v-btn + flat + outline + @click="dialog = false" + > + Stay here + </v-btn> + </v-card-actions> + </v-card> + </v-dialog> </template> <script> import { SubmissionNotes } from '@/store/modules/submission-notes' export default { - name: 'route-change-confirmation', + name: 'RouteChangeConfirmation', props: { nextRoute: { type: Function, @@ -34,12 +47,6 @@ export default { dialog: false } }, - methods: { - changeRoute () { - this.nextRoute() - this.dialog = false - } - }, watch: { nextRoute (newVal, oldVal) { if (newVal !== oldVal && SubmissionNotes.workInProgress) { @@ -48,6 +55,12 @@ export default { this.nextRoute() } } + }, + methods: { + changeRoute () { + this.nextRoute() + this.dialog = false + } } } </script> diff --git a/frontend/src/components/submission_notes/SubmissionCorrection.vue b/frontend/src/components/submission_notes/SubmissionCorrection.vue index a1eafd64..344607b0 100644 --- a/frontend/src/components/submission_notes/SubmissionCorrection.vue +++ b/frontend/src/components/submission_notes/SubmissionCorrection.vue @@ -2,12 +2,18 @@ <div> <base-annotated-submission> <annotated-submission-top-toolbar - class="mb-1 elevation-1" slot="header" :ofStudent="submissionObj && submissionObj.ofStudent" /> - <template slot="table-content" id='sub-lines'> - <tr v-for="(code, lineNo) in submission" :key="`${submissionObj.pk}${lineNo}`" :id="`sub-line-${lineNo}`"> + <template + id="sub-lines" + slot="table-content" + > + <tr + v-for="(code, lineNo) in submission" + :id="`sub-line-${lineNo}`" + :key="`${submissionObj.pk}${lineNo}`" + > <submission-line :hint="hasHiddenComment(lineNo)" :code="code" @@ -18,10 +24,10 @@ <div v-if="origFeedback[lineNo]"> <feedback-comment v-for="(comment, index) in getSortedComments(lineNo)" + :key="index" v-bind="comment" - :visibleToStudent="updatedFeedback[lineNo] ? false : comment.visibleToStudent" + :visible-to-student="updatedFeedback[lineNo] ? false : comment.visibleToStudent" :line-no="lineNo" - :key="index" :deletable="comment.ofTutor === user || isReviewer" @click.native="toggleEditorOnLine(lineNo, comment)" /> @@ -37,24 +43,23 @@ <comment-form v-if="showEditorOnLine[lineNo]" :feedback="selectedComment[lineNo].text" - :lineNo="lineNo" + :line-no="lineNo" @collapseFeedbackForm="toggleEditorOnLine(lineNo)" - > - </comment-form> + /> </submission-line> </tr> </template> <label-selector id="feedback-label-selector" - :assignedToFeedback="true" - class="mt-1 elevation-1" slot="labels" + :assigned-to-feedback="true" + class="mt-1 elevation-1" /> <annotated-submission-bottom-toolbar - class="mt-1 elevation-1" slot="footer" + class="mt-1 elevation-1" :loading="loading" - :fullScore="submissionObj['fullScore']" + :full-score="submissionObj['fullScore']" :skippable="assignment !== undefined" :feedback="feedbackObj ? feedbackObj : {}" @submitFeedback="submitFeedback" @@ -70,7 +75,7 @@ import FeedbackComment from '@/components/submission_notes/base/FeedbackComment. import AnnotatedSubmissionTopToolbar from '@/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar' import AnnotatedSubmissionBottomToolbar from '@/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar' import BaseAnnotatedSubmission from '@/components/submission_notes/base/BaseAnnotatedSubmission' -import FeedbackLabel from "@/components/feedback_labels/FeedbackLabel.vue" +import FeedbackLabel from '@/components/feedback_labels/FeedbackLabel.vue' import { FeedbackLabels as Labels } from '@/store/modules/feedback-labels' import LabelSelector from '@/components/feedback_labels/LabelSelector.vue' import SubmissionLine from '@/components/submission_notes/base/SubmissionLine' @@ -80,6 +85,7 @@ import { actions } from '@/store/actions' import { fetchFeedback } from '@/api' export default { + name: 'SubmissionCorrection', components: { SubmissionLine, BaseAnnotatedSubmission, @@ -88,22 +94,18 @@ export default { FeedbackComment, LabelSelector, CommentForm }, - name: 'submission-correction', - data () { - return { - loading: false, - feedbackShortPollInterval: null - } - }, props: { assignment: { + default: () => {}, type: Object }, // either pass in an assignment or a submission and feedback submissionWithoutAssignment: { + default: () => {}, type: Object }, feedback: { + default: () => {}, type: Object }, ignoreHiddenState: { @@ -111,6 +113,12 @@ export default { default: false, } }, + data () { + return { + loading: false, + feedbackShortPollInterval: null + } + }, computed: { showEditorOnLine () { return SubmissionNotes.state.ui.showEditorOnLine }, selectedComment () { return SubmissionNotes.state.ui.selectedCommentOnLine }, @@ -134,6 +142,21 @@ export default { return this.assignment ? this.assignment.feedback : this.feedback } }, + watch: { + assignment: function (newVar, oldVar) { + this.init() + }, + submissionWithoutAssignment: function () { + this.init() + } + }, + created () { + this.init() + this.shortPollOrigFeedback() + }, + beforeDestroy () { + clearInterval(this.feedbackShortPollInterval) + }, methods: { toggleEditorOnLine (lineNo, comment = '') { SubmissionNotes.TOGGLE_EDITOR_ON_LINE({ lineNo, comment }) @@ -150,7 +173,7 @@ export default { }).catch(err => { // ignore trivial errors as those are handled // by an interceptor - if (err.message.includes("Request failed")) return + if (err.message.includes('Request failed')) return this.$notify({ title: 'Feedback creation Error!', @@ -195,21 +218,6 @@ export default { SubmissionNotes.SET_ORIG_FEEDBACK(this.feedbackObj) SubmissionNotes.SET_SHOW_FEEDBACK(this.ignoreHiddenState ? true : !SubmissionNotes.state.hasOrigFeedback) } - }, - watch: { - assignment: function (newVar, oldVar) { - this.init() - }, - submissionWithoutAssignment: function () { - this.init() - } - }, - created () { - this.init() - this.shortPollOrigFeedback() - }, - beforeDestroy () { - clearInterval(this.feedbackShortPollInterval) } } </script> diff --git a/frontend/src/components/submission_notes/base/BaseAnnotatedSubmission.vue b/frontend/src/components/submission_notes/base/BaseAnnotatedSubmission.vue index 267fe57b..9cb5de21 100644 --- a/frontend/src/components/submission_notes/base/BaseAnnotatedSubmission.vue +++ b/frontend/src/components/submission_notes/base/BaseAnnotatedSubmission.vue @@ -1,17 +1,17 @@ <template> <div> - <slot name="header"/> + <slot name="header" /> <table class="submission-table elevation-1"> - <slot name="table-content"/> + <slot name="table-content" /> </table> - <slot name="labels"/> - <slot name="footer"/> + <slot name="labels" /> + <slot name="footer" /> </div> </template> <script> export default { - name: 'base-annotated-submission' + name: 'BaseAnnotatedSubmission' } </script> diff --git a/frontend/src/components/submission_notes/base/CommentForm.vue b/frontend/src/components/submission_notes/base/CommentForm.vue index 62148678..57dac519 100644 --- a/frontend/src/components/submission_notes/base/CommentForm.vue +++ b/frontend/src/components/submission_notes/base/CommentForm.vue @@ -1,36 +1,60 @@ <template> <v-layout wrap> - <v-flex lg12 md12 sm12 mr-1> + <v-flex + lg12 + md12 + sm12 + mr-1 + > <v-textarea + v-model="currentFeedback" name="feedback-input" label="Please provide your feedback here" - v-model="currentFeedback" - @keyup.enter.ctrl.exact="submitFeedback" - @keyup.esc="collapseTextField" - @focus="selectInput($event)" rows="2" outline autofocus auto-grow hide-details + @keyup.enter.ctrl.exact="submitFeedback" + @keyup.esc="collapseTextField" + @focus="selectInput($event)" /> </v-flex> - <v-flex lg10 md8 sm8 my-2> + <v-flex + lg10 + md8 + sm8 + my-2 + > <label-selector id="comment-label-selector" - :assignedToFeedback="false" - :lineNo="this.lineNo" - :labelsUnchanged="labelsUnchanged" - :labelsAdded="labelsAdded" - :labelsRemoved="labelsRemoved" + :assigned-to-feedback="false" + :line-no="lineNo" + :labels-unchanged="labelsUnchanged" + :labels-added="labelsAdded" + :labels-removed="labelsRemoved" @label-added="labelAdded" @label-removed="labelRemoved" @submit-shortcut="submitFeedback" /> </v-flex> - <v-flex lg2 ma-0> - <v-btn id="submit-comment" color="success" @click="submitFeedback"><v-icon>check</v-icon>Submit</v-btn> - <v-btn id="cancel-comment" @click="collapseTextField"><v-icon>cancel</v-icon>cancel</v-btn> + <v-flex + lg2 + ma-0 + > + <v-btn + id="submit-comment" + color="success" + @click="submitFeedback" + > + <v-icon>check</v-icon>Submit + </v-btn> + <v-btn + id="cancel-comment" + @click="collapseTextField" + > + <v-icon>cancel</v-icon>cancel + </v-btn> </v-flex> </v-layout> </template> @@ -40,9 +64,9 @@ import Vue from 'vue' import Component, { mixins } from 'vue-class-component' import { Prop, Watch } from 'vue-property-decorator' import { SubmissionNotes } from '@/store/modules/submission-notes' -import LabelSelector from "@/components/feedback_labels/LabelSelector.vue" -import { FeedbackComment, SubmissionType } from '@/models'; -import commentLabelSelector from "@/components/mixins/commentLabelSelector" +import LabelSelector from '@/components/feedback_labels/LabelSelector.vue' +import { FeedbackComment, SubmissionType } from '@/models' +import commentLabelSelector from '@/components/mixins/commentLabelSelector' @Component({ components: { @@ -107,7 +131,7 @@ export default class CommentForm extends mixins(commentLabelSelector) { const text = this.currentFeedback const labels = this.labelsUnchanged.concat(this.labelsAdded) - if (text === "" && labels.length === 0) { + if (text === '' && labels.length === 0) { return this.collapseTextField() } diff --git a/frontend/src/components/submission_notes/base/FeedbackComment.vue b/frontend/src/components/submission_notes/base/FeedbackComment.vue index 97dd4cf6..ec60c19a 100644 --- a/frontend/src/components/submission_notes/base/FeedbackComment.vue +++ b/frontend/src/components/submission_notes/base/FeedbackComment.vue @@ -1,47 +1,88 @@ <template> <div class="dialog-box"> - <div v-if="commentDisplayable" class="body elevation-1" :style="{borderColor: borderColor, backgroundColor}"> - <span class="tip tip-up" :style="{borderBottomColor: borderColor}"></span> - <span v-if="ofTutor" class="of-tutor">Of tutor: {{ofTutor}}</span> - <span class="comment-created">{{parsedCreated}}</span> - <div class="visibility-icon" v-if="showVisibilityIcon"> - <v-tooltip top v-if="visibleToStudent" size="20px"> + <div + v-if="commentDisplayable" + class="body elevation-1" + :style="{borderColor: borderColor, backgroundColor}" + > + <span + class="tip tip-up" + :style="{borderBottomColor: borderColor}" + /> + <span + v-if="ofTutor" + class="of-tutor" + >Of tutor: {{ ofTutor }}</span> + <span class="comment-created">{{ parsedCreated }}</span> + <div + v-if="showVisibilityIcon" + class="visibility-icon" + > + <v-tooltip + v-if="visibleToStudent" + top + size="20px" + > <v-icon slot="activator" size="20px" - >visibility</v-icon> + > + visibility + </v-icon> <span>Will be visible to student</span> </v-tooltip> - <v-tooltip top v-else> + <v-tooltip + v-else + top + > <v-icon slot="activator" - size="20px">visibility_off</v-icon> + size="20px" + > + visibility_off + </v-icon> <span>Won't be visible to student</span> </v-tooltip> </div> - <div class="message">{{text}}</div> + <div class="message"> + {{ text }} + </div> <v-btn - flat icon absolute - class="delete-button" v-if="deletable" + flat + icon + absolute + class="delete-button" @click.stop="toggleDeleteComment" > <v-icon - v-if="!markedForDeletion.hasOwnProperty(this.pk)" - color="grey darken-1" size="20px">delete_forever</v-icon> - <v-icon v-else size="20px">restore</v-icon> + v-if="!markedForDeletion.hasOwnProperty(pk)" + color="grey darken-1" + size="20px" + > + delete_forever + </v-icon> + <v-icon + v-else + size="20px" + > + restore + </v-icon> </v-btn> </div> - <v-layout v-if="showLabels && correctorView" ml-2> + <v-layout + v-if="showLabels && correctorView" + ml-2 + > <v-flex sm4> <v-flex sm12> UNCHANGED </v-flex> <feedback-label - removable v-for="label in unchangedLabels" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="deleteAction" /> </v-flex> @@ -50,10 +91,10 @@ WILL BE REMOVED </v-flex> <feedback-label - removable v-for="label in removedLabels" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="deleteAction" /> </v-flex> @@ -62,23 +103,34 @@ WILL BE ADDED </v-flex> <feedback-label - removable v-for="label in addedLabels" - v-bind="label" :key="label.pk" + removable + v-bind="label" @remove-clicked="deleteAction" /> </v-flex> </v-layout> - <template row wrap v-if="!correctorView" align-center> - <v-layout row wrap align-center v-for="label in unchangedLabels" :key="label.pk"> + <template + v-if="!correctorView" + row + wrap + align-center + > + <v-layout + v-for="label in unchangedLabels" + :key="label.pk" + row + wrap + align-center + > <v-flex sm6> - <feedback-label + <feedback-label v-bind="label" /> </v-flex> <v-flex sm6> - <span><b>Description: </b>{{label.description}}</span> + <span><b>Description: </b>{{ label.description }}</span> </v-flex> </v-layout> </template> @@ -89,12 +141,12 @@ import { mapState } from 'vuex' import { UI } from '@/store/modules/ui' import { SubmissionNotes } from '@/store/modules/submission-notes' -import FeedbackLabel from "@/components/feedback_labels/FeedbackLabel.vue" +import FeedbackLabel from '@/components/feedback_labels/FeedbackLabel.vue' import { FeedbackLabels as Labels } from '@/store/modules/feedback-labels' -import commentLabelSelector from "@/components/mixins/commentLabelSelector" +import commentLabelSelector from '@/components/mixins/commentLabelSelector' export default { - name: 'feedback-comment', + name: 'FeedbackComment', components: { FeedbackLabel, }, @@ -103,6 +155,7 @@ export default { ], props: { pk: { + default: '', type: String, required: false }, @@ -111,10 +164,12 @@ export default { required: true }, modified: { + default: '', type: String, required: false }, ofTutor: { + default: '', type: String, required: false }, @@ -140,7 +195,7 @@ export default { } }, computed: { - commentDisplayable () { return this.text !== "" }, + commentDisplayable () { return this.text !== '' }, showLabels () { return this.visibleToStudent && (this.getUnchangedLabels().length > 0 || @@ -195,7 +250,7 @@ export default { SubmissionNotes.UPDATE_FEEDBACK_LINE({ lineNo: Number(this.lineNo), comment: { - text: this.text || "", + text: this.text || '', labels: labels, } }) @@ -246,7 +301,6 @@ export default { border-radius: 3px; font-size: 14px; line-height: 1.5; - white-space: pre-wrap; } .delete-button { bottom: -12px; diff --git a/frontend/src/components/submission_notes/base/SubmissionLine.vue b/frontend/src/components/submission_notes/base/SubmissionLine.vue index 3bad6a50..7cf21589 100644 --- a/frontend/src/components/submission_notes/base/SubmissionLine.vue +++ b/frontend/src/components/submission_notes/base/SubmissionLine.vue @@ -2,7 +2,8 @@ <div> <td :style="backgroundColor" - class="line-number-cell"> + class="line-number-cell" + > <v-btn flat block @@ -14,15 +15,16 @@ </v-btn> </td> <td class="code-cell-content pl-2"> - <span v-html="code" class="code-line"></span> - <slot/> + <!-- eslint-disable-next-line --> + <span class="code-line" v-html="code"/> + <slot /> </td> </div> </template> <script> export default { - name: 'submission-line', + name: 'SubmissionLine', props: { lineNo: { type: String, diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue index 2fb77e70..3e9e3c96 100644 --- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue +++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue @@ -3,63 +3,109 @@ <template> <v-container class="bottom-container"> <v-layout wrap> - <v-flex sm4 md4 lg2> - <v-tooltip top v-if="skippable"> - <v-btn slot="activator" outline round - id="skip-submission" - color="grey darken-2" - @click="skipSubmission">Skip</v-btn> + <v-flex + sm4 + md4 + lg2 + > + <v-tooltip + v-if="skippable" + top + > + <v-btn + id="skip-submission" + slot="activator" + outline + round + color="grey darken-2" + @click="skipSubmission" + > + Skip + </v-btn> <span>Skip this submission</span> </v-tooltip> <v-spacer /> </v-flex> <v-flex> - <v-layout wrap class="score-submit-container"> - <v-flex xs5 class="score-flex"> + <v-layout + wrap + class="score-submit-container" + > + <v-flex + xs5 + class="score-flex" + > <span class="mr-2">Score:</span> - <input class="score-text-field" - v-shortkey="'numeric'" @shortkey="handleKeypress" - id="score-input" - type="number" - step="0.5" - v-model="score" - @input="validateScore" - @change="validateScore" /> - <span> / {{fullScore}}</span> - <v-btn outline round flat - id="score-zero" - class="score-button" - @click="score=0" - color="red lighten-1">0 + <input + id="score-input" + v-model="score" + v-shortkey="'numeric'" + class="score-text-field" + type="number" + step="0.5" + @shortkey="handleKeypress" + @input="validateScore" + @change="validateScore" + > + <span> / {{ fullScore }}</span> + <v-btn + id="score-zero" + outline + round + flat + class="score-button" + color="red lighten-1" + @click="score=0" + > + 0 </v-btn> - <v-btn outline round flat - id="score-full" - @click="score=fullScore" - color="blue darken-3" - class="score-button">{{fullScore}} + <v-btn + id="score-full" + outline + round + flat + color="blue darken-3" + class="score-button" + @click="score=fullScore" + > + {{ fullScore }} </v-btn> </v-flex> - <v-flex class="submit-flex" xs3 sm3> + <v-flex + class="submit-flex" + xs3 + sm3 + > <v-layout> <v-flex xs4> - <v-tooltip top v-if="showFinalCheckbox"> - <v-toolbar-items class="final-container" - slot="activator"> + <v-tooltip + v-if="showFinalCheckbox" + top + > + <v-toolbar-items + slot="activator" + class="final-container" + > <label>Final</label> - <v-checkbox slot="activator" - v-model="isFinal" - class="final-checkbox" /> + <v-checkbox + slot="activator" + v-model="isFinal" + class="final-checkbox" + /> </v-toolbar-items> <span>If unchecked this submission will be marked for review by the lecturer</span> </v-tooltip> </v-flex> <v-flex xs> <v-tooltip top> - <v-btn color="success" - id="submit-feedback" - slot="activator" - :loading="loading" - @click="submit">Submit + <v-btn + id="submit-feedback" + slot="activator" + color="success" + :loading="loading" + @click="submit" + > + Submit <v-icon>chevron_right</v-icon> </v-btn> <span>Submit and continue</span> @@ -70,10 +116,14 @@ </v-layout> </v-flex> <v-flex v-if="scoreError"> - <v-alert class="score-alert ma-3" - color="error" - icon="warning" - :value="scoreError">{{ scoreError }}</v-alert> + <v-alert + class="score-alert ma-3" + color="error" + icon="warning" + :value="scoreError" + > + {{ scoreError }} + </v-alert> </v-flex> </v-layout> </v-container> @@ -85,13 +135,7 @@ import { Authentication } from '@/store/modules/authentication' import { Subscriptions } from '@/store/modules/subscriptions' export default { - name: 'annotated-submission-bottom-toolbar', - data () { - return { - scoreError: '', - isFinal: this.initialFinalStatus() - } - }, + name: 'AnnotatedSubmissionBottomToolbar', props: { fullScore: { type: Number, @@ -110,6 +154,12 @@ export default { default: () => {} } }, + data () { + return { + scoreError: '', + isFinal: this.initialFinalStatus() + } + }, computed: { score: { get: function () { @@ -171,12 +221,12 @@ export default { }) }) } else { - throw new Error("Can't skip submission when skippable is false for AnnotatedSubmissionBottomToolbar.") + throw new Error('Can\'t skip submission when skippable is false for AnnotatedSubmissionBottomToolbar.') } }, handleKeypress (event) { // only handle keypress if nothing is focused - if (document.activeElement.tagName === "BODY") { + if (document.activeElement.tagName === 'BODY') { this.score = event.key const scoreInput = document.getElementById('score-input') scoreInput.scrollIntoView() diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue index 08cf9725..624c6550 100644 --- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue +++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue @@ -1,25 +1,29 @@ <template> <v-toolbar - dense> + dense + > <v-toolbar-side-icon @click.stop="helpDialog=true"> - <v-icon>help_outline</v-icon> + <v-icon>help_outline</v-icon> </v-toolbar-side-icon> <v-dialog + v-model="helpDialog" scrollable max-width="fit-content" - v-model="helpDialog" > - <correction-help-card/> + <correction-help-card /> </v-dialog> <span class="title">Submission of {{ofStudent}}</span> <toggle-feedback-visibility-button/> <v-spacer/> <v-tooltip top> <v-btn - icon slot="activator" + slot="activator" + icon @click="copyToClipboard" - ><v-icon>content_copy</v-icon></v-btn> - <span>{{copyMessage}}</span> + > + <v-icon>content_copy</v-icon> + </v-btn> + <span>{{ copyMessage }}</span> </v-tooltip> </v-toolbar> </template> @@ -28,12 +32,14 @@ import CorrectionHelpCard from '@/components/submission_notes/CorrectionHelpCard' import { mapState } from 'vuex' import ToggleFeedbackVisibilityButton from '@/components/submission_notes/toolbars/ToggleFeedbackVisibilityButton' -import { SubmissionNotes } from '@/store/modules/submission-notes'; +import { SubmissionNotes } from '@/store/modules/submission-notes' export default { + name: 'AnnotatedSubmissionTopToolbar', components: { ToggleFeedbackVisibilityButton, CorrectionHelpCard }, +<<<<<<< HEAD name: 'annotated-submission-top-toolbar', props: { ofStudent: { @@ -41,6 +47,8 @@ export default { default: "Participant" } }, +======= +>>>>>>> 8db1f18... setup eslint to also lint vue templates data () { return { helpDialog: false, diff --git a/frontend/src/components/submission_notes/toolbars/ToggleFeedbackVisibilityButton.vue b/frontend/src/components/submission_notes/toolbars/ToggleFeedbackVisibilityButton.vue index a579c310..c06f3d3e 100644 --- a/frontend/src/components/submission_notes/toolbars/ToggleFeedbackVisibilityButton.vue +++ b/frontend/src/components/submission_notes/toolbars/ToggleFeedbackVisibilityButton.vue @@ -1,7 +1,16 @@ <template> - <v-btn id="feedback-visibility-toggle" flat color="info" @click="showFeedback = !showFeedback"> - <div v-if="showFeedback"> Hide Feedback</div> - <div v-else> Show Feedback</div> + <v-btn + id="feedback-visibility-toggle" + flat + color="info" + @click="showFeedback = !showFeedback" + > + <div v-if="showFeedback"> + Hide Feedback + </div> + <div v-else> + Show Feedback + </div> </v-btn> </template> @@ -10,7 +19,7 @@ import Vue from 'vue' import { SubmissionNotes } from '@/store/modules/submission-notes' import { createComputedGetterSetter } from '@/util/helpers' import { getters } from '@/store/getters' -import Component from 'vue-class-component'; +import Component from 'vue-class-component' @Component export default class ToggleFeedbackVisibilityButton extends Vue { diff --git a/frontend/src/components/submission_type/SubmissionType.vue b/frontend/src/components/submission_type/SubmissionType.vue index d33c5a59..b42450f5 100644 --- a/frontend/src/components/submission_type/SubmissionType.vue +++ b/frontend/src/components/submission_type/SubmissionType.vue @@ -1,8 +1,13 @@ <template> <v-layout column> <v-card id="submission-type"> - <v-card-title class="title mb-2">{{ name }} - Full score: {{ fullScore }}</v-card-title> - <v-expansion-panel expand v-model="expanded"> + <v-card-title class="title mb-2"> + {{ name }} - Full score: {{ fullScore }} + </v-card-title> + <v-expansion-panel + v-model="expanded" + expand + > <v-expansion-panel-content v-for="(item, i) in typeItems" :key="i" @@ -10,32 +15,32 @@ <div slot="header"> <b>{{ item.title }}</b> <v-btn + v-if="item.title == 'Solution'" class="ml-5" color="info" flat - v-if="item.title == 'Solution'" @click.stop="showSolutionComments = !showSolutionComments" - >Toggle Comments</v-btn> + > + Toggle Comments + </v-btn> </div> <v-card v-if="item.title === 'Description'" class="type-description" > <v-card-text class="ml-2"> - <span - v-html="item.text" - ></span> + <!-- eslint-disable-next-line --> + <span v-html="item.text"/> </v-card-text> </v-card> <div v-else-if="item.title === 'Solution'"> <solution - :pk=pk - :solution=solution - :programmingLanguage=programmingLanguage - :solutionComments=solutionComments - :showSolutionComments=showSolutionComments - > - </solution> + :pk="pk" + :solution="solution" + :programming-language="programmingLanguage" + :solution-comments="solutionComments" + :show-solution-comments="showSolutionComments" + /> </div> </v-expansion-panel-content> </v-expansion-panel> @@ -49,7 +54,7 @@ import Component from 'vue-class-component' import { Prop } from 'vue-property-decorator' import { highlight } from 'highlight.js' import { UI } from '@/store/modules/ui' -import { SolutionComment } from '../../models'; +import { SolutionComment } from '../../models' import Solution from '@/components/submission_type/solution/Solution.vue' @Component({ diff --git a/frontend/src/components/submission_type/SubmissionTypesOverview.vue b/frontend/src/components/submission_type/SubmissionTypesOverview.vue index 2e8bc31b..4c1730b6 100644 --- a/frontend/src/components/submission_type/SubmissionTypesOverview.vue +++ b/frontend/src/components/submission_type/SubmissionTypesOverview.vue @@ -1,32 +1,45 @@ <template> <v-card> - <v-card-title class="title">Task types</v-card-title> - <v-layout row wrap> - <v-flex xs3> - <v-list id="submission-types-list"> - <v-list-tile - v-for="submissionType in sortedSubmissionTypes" :key="submissionType.pk" - @click="selectedSubmissionType = submissionType" - > - <v-list-tile-content> - {{submissionType.name}} - </v-list-tile-content> - </v-list-tile> - </v-list> - </v-flex> - <v-flex xs9> - <v-layout v-if="!selectedSubmissionType" justify-center> - <strong>Select a task type on the left to see the description and solution.</strong> - </v-layout> - <submission-type class="mr-2 mb-2" v-else v-bind="selectedSubmissionType"/> - </v-flex> - </v-layout> + <v-card-title class="title"> + Task types + </v-card-title> + <v-layout + row + wrap + > + <v-flex xs3> + <v-list id="submission-types-list"> + <v-list-tile + v-for="submissionType in sortedSubmissionTypes" + :key="submissionType.pk" + @click="selectedSubmissionType = submissionType" + > + <v-list-tile-content> + {{ submissionType.name }} + </v-list-tile-content> + </v-list-tile> + </v-list> + </v-flex> + <v-flex xs9> + <v-layout + v-if="!selectedSubmissionType" + justify-center + > + <strong>Select a task type on the left to see the description and solution.</strong> + </v-layout> + <submission-type + v-else + class="mr-2 mb-2" + v-bind="selectedSubmissionType" + /> + </v-flex> + </v-layout> </v-card> </template> <script> import SubmissionType from '@/components/submission_type/SubmissionType' -import store from '@/store/store'; +import store from '@/store/store' export default { name: 'SubmissionTypesOverview', components: { SubmissionType }, diff --git a/frontend/src/components/submission_type/solution/Solution.vue b/frontend/src/components/submission_type/solution/Solution.vue index ae4f1bd9..457cc53b 100644 --- a/frontend/src/components/submission_type/solution/Solution.vue +++ b/frontend/src/components/submission_type/solution/Solution.vue @@ -1,22 +1,34 @@ <template> <table class="solution-table"> - <tr v-for="(code, lineNo) in highlightedSolution" :key="`${pk}:${lineNo}`" :id="`solution-line-${lineNo}`"> - <td class="line-number-cell" :style="backgroundColor(lineNo)"> + <tr + v-for="(code, lineNo) in highlightedSolution" + :id="`solution-line-${lineNo}`" + :key="`${pk}:${lineNo}`" + > + <td + class="line-number-cell" + :style="backgroundColor(lineNo)" + > <v-btn - flat - block - depressed - class="line-number-btn" - @click="toggleEditor(lineNo)">{{lineNo}}</v-btn> + flat + block + depressed + class="line-number-btn" + @click="toggleEditor(lineNo)" + > + {{ lineNo }} + </v-btn> </td> <td class="code-cell-content pl-2"> - <span v-html="code" class="code-line"></span> + <!-- eslint-disable-next-line --> + <span class="code-line" v-html="code"/> <template - v-if="solutionComments[lineNo] && solutionComments[lineNo].length && showSolutionComments"> + v-if="solutionComments[lineNo] && solutionComments[lineNo].length && showSolutionComments" + > <solution-comment v-for="comment in solutionComments[lineNo]" - v-bind="comment" :key="comment.pk" + v-bind="comment" @update-submission-type="updateSubmissionType" @toggle-editor="toggleEditor(lineNo)" @toggle-eidt-editor="toggleEditor(lineNo)" @@ -24,21 +36,32 @@ </template> <template v-if="showEditorOnline[lineNo]"> <v-textarea + v-model="editedSolutionComments[lineNo]" name="solution-comment-input" label="Here you can comment the solution. Other tutors will see those comments." - v-model="editedSolutionComments[lineNo]" - @keyup.enter.ctrl.exact="submitSolutionComment(lineNo)" - @keyup.esc="collapseTextField(lineNo)" - @focus="selectInput($event)" rows="2" outline autofocus auto-grow hide-details class="mx-2" + @keyup.enter.ctrl.exact="submitSolutionComment(lineNo)" + @keyup.esc="collapseTextField(lineNo)" + @focus="selectInput($event)" /> - <v-btn id="submit-comment" color="success" @click="submitSolutionComment(lineNo)"><v-icon>check</v-icon>Submit</v-btn> - <v-btn id="cancel-comment" @click="toggleEditor(lineNo)"><v-icon>cancel</v-icon>cancel</v-btn> + <v-btn + id="submit-comment" + color="success" + @click="submitSolutionComment(lineNo)" + > + <v-icon>check</v-icon>Submit + </v-btn> + <v-btn + id="cancel-comment" + @click="toggleEditor(lineNo)" + > + <v-icon>cancel</v-icon>cancel + </v-btn> </template> </td> </tr> @@ -46,13 +69,13 @@ </template> <script lang="ts"> - import { Vue, Component, Prop } from "vue-property-decorator" - import { SolutionComment, FeedbackComment } from "../../../models" - import { highlight } from "highlight.js" - import { syntaxPostProcess, objectifyArray } from "../../../util/helpers" - import SolutionCommentComponent from "@/components/submission_type/solution/SolutionComment.vue" + import { Vue, Component, Prop } from 'vue-property-decorator' + import { SolutionComment, FeedbackComment } from '../../../models' + import { highlight } from 'highlight.js' + import { syntaxPostProcess, objectifyArray } from '../../../util/helpers' + import SolutionCommentComponent from '@/components/submission_type/solution/SolutionComment.vue' import * as api from '@/api' - import { actions } from '../../../store/actions'; + import { actions } from '../../../store/actions' @Component({ components: {'SolutionComment': SolutionCommentComponent} @@ -66,12 +89,12 @@ @Prop({ type: String, required: false, - default: "" + default: '' }) solution!: string @Prop({ type: String, - default: "c" + default: 'c' }) programmingLanguage!: string @Prop({ @@ -95,7 +118,7 @@ .value const postprocessed = syntaxPostProcess(highlighted) return postprocessed - .split("\n") + .split('\n') .reduce((acc: { [k: number]: string }, curr, index) => { acc[index + 1] = curr return acc diff --git a/frontend/src/components/submission_type/solution/SolutionComment.vue b/frontend/src/components/submission_type/solution/SolutionComment.vue index f8af0595..a243dfb7 100644 --- a/frontend/src/components/submission_type/solution/SolutionComment.vue +++ b/frontend/src/components/submission_type/solution/SolutionComment.vue @@ -1,46 +1,85 @@ <template> <div> - <div class="dialog-box" @click="$emit('toggle-editor')"> - <div class="body elevation-1" :style="{borderColor: '#3D8FC1', backgroundColor}"> - <span class="tip tip-up" :style="{borderBottomColor: '#3D8FC1'}"></span> - <span v-if="ofUser" class="of-user">Of user: {{ofUser}}</span> - <span class="comment-created">{{parsedCreated}}</span> - <div class="message">{{text}}</div> + <div + class="dialog-box" + @click="$emit('toggle-editor')" + > + <div + class="body elevation-1" + :style="{borderColor: '#3D8FC1', backgroundColor}" + > + <span + class="tip tip-up" + :style="{borderBottomColor: '#3D8FC1'}" + /> + <span + v-if="ofUser" + class="of-user" + >Of user: {{ ofUser }}</span> + <span class="comment-created">{{ parsedCreated }}</span> + <div class="message"> + {{ text }} + </div> <v-btn - flat icon absolute - class="delete-button" v-if="deletable" + flat + icon + absolute + class="delete-button" @click.stop="deleteConfirmation = true" > - <v-icon color="grey darken-1" size="20px">delete_forever</v-icon> + <v-icon + color="grey darken-1" + size="20px" + > + delete_forever + </v-icon> </v-btn> <v-btn - flat icon absolute - class="edit-button" v-if="editable" + flat + icon + absolute + class="edit-button" @click.stop="toggleEditing()" > - <v-icon color="grey darken-1" size="20px">edit</v-icon> + <v-icon + color="grey darken-1" + size="20px" + > + edit + </v-icon> </v-btn> </div> </div> <template v-if="editing"> <v-textarea + v-model="editedText" name="solution-comment-edit" label="Here you can edit your comment" - v-model="editedText" - @keyup.enter.ctrl.exact="submitEdit" - @keyup.esc="editing = false" - @focus="selectInput($event)" rows="2" outline autofocus auto-grow hide-details class="mx-2" + @keyup.enter.ctrl.exact="submitEdit" + @keyup.esc="editing = false" + @focus="selectInput($event)" /> - <v-btn id="submit-comment" color="success" @click="submitEdit"><v-icon>check</v-icon>Submit</v-btn> - <v-btn id="cancel-comment" @click="editing = false"><v-icon>cancel</v-icon>cancel</v-btn> + <v-btn + id="submit-comment" + color="success" + @click="submitEdit" + > + <v-icon>check</v-icon>Submit + </v-btn> + <v-btn + id="cancel-comment" + @click="editing = false" + > + <v-icon>cancel</v-icon>cancel + </v-btn> </template> <v-dialog @@ -48,14 +87,22 @@ max-width="max-content" > <v-card - class="text-xs-center pa-2" + class="text-xs-center pa-2" > <v-card-title class="title"> Delete permanently? </v-card-title> <v-card-actions> - <v-btn :id="`confirm-delete-comment`" color="red lighten-1" @click="deleteComment">delete</v-btn> - <v-btn @click="deleteConfirmation = false">cancel</v-btn> + <v-btn + :id="`confirm-delete-comment`" + color="red lighten-1" + @click="deleteComment" + > + delete + </v-btn> + <v-btn @click="deleteConfirmation = false"> + cancel + </v-btn> </v-card-actions> </v-card> </v-dialog> @@ -66,9 +113,9 @@ import {Vue, Component, Prop, Provide} from 'vue-property-decorator' import { UI } from '@/store/modules/ui' import { SubmissionNotes } from '@/store/modules/submission-notes' -import { Authentication } from '../../../store/modules/authentication'; -import * as api from "@/api" -import { actions } from '@/store/actions'; +import { Authentication } from '../../../store/modules/authentication' +import * as api from '@/api' +import { actions } from '@/store/actions' @Component export default class SolutionComment extends Vue { @@ -171,7 +218,6 @@ export default class SolutionComment extends Vue { border-radius: 3px; font-size: 14px; line-height: 1.5; - white-space: pre-wrap; } .delete-button { bottom: -12px; diff --git a/frontend/src/components/subscriptions/SubscriptionCreation.vue b/frontend/src/components/subscriptions/SubscriptionCreation.vue index 11362f05..7e039d0e 100644 --- a/frontend/src/components/subscriptions/SubscriptionCreation.vue +++ b/frontend/src/components/subscriptions/SubscriptionCreation.vue @@ -17,12 +17,14 @@ label="Select your desired feedback stage" /> <v-card-actions> - <v-spacer/> + <v-spacer /> <v-btn flat - @click="subscribe" :loading="loading" - >Subscribe</v-btn> + @click="subscribe" + > + Subscribe + </v-btn> </v-card-actions> </v-card-text> </v-card> @@ -44,17 +46,7 @@ const stages = [ ] export default { - name: 'subscription-creation', - data () { - return { - key: { - text: '', - key: '' - }, - stage: stages[0], - loading: false - } - }, + name: 'SubscriptionCreation', props: { title: { type: String, @@ -65,9 +57,20 @@ export default { required: true }, keyItems: { + default: () => [], type: Array } }, + data () { + return { + key: { + text: '', + key: '' + }, + stage: stages[0], + loading: false + } + }, computed: { possibleStages () { let possibleStages = [...stages] @@ -90,7 +93,7 @@ export default { }).catch(err => { if (err.response && err.response.data['non_field_errors']) { this.$notify({ - title: "Couldn't create subscription", + title: 'Couldn\'t create subscription', text: err.response.data['non_field_errors'].join(' '), type: 'error' }) diff --git a/frontend/src/components/subscriptions/SubscriptionEnded.vue b/frontend/src/components/subscriptions/SubscriptionEnded.vue index d5c6815e..7890a5dc 100644 --- a/frontend/src/components/subscriptions/SubscriptionEnded.vue +++ b/frontend/src/components/subscriptions/SubscriptionEnded.vue @@ -1,11 +1,14 @@ <template> - <v-card class="mx-auto center-page" id="subscription-ended"> + <v-card + id="subscription-ended" + class="mx-auto center-page" + > <v-card-title class="title"> No submissions left </v-card-title> <v-card-text> All submissions for <b> {{ submissionTypeName() }} </b> in the current stage have been corrected. If you've - been validating feedback or <br/> + been validating feedback or <br> resolving conflicts some submissions may become active again. If that is the case they will appear clickable in the sidebar again. </v-card-text> diff --git a/frontend/src/components/subscriptions/SubscriptionForList.vue b/frontend/src/components/subscriptions/SubscriptionForList.vue index d88fa9cf..c38a974f 100644 --- a/frontend/src/components/subscriptions/SubscriptionForList.vue +++ b/frontend/src/components/subscriptions/SubscriptionForList.vue @@ -8,11 +8,12 @@ <!-- dynamically set css class depending on active --> <v-list-tile-content :class="{'inactive-subscription': !active}" - class="mr-3 subscription"> - {{name}} + class="mr-3 subscription" + > + {{ name }} </v-list-tile-content> <v-list-tile-action-text> - left: {{available}} + left: {{ available }} </v-list-tile-action-text> </v-list-tile> </v-layout> diff --git a/frontend/src/components/subscriptions/SubscriptionList.vue b/frontend/src/components/subscriptions/SubscriptionList.vue index 07dc0dae..bb7e561c 100644 --- a/frontend/src/components/subscriptions/SubscriptionList.vue +++ b/frontend/src/components/subscriptions/SubscriptionList.vue @@ -1,13 +1,24 @@ <template> - <v-card name='subscription-list'> - <v-toolbar color="teal" :dense="sidebar"> + <v-card name="subscription-list"> + <v-toolbar + color="teal" + :dense="sidebar" + > <v-toolbar-side-icon><v-icon>assignment</v-icon></v-toolbar-side-icon> - <v-toolbar-title v-if="showDetail" style="min-width: fit-content;"> + <v-toolbar-title + v-if="showDetail" + style="min-width: fit-content;" + > Tasks </v-toolbar-title> - <v-spacer/> - <v-btn icon @click="getSubscriptions(false)"> - <v-icon v-if="!updating">refresh</v-icon> + <v-spacer /> + <v-btn + icon + @click="getSubscriptions(false)" + > + <v-icon v-if="!updating"> + refresh + </v-icon> <v-progress-circular v-else indeterminate @@ -16,12 +27,26 @@ /> </v-btn> </v-toolbar> - <v-tabs grow color="teal lighten-1" v-model="selectedStage" v-if="showDetail"> - <v-tab v-for="(item, i) in stagesReadable" :key="i"> - {{item}} + <v-tabs + v-if="showDetail" + v-model="selectedStage" + grow + color="teal lighten-1" + > + <v-tab + v-for="(item, i) in stagesReadable" + :key="i" + > + {{ item }} </v-tab> - <v-tab-item v-for="(stage, i) in stages" :key="i"> - <subscriptions-for-stage :stage="stage" :id="`stage-${i}`"/> + <v-tab-item + v-for="(stage, i) in stages" + :key="i" + > + <subscriptions-for-stage + :id="`stage-${i}`" + :stage="stage" + /> </v-tab-item> </v-tabs> </v-card> diff --git a/frontend/src/components/subscriptions/SubscriptionsForStage.vue b/frontend/src/components/subscriptions/SubscriptionsForStage.vue index 1e961cbd..49587104 100644 --- a/frontend/src/components/subscriptions/SubscriptionsForStage.vue +++ b/frontend/src/components/subscriptions/SubscriptionsForStage.vue @@ -1,12 +1,13 @@ <template> <v-list :dense="dense"> <div> - <div v-for="subscription in subscriptions['submission_type']" - :key="subscription.pk"> + <div + v-for="subscription in subscriptions['submission_type']" + :key="subscription.pk" + > <subscription-for-list v-bind="subscription" - > - </subscription-for-list> + /> </div> </div> </v-list> @@ -16,10 +17,10 @@ import SubscriptionForList from '@/components/subscriptions/SubscriptionForList' import { Subscriptions } from '@/store/modules/subscriptions' export default { + name: 'SubscriptionsForStage', components: { SubscriptionForList }, - name: 'subscriptions-for-stage', props: { stage: { type: String, diff --git a/frontend/src/components/tutor_list/TutorList.vue b/frontend/src/components/tutor_list/TutorList.vue index 0aa8ecf7..ec0c1b8f 100644 --- a/frontend/src/components/tutor_list/TutorList.vue +++ b/frontend/src/components/tutor_list/TutorList.vue @@ -1,10 +1,18 @@ <template> - <v-flex lg7 xl5> + <v-flex + lg7 + xl5 + > <v-card> <v-card-title class="title"> Tutors - <v-spacer/> - <v-btn icon @click="refresh"><v-icon>refresh</v-icon></v-btn> + <v-spacer /> + <v-btn + icon + @click="refresh" + > + <v-icon>refresh</v-icon> + </v-btn> </v-card-title> <v-data-table :headers="headers" @@ -13,28 +21,54 @@ item-key="pk" hide-actions > - <template slot="items" slot-scope="props"> - <td>{{props.item.username}}</td> - <td class="text-xs-right">{{props.item.feedbackCreated}}</td> - <td class="text-xs-right">{{props.item.feedbackValidated}}</td> + <template + slot="items" + slot-scope="props" + > + <td>{{ props.item.username }}</td> <td class="text-xs-right"> - {{props.item.reservedSubmissions}} - <v-tooltip top v-if="props.item.reservedSubmissions"> - <template slot="activator"> - <v-icon small @click="deleteAssignmentsOfTutor(props.item)">clear</v-icon> - </template> - <span>Free reserved submissions</span> + {{ props.item.feedbackCreated }} + </td> + <td class="text-xs-right"> + {{ props.item.feedbackValidated }} + </td> + <td class="text-xs-right"> + {{ props.item.reservedSubmissions }} + <v-tooltip + v-if="props.item.reservedSubmissions" + top + > + <template slot="activator"> + <v-icon + small + @click="deleteAssignmentsOfTutor(props.item)" + > + clear + </v-icon> + </template> + <span>Free reserved submissions</span> </v-tooltip> </td> <td class="text-xs-right"> <v-btn v-if="canRevokeAccess(props.item.username)" - icon @click="changeActiveStatus(props.item)" + icon + @click="changeActiveStatus(props.item)" > <v-tooltip top> <template slot="activator"> - <v-icon small v-if="!props.item.isActive">lock</v-icon> - <v-icon small v-else>lock_open</v-icon> + <v-icon + v-if="!props.item.isActive" + small + > + lock + </v-icon> + <v-icon + v-else + small + > + lock_open + </v-icon> </template> <span v-if="!props.item.isActive">Grant access</span> <span v-else>Revoke access</span> diff --git a/frontend/src/components/util/FileSelect.vue b/frontend/src/components/util/FileSelect.vue index 8e5334d9..aa69753a 100644 --- a/frontend/src/components/util/FileSelect.vue +++ b/frontend/src/components/util/FileSelect.vue @@ -1,8 +1,8 @@ <template> <label class="file-select"> <div class="select-button"> - <span v-if="value">Selected: {{value.name}}</span> - <span v-else>{{displayText}}</span> + <span v-if="value">Selected: {{ value.name }}</span> + <span v-else>{{ displayText }}</span> </div> <input id="file-input" type="file" @change="handleFileChange"/> </label> diff --git a/frontend/src/main.ts b/frontend/src/main.ts index f88bf9b1..20d22f22 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -14,7 +14,7 @@ import * as Integrations from '@sentry/integrations' import 'vuetify/dist/vuetify.min.css' import 'highlight.js/styles/atom-one-light.css' -import "@/util/shortkeys" +import '@/util/shortkeys' Vue.use(Vuetify) diff --git a/frontend/src/models.ts b/frontend/src/models.ts index c5a1b1f7..9ac0665a 100644 --- a/frontend/src/models.ts +++ b/frontend/src/models.ts @@ -619,8 +619,8 @@ export namespace SubmissionType { * @enum {string} */ export enum ProgrammingLanguageEnum { - C = <any> 'c', - Java = <any> 'java' + C = 'c' as any, + Java = 'java' as any } } diff --git a/frontend/src/pages/LayoutSelector.vue b/frontend/src/pages/LayoutSelector.vue index 9e4dfdab..a2e85b2b 100644 --- a/frontend/src/pages/LayoutSelector.vue +++ b/frontend/src/pages/LayoutSelector.vue @@ -1,8 +1,8 @@ <template> <div> - <component :is="layout"></component> + <component :is="layout" /> <v-content> - <router-view></router-view> + <router-view /> </v-content> </div> </template> @@ -15,11 +15,11 @@ import ReviewerLayout from '@/pages/reviewer/ReviewerLayout' import { Authentication } from '@/store/modules/authentication' export default { + name: 'LayoutSelector', components: { ReviewerLayout, StudentLayout, TutorLayout }, - name: 'layout-selector', computed: { isStudent () { return Authentication.isStudent }, isTutor () { return Authentication.isTutor }, @@ -32,6 +32,8 @@ export default { } else if (this.isReviewer) { return 'reviewer-layout' } + + return undefined } } } diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 24817ae8..1f497dcd 100644 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -1,38 +1,75 @@ <template> <v-container fill-height> - <v-layout align-center justify-center> - <v-dialog v-model="registerDialog" class="pa-4" max-width="30%"> - <register-dialog @registered="registered($event)"/> + <v-layout + align-center + justify-center + > + <v-dialog + v-model="registerDialog" + class="pa-4" + max-width="30%" + > + <register-dialog @registered="registered($event)" /> </v-dialog> - <v-flex text-xs-center xs8 sm6 md4 lg2> - <img v-if="production" :src="productionBrandUrl"/> - <img v-else src="../assets/brand.png"/> - <h3 class="pt-3">Log in</h3> + <v-flex + text-xs-center + xs8 + sm6 + md4 + lg2 + > + <img + v-if="production" + :src="productionBrandUrl" + > + <img + v-else + src="../assets/brand.png" + > + <h3 class="pt-3"> + Log in + </h3> <v-alert - outline v-if="msg" + outline color="error" :value="true" transition="fade-transition" - >{{ msg }}</v-alert> - <p v-else>But I corrected them, sir.</p> + > + {{ msg }} + </v-alert> + <p v-else> + But I corrected them, sir. + </p> <v-form - @submit.prevent="submit"> + @submit.prevent="submit" + > <v-text-field - label="Username" v-model="credentials.username" + label="Username" required autofocus /> <v-text-field - label="Password" v-model="credentials.password" + label="Password" type="password" required /> <v-layout class="btn-container"> - <v-btn @click="registerDialog = true" id="register">Register</v-btn> - <v-btn :loading="loading" type="submit" color="primary">Access</v-btn> + <v-btn + id="register" + @click="registerDialog = true" + > + Register + </v-btn> + <v-btn + :loading="loading" + type="submit" + color="primary" + > + Access + </v-btn> </v-layout> </v-form> </v-flex> @@ -46,8 +83,8 @@ import RegisterDialog from '@/components/RegisterDialog' import { Authentication as Auth } from '@/store/modules/authentication' export default { + name: 'GradyLogin', components: { RegisterDialog }, - name: 'grady-login', data () { return { credentials: { @@ -80,8 +117,8 @@ export default { this.$router.push({ name: 'home' }) this.loading = false }).catch((err) => { - let msg = "Login failed. Please try again." - if (typeof err === "string") { + let msg = 'Login failed. Please try again.' + if (typeof err === 'string') { msg = err } diff --git a/frontend/src/pages/PageNotFound.vue b/frontend/src/pages/PageNotFound.vue index d84f88ac..64a3ecb0 100644 --- a/frontend/src/pages/PageNotFound.vue +++ b/frontend/src/pages/PageNotFound.vue @@ -1,14 +1,29 @@ <template> <v-container fill-height> - <v-layout align-center justify-center> - <v-card dark width="80%" height="80%"> + <v-layout + align-center + justify-center + > + <v-card + dark + width="80%" + height="80%" + > <v-card-title style="font-size: 350%"> The content you're requesting is not available in your country. </v-card-title> - <v-divider class="px-5"/> - <v-flex xs10 offset-xs2> + <v-divider class="px-5" /> + <v-flex + xs10 + offset-xs2 + > <v-card-text class="no-content-text"> - <v-icon size="200px" color="deep-orange accent-4">play_circle_outline</v-icon> + <v-icon + size="200px" + color="deep-orange accent-4" + > + play_circle_outline + </v-icon> <span style="font-size: xx-large">We're sorry about that ¯\_(ツ)_/¯</span> </v-card-text> </v-flex> @@ -19,7 +34,7 @@ <script> export default { - name: 'page-not-found' + name: 'PageNotFound' } </script> diff --git a/frontend/src/pages/StartPageSelector.vue b/frontend/src/pages/StartPageSelector.vue index 397111a8..77f4ed7b 100644 --- a/frontend/src/pages/StartPageSelector.vue +++ b/frontend/src/pages/StartPageSelector.vue @@ -9,7 +9,7 @@ import StudentPage from '@/pages/student/StudentPage' import ReviewerStartPage from '@/pages/reviewer/ReviewerStartPage' import { Authentication } from '@/store/modules/authentication' export default { - name: 'start-page-selector', + name: 'StartPageSelector', components: { ReviewerStartPage, StudentPage, @@ -27,6 +27,8 @@ export default { } else if (this.isReviewer) { return 'reviewer-start-page' } + + return undefined } } } diff --git a/frontend/src/pages/Statistics.vue b/frontend/src/pages/Statistics.vue index 92a69ce1..51b8f9fa 100644 --- a/frontend/src/pages/Statistics.vue +++ b/frontend/src/pages/Statistics.vue @@ -1,11 +1,17 @@ <template> <div> - <v-layout row class="ma-2"> + <v-layout + row + class="ma-2" + > <v-flex xs5> - <label-statistics/> + <label-statistics /> </v-flex> - <v-flex offset-xs1 xs5> - <correction-statistics/> + <v-flex + offset-xs1 + xs5 + > + <correction-statistics /> </v-flex> </v-layout> </div> diff --git a/frontend/src/pages/StudentSubmissionSideView.vue b/frontend/src/pages/StudentSubmissionSideView.vue index 6f1ee7b8..ef863ba4 100644 --- a/frontend/src/pages/StudentSubmissionSideView.vue +++ b/frontend/src/pages/StudentSubmissionSideView.vue @@ -1,22 +1,22 @@ <template> <div> - <route-change-confirmation :next-route="nextRoute"/> + <route-change-confirmation :next-route="nextRoute" /> <submission-correction :submission-without-assignment="submission" :feedback="submission.feedback" + :ignore-hidden-state="true" @feedbackCreated="refresh" @feedbackChanged="refresh" - :ignoreHiddenState="true" /> <submission-tests :tests="submission.tests" class="mt-4" /> <submission-type - v-bind="submissionType" :key="submissionType.pk" + v-bind="submissionType" :reverse="true" - :expandedByDefault="{ Description: true, Solution: true }" + :expanded-by-default="{ Description: true, Solution: true }" class="mt-1" /> </div> @@ -57,12 +57,12 @@ function onRouteEnterOrUpdate (to, from, next) { } export default { + name: 'StudentSubmissionSideView', components: { RouteChangeConfirmation, SubmissionType, SubmissionTests, SubmissionCorrection }, - name: 'student-submission-side-view', data () { return { nextRoute: null diff --git a/frontend/src/pages/SubscriptionWorkPage.vue b/frontend/src/pages/SubscriptionWorkPage.vue index fbfcc61b..2ba14b0b 100644 --- a/frontend/src/pages/SubscriptionWorkPage.vue +++ b/frontend/src/pages/SubscriptionWorkPage.vue @@ -1,14 +1,18 @@ <template> <v-layout - row wrap + row + wrap > - <route-change-confirmation :next-route="nextRoute"/> - <v-flex xs12 md6> + <route-change-confirmation :next-route="nextRoute" /> + <v-flex + xs12 + md6 + > <submission-correction - :assignment="currentAssignment" :key="subscription.pk" - @feedbackCreated="startWorkOnNextAssignment" + :assignment="currentAssignment" class="ma-4 autofocus" + @feedbackCreated="startWorkOnNextAssignment" /> <submission-tests :tests="submission.tests" @@ -20,10 +24,10 @@ <v-flex md6> <div class="sub-correction"> <submission-type - v-bind="submissionType" :key="submissionType.pk" + v-bind="submissionType" :reverse="true" - :expandedByDefault="{ Description: true, Solution: true }" + :expanded-by-default="{ Description: true, Solution: true }" class="mt-4 mr-4" /> </div> @@ -77,8 +81,8 @@ export default class SubscriptionWorkPage extends Vue { } get submissionType () { - if (this.submission && (<SubmissionAssignment> this.submission).type) { - return getters.state.submissionTypes[(<SubmissionAssignment>this.submission).type] + if (this.submission && (this.submission as SubmissionAssignment).type) { + return getters.state.submissionTypes[(this.submission as SubmissionAssignment).type] } } diff --git a/frontend/src/pages/base/FeedbackHistoryPage.vue b/frontend/src/pages/base/FeedbackHistoryPage.vue index 5147ed1e..4a5fa6f0 100644 --- a/frontend/src/pages/base/FeedbackHistoryPage.vue +++ b/frontend/src/pages/base/FeedbackHistoryPage.vue @@ -1,11 +1,17 @@ <template> <v-layout row> <v-flex xs6> - <router-view name="left"></router-view> + <router-view name="left" /> </v-flex> - <v-flex xs6 class="ml-3"> + <v-flex + xs6 + class="ml-3" + > <div class="right-view"> - <router-view name="right" @refresh="refresh"></router-view> + <router-view + name="right" + @refresh="refresh" + /> </div> </v-flex> </v-layout> diff --git a/frontend/src/pages/base/TutorReviewerBaseLayout.vue b/frontend/src/pages/base/TutorReviewerBaseLayout.vue index beed5790..4a798aa4 100644 --- a/frontend/src/pages/base/TutorReviewerBaseLayout.vue +++ b/frontend/src/pages/base/TutorReviewerBaseLayout.vue @@ -1,13 +1,16 @@ <template> <base-layout> - <template slot="header"> Grady </template> <template slot="sidebar-content"> <v-list dense> - <v-list-tile v-for="(item, i) in generalNavItems" :key="i" :to="item.route"> + <v-list-tile + v-for="(item, i) in generalNavItems" + :key="i" + :to="item.route" + > <v-list-tile-action> <v-icon>{{ item.icon }}</v-icon> </v-list-tile-action> @@ -18,13 +21,15 @@ </v-list-tile-content> </v-list-tile> </v-list> - <v-divider></v-divider> - <slot name="above-subscriptions"></slot> - <subscription-list :sidebar="true"/> - <feedback-labels-list/> - <slot name="below-subscriptions"></slot> + <v-divider /> + <slot name="above-subscriptions" /> + <subscription-list :sidebar="true" /> + <feedback-labels-list /> + <slot name="below-subscriptions" /> + </template> + <template slot="toolbar-right"> + <slot name="toolbar-right" /> </template> - <template slot="toolbar-right"><slot name="toolbar-right"></slot></template> </base-layout> </template> @@ -34,11 +39,11 @@ import SubscriptionList from '@/components/subscriptions/SubscriptionList' import FeedbackLabelsList from '@/components/feedback_labels/FeedbackLabelsList.vue' export default { + name: 'TutorReviewerBaseLayout', components: { SubscriptionList, FeedbackLabelsList, BaseLayout }, - name: 'tutor-reviewer-base-layout', data () { return { generalNavItems: [ diff --git a/frontend/src/pages/reviewer/ReviewerLayout.vue b/frontend/src/pages/reviewer/ReviewerLayout.vue index 57989a39..e16033eb 100644 --- a/frontend/src/pages/reviewer/ReviewerLayout.vue +++ b/frontend/src/pages/reviewer/ReviewerLayout.vue @@ -1,7 +1,14 @@ <template> <tutor-reviewer-base-layout> - <v-list dense slot="above-subscriptions"> - <v-list-tile v-for="(item, i) in subGeneralNavItems" :key="i" :to="item.route"> + <v-list + slot="above-subscriptions" + dense + > + <v-list-tile + v-for="(item, i) in subGeneralNavItems" + :key="i" + :to="item.route" + > <v-list-tile-action> <v-icon>{{ item.icon }}</v-icon> </v-list-tile-action> @@ -13,7 +20,7 @@ </v-list-tile> </v-list> <template slot="toolbar-right"> - <export-dialog/> + <export-dialog /> </template> </tutor-reviewer-base-layout> </template> @@ -23,10 +30,10 @@ import TutorReviewerBaseLayout from '@/pages/base/TutorReviewerBaseLayout' import ExportDialog from '@/components/export/ExportDialog' export default { + name: 'ReviewerLayout', components: { ExportDialog, TutorReviewerBaseLayout }, - name: 'reviewer-layout', data () { return { subGeneralNavItems: [ diff --git a/frontend/src/pages/reviewer/ReviewerStartPage.vue b/frontend/src/pages/reviewer/ReviewerStartPage.vue index ca74f4e8..a850703d 100644 --- a/frontend/src/pages/reviewer/ReviewerStartPage.vue +++ b/frontend/src/pages/reviewer/ReviewerStartPage.vue @@ -4,11 +4,15 @@ <v-flex lg5 md9 xs12> <correction-statistics class="ma-4"></correction-statistics> </v-flex> - <v-flex lg5 md9 xs12> - <subscription-list class="ma-4"></subscription-list> + <v-flex + lg5 + md9 + xs12 + > + <subscription-list class="ma-4" /> </v-flex> </v-layout> - <SubmissionTypesOverview class="ma-4"/> + <SubmissionTypesOverview class="ma-4" /> </div> <v-layout v-else justify-center class="mt-4 pt-4"> <import-dialog @@ -40,10 +44,12 @@ import { getters } from '../../store/getters' import { Subscriptions } from '../../store/modules/subscriptions' export default { + name: 'ReviewerStartPage', components: { ImportDialog, SubmissionTypesOverview, SubscriptionList, +<<<<<<< HEAD CorrectionStatistics }, name: 'reviewer-start-page', data: () => { @@ -63,6 +69,9 @@ export default { Subscriptions.RESET_STATE() } } +======= + CorrectionStatistics } +>>>>>>> 8db1f18... setup eslint to also lint vue templates } </script> diff --git a/frontend/src/pages/reviewer/StudentOverviewPage.vue b/frontend/src/pages/reviewer/StudentOverviewPage.vue index 68c3d29c..53a246bd 100644 --- a/frontend/src/pages/reviewer/StudentOverviewPage.vue +++ b/frontend/src/pages/reviewer/StudentOverviewPage.vue @@ -1,33 +1,51 @@ <template> - <v-layout v-if="this.$vuetify.breakpoint.xl" wrap> - <v-flex xs6> - <student-list class="ma-1"></student-list> - </v-flex> - <v-flex xs6 class="right-view"> - <router-view></router-view> - </v-flex> - </v-layout> - <v-layout v-else> - <v-flex xs12> - <student-list class="ma-1" - v-on:detail-click="openDialog" - ></student-list> - </v-flex> - <v-dialog v-model="dialog" fullscreen hide-overlay> - <v-card> - <v-toolbar dark color="#1a237e"> - <v-btn icon dark @click="dialog = false"> - <v-icon>close</v-icon> - </v-btn> - <v-toolbar-title>Submission details</v-toolbar-title> - <v-spacer></v-spacer> - </v-toolbar> - <v-card-text> - <router-view @refresh="dialog = false"></router-view> - </v-card-text> - </v-card> - </v-dialog> - </v-layout> + <v-layout + v-if="this.$vuetify.breakpoint.xl" + wrap + > + <v-flex xs6> + <student-list class="ma-1" /> + </v-flex> + <v-flex + xs6 + class="right-view" + > + <router-view /> + </v-flex> + </v-layout> + <v-layout v-else> + <v-flex xs12> + <student-list + class="ma-1" + @detail-click="openDialog" + /> + </v-flex> + <v-dialog + v-model="dialog" + fullscreen + hide-overlay + > + <v-card> + <v-toolbar + dark + color="#1a237e" + > + <v-btn + icon + dark + @click="dialog = false" + > + <v-icon>close</v-icon> + </v-btn> + <v-toolbar-title>Submission details</v-toolbar-title> + <v-spacer /> + </v-toolbar> + <v-card-text> + <router-view @refresh="dialog = false" /> + </v-card-text> + </v-card> + </v-dialog> + </v-layout> </template> <script> @@ -35,8 +53,8 @@ import StudentList from '@/components/student_list/StudentList' import StudentListHelpCard from '@/components/student_list/StudentListHelpCard' export default { - components: { StudentList, StudentListHelpCard }, - name: 'student-overview-page', + name: 'StudentOverviewPage', + components: { StudentList }, data: () => { return { dialog: false diff --git a/frontend/src/pages/reviewer/TutorOverviewPage.vue b/frontend/src/pages/reviewer/TutorOverviewPage.vue index 7b6039cb..b0b98e30 100644 --- a/frontend/src/pages/reviewer/TutorOverviewPage.vue +++ b/frontend/src/pages/reviewer/TutorOverviewPage.vue @@ -1,5 +1,5 @@ <template> - <tutor-list class="ma-2 elevation-1"></tutor-list> + <tutor-list class="ma-2 elevation-1" /> </template> <script> @@ -9,8 +9,8 @@ import { actions } from '@/store/actions' import { TutorOverview } from '@/store/modules/tutor-overview' export default { + name: 'TutorOverviewPage', components: { TutorList }, - name: 'tutor-overview-page', beforeRouteEnter (to, from, next) { TutorOverview.getTutors() TutorOverview.getActiveAssignments() diff --git a/frontend/src/pages/student/StudentLayout.vue b/frontend/src/pages/student/StudentLayout.vue index 377bc64d..5f2988c3 100644 --- a/frontend/src/pages/student/StudentLayout.vue +++ b/frontend/src/pages/student/StudentLayout.vue @@ -1,13 +1,19 @@ <template> <base-layout> - - <template slot="header"> + <template slot="header"> {{ moduleReference }} </template> - <v-list dense slot="sidebar-content"> - - <v-list-tile exact v-for="(item, i) in generalNavItems" :key="i" :to="item.route"> + <v-list + slot="sidebar-content" + dense + > + <v-list-tile + v-for="(item, i) in generalNavItems" + :key="i" + exact + :to="item.route" + > <v-list-tile-action> <v-icon>{{ item.icon }}</v-icon> </v-list-tile-action> @@ -18,17 +24,26 @@ </v-list-tile-content> </v-list-tile> - <v-divider></v-divider> + <v-divider /> <exam-information - :exam="exam" v-if="!mini" + :exam="exam" class="elevation-1 exam-info ma-1" /> - <v-list-tile exact v-for="item in submissionNavItems" :key="item.route" :to="item.route"> + <v-list-tile + v-for="item in submissionNavItems" + :key="item.route" + exact + :to="item.route" + > <v-list-tile-action> - <v-icon v-if="!visited[item.id]">assignment</v-icon> - <v-icon v-else>check</v-icon> + <v-icon v-if="!visited[item.id]"> + assignment + </v-icon> + <v-icon v-else> + check + </v-icon> </v-list-tile-action> <v-list-tile-content> <v-list-tile-title> @@ -46,8 +61,8 @@ import BaseLayout from '@/components/BaseLayout' import ExamInformation from '@/components/student/ExamInformation' import { StudentPage } from '@/store/modules/student-page' export default { + name: 'StudentLayout', components: { BaseLayout, ExamInformation }, - name: 'student-layout', data () { return { generalNavItems: [ diff --git a/frontend/src/pages/student/StudentPage.vue b/frontend/src/pages/student/StudentPage.vue index 029a21ce..81dd41a0 100644 --- a/frontend/src/pages/student/StudentPage.vue +++ b/frontend/src/pages/student/StudentPage.vue @@ -1,14 +1,21 @@ <template> - <v-container fluid> - <v-layout justify center> - <template v-if="loaded"> - <v-flex md10 mt-5 offset-xs1> - <h2>Your submissions:</h2> - <submission-list :submissions="submissions"/> - </v-flex> - </template> - </v-layout> - </v-container> + <v-container fluid> + <v-layout + justify + center + > + <template v-if="loaded"> + <v-flex + md10 + mt-5 + offset-xs1 + > + <h2>Your submissions:</h2> + <submission-list :submissions="submissions" /> + </v-flex> + </template> + </v-layout> + </v-container> </template> <script> @@ -17,10 +24,14 @@ import { StudentPage } from '@/store/modules/student-page' import { FeedbackLabels } from '@/store/modules/feedback-labels' export default { + name: 'StudentPage', components: { SubmissionList }, - name: 'student-page', + computed: { + submissions () { return StudentPage.state.submissionsForList }, + loaded () { return StudentPage.state.loaded } + }, created: function () { if (!this.loaded) { StudentPage.getStudentData().then(() => { @@ -28,10 +39,6 @@ export default { StudentPage.getStudentSubmissions() }) } - }, - computed: { - submissions () { return StudentPage.state.submissionsForList }, - loaded () { return StudentPage.state.loaded } } } </script> diff --git a/frontend/src/pages/student/StudentSubmissionPage.vue b/frontend/src/pages/student/StudentSubmissionPage.vue index a0e6306b..bfca6ff0 100644 --- a/frontend/src/pages/student/StudentSubmissionPage.vue +++ b/frontend/src/pages/student/StudentSubmissionPage.vue @@ -1,36 +1,55 @@ <template> <v-container flex> - <v-layout row wrap> - <v-flex xs6 offset-xs3> - <v-alert :value="!feedback" type="info"> + <v-layout + row + wrap + > + <v-flex + xs6 + offset-xs3 + > + <v-alert + :value="!feedback" + type="info" + > This submission hasn't been corrected due to this being a pass only exam. </v-alert> </v-flex> - <v-flex lg6 md12 mt-5> + <v-flex + lg6 + md12 + mt-5 + > <base-annotated-submission> <v-toolbar - dense slot="header" + dense class="mb-1 elevation-1" > - <toggle-feedback-visibility-button/> + <toggle-feedback-visibility-button /> - <v-spacer/> + <v-spacer /> - <h2>Score: {{feedback ? feedback.score : 'N/A'}} / {{submissionType.fullScore}}</h2> + <h2>Score: {{ feedback ? feedback.score : 'N/A' }} / {{ submissionType.fullScore }}</h2> </v-toolbar> <template slot="table-content"> - <tr v-for="(code, lineNo) in submissionText" :key="lineNo"> - <submission-line :code="code" :lineNo="lineNo"> + <tr + v-for="(code, lineNo) in submissionText" + :key="lineNo" + > + <submission-line + :code="code" + :line-no="lineNo" + > <template v-if="feedback"> <template v-for="(comment, index) in feedback.feedbackLines[lineNo]"> <feedback-comment v-if="showFeedback" + :key="comment.pk + index" v-bind="comment" :line-no="lineNo" - :key="comment.pk + index" - :showVisibilityIcon="false" - :correctorView="false" + :show-visibility-icon="false" + :corrector-view="false" /> </template> </template> @@ -41,16 +60,22 @@ <v-card> <v-card-title>Labels:</v-card-title> <v-card-text> - <v-layout row wrap align-center v-for="label in mappedLabels" :key="'global' + label.pk"> - <v-flex sm6> - <feedback-label - v-bind="label" - /> - </v-flex> - <v-flex sm6> - <span><b>Description: </b>{{label.description}}</span> - </v-flex> - </v-layout> + <v-layout + v-for="label in mappedLabels" + :key="'global' + label.pk" + row + wrap + align-center + > + <v-flex sm6> + <feedback-label + v-bind="label" + /> + </v-flex> + <v-flex sm6> + <span><b>Description: </b>{{ label.description }}</span> + </v-flex> + </v-layout> </v-card-text> </v-card> <submission-tests @@ -59,10 +84,15 @@ class="mt-3" /> </v-flex> - <v-flex lg6 md12 mt-5 pl-3> + <v-flex + lg6 + md12 + mt-5 + pl-3 + > <submission-type - v-bind="submissionType"> - </submission-type> + v-bind="submissionType" + /> </v-flex> </v-layout> </v-container> @@ -81,19 +111,17 @@ import ToggleFeedbackVisibilityButton from '@/components/submission_notes/toolba import SubmissionTests from '@/components/SubmissionTests' import NonFinalFeedbackAlert from '@/components/student/NonFinalFeedbackAlert' import { FeedbackLabels } from '../../store/modules/feedback-labels' -import FeedbackLabel from "@/components/feedback_labels/FeedbackLabel.vue" +import FeedbackLabel from '@/components/feedback_labels/FeedbackLabel.vue' export default { - name: 'student-submission-page', + name: 'StudentSubmissionPage', components: { ToggleFeedbackVisibilityButton, - NonFinalFeedbackAlert, SubmissionTests, FeedbackComment, SubmissionLine, BaseAnnotatedSubmission, - AnnotatedSubmission, FeedbackLabel, SubmissionType }, computed: { @@ -113,15 +141,15 @@ export default { }) } }, + mounted () { + this.onRouteMountOrUpdate(this.id) + }, methods: { onRouteMountOrUpdate (routeId) { StudentPage.SET_VISITED({ index: routeId, visited: true }) SubmissionNotes.SET_SUBMISSION(StudentPage.state.submissionData[routeId]) } }, - mounted () { - this.onRouteMountOrUpdate(this.id) - }, beforeRouteUpdate (to, from, next) { this.onRouteMountOrUpdate(to.params.id) next() diff --git a/frontend/src/pages/tutor/TutorLayout.vue b/frontend/src/pages/tutor/TutorLayout.vue index ec4f01b7..4e6f16b4 100644 --- a/frontend/src/pages/tutor/TutorLayout.vue +++ b/frontend/src/pages/tutor/TutorLayout.vue @@ -1,14 +1,14 @@ <template> - <tutor-reviewer-base-layout></tutor-reviewer-base-layout> + <tutor-reviewer-base-layout /> </template> <script> import TutorReviewerBaseLayout from '@/pages/base/TutorReviewerBaseLayout' export default { + name: 'TutorLayout', components: { TutorReviewerBaseLayout - }, - name: 'tutor-layout' + } } </script> diff --git a/frontend/src/pages/tutor/TutorStartPage.vue b/frontend/src/pages/tutor/TutorStartPage.vue index ad127cf2..87387bb2 100644 --- a/frontend/src/pages/tutor/TutorStartPage.vue +++ b/frontend/src/pages/tutor/TutorStartPage.vue @@ -1,14 +1,25 @@ <template> <div> - <v-layout row wrap> - <v-flex lg5 md9 xs12> - <correction-statistics class="ma-4"></correction-statistics> + <v-layout + row + wrap + > + <v-flex + lg5 + md9 + xs12 + > + <correction-statistics class="ma-4" /> </v-flex> - <v-flex lg5 md9 xs12> - <subscription-list class="ma-4"></subscription-list> + <v-flex + lg5 + md9 + xs12 + > + <subscription-list class="ma-4" /> </v-flex> </v-layout> - <SubmissionTypesOverview class="ma-4"/> + <SubmissionTypesOverview class="ma-4" /> </div> </template> @@ -18,11 +29,11 @@ import CorrectionStatistics from '@/components/CorrectionStatistics' import SubmissionTypesOverview from '@/components/submission_type/SubmissionTypesOverview' export default { + name: 'TutorStartPage', components: { SubmissionTypesOverview, CorrectionStatistics, - SubscriptionList }, - name: 'tutor-start-page' + SubscriptionList } } </script> diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index a7e8d4fb..2d57d382 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -26,7 +26,7 @@ function denyAccess (next: rerouteFunc, redirect: Route) { next(redirect.path) VueInstance.$notify({ title: 'Access denied', - text: "You don't have permission to view this.", + text: 'You don\'t have permission to view this.', type: 'error' }) } diff --git a/frontend/src/store/modules/feedback-labels.ts b/frontend/src/store/modules/feedback-labels.ts index 89ab1e04..ebf22ed8 100644 --- a/frontend/src/store/modules/feedback-labels.ts +++ b/frontend/src/store/modules/feedback-labels.ts @@ -1,8 +1,8 @@ -import { FeedbackLabel } from '@/models'; -import { getStoreBuilder } from 'vuex-typex'; -import { RootState } from '../store'; +import { FeedbackLabel } from '@/models' +import { getStoreBuilder } from 'vuex-typex' +import { RootState } from '../store' import * as api from '@/api' -import Vue from 'vue'; +import Vue from 'vue' export interface FeedbackLabelsState { labels: FeedbackLabel[] diff --git a/frontend/src/store/modules/feedback_list/feedback-search-options.ts b/frontend/src/store/modules/feedback_list/feedback-search-options.ts index 25bb773f..67130195 100644 --- a/frontend/src/store/modules/feedback_list/feedback-search-options.ts +++ b/frontend/src/store/modules/feedback_list/feedback-search-options.ts @@ -2,7 +2,7 @@ import { Module } from 'vuex' import { RootState } from '@/store/store' import { getStoreBuilder } from 'vuex-typex' import { Subscription } from '@/models' -import { FeedbackLabels } from '../feedback-labels'; +import { FeedbackLabels } from '../feedback-labels' export const namespace = 'feedbackSearchOptions' diff --git a/frontend/src/store/modules/feedback_list/feedback-table.ts b/frontend/src/store/modules/feedback_list/feedback-table.ts index ab18dbcf..ef5f9da7 100644 --- a/frontend/src/store/modules/feedback_list/feedback-table.ts +++ b/frontend/src/store/modules/feedback_list/feedback-table.ts @@ -38,7 +38,7 @@ function ADD_ASSIGNMENTS_INFO (state: FeedbackTableState, assignments: Array<Ass if (!assignment.submission || !assignment.stage) { throw Error() } - const feedback = state.feedbackHist[<string> assignment.submission] + const feedback = state.feedbackHist[assignment.submission as string] feedback.history = { ...feedback.history, [assignment.stage]: { diff --git a/frontend/src/store/modules/submission-notes.ts b/frontend/src/store/modules/submission-notes.ts index b480d5a8..4036480b 100644 --- a/frontend/src/store/modules/submission-notes.ts +++ b/frontend/src/store/modules/submission-notes.ts @@ -6,7 +6,7 @@ import { RootState } from '@/store/store' import { getStoreBuilder, BareActionContext } from 'vuex-typex' import { syntaxPostProcess } from '@/util/helpers' import { AxiosResponse } from 'axios' -import { Subscriptions } from './subscriptions'; +import { Subscriptions } from './subscriptions' export interface SubmissionNotesState { submission: SubmissionNoType @@ -75,7 +75,7 @@ const submissionGetter = mb.read(function submission(state, getters) { acc[index + 1] = cur return acc }, {}) - return splitted; + return splitted }) const scoreGetter = mb.read(function score(state) { return state.updatedFeedback.score !== undefined ? state.updatedFeedback.score : state.origFeedback.score @@ -132,12 +132,12 @@ function UPDATE_FEEDBACK_SCORE(state: SubmissionNotesState, score: number) { function DELETE_FEEDBACK_LINE(state: SubmissionNotesState, lineNo: number) { if (state.updatedFeedback.feedbackLines) { // Vue dosn't like objects that are indexed with numbers... - Vue.delete(state.updatedFeedback.feedbackLines, <string><any>lineNo) + Vue.delete(state.updatedFeedback.feedbackLines, lineNo as unknown as string) } } function TOGGLE_EDITOR_ON_LINE(state: SubmissionNotesState, { lineNo, comment }: { lineNo: number, comment: FeedbackComment }) { - Vue.set(state.ui.selectedCommentOnLine, <string><any>lineNo, comment) - Vue.set(state.ui.showEditorOnLine, <string><any>lineNo, !state.ui.showEditorOnLine[lineNo]) + Vue.set(state.ui.selectedCommentOnLine, lineNo as unknown as string, comment) + Vue.set(state.ui.showEditorOnLine, lineNo as unknown as string, !state.ui.showEditorOnLine[lineNo]) } function MARK_COMMENT_FOR_DELETION(state: SubmissionNotesState, comment: FeedbackComment) { Vue.set(state.commentsMarkedForDeletion, comment.pk, comment) @@ -207,9 +207,9 @@ Promise<AxiosResponse<void>[]> { await api.submitFeedbackForAssignment({ feedback , assignment}) } else if (state.hasOrigFeedback) { feedback.pk = state.origFeedback.pk - await api.submitUpdatedFeedback(<{ feedback: CreateUpdateFeedback }>{ feedback }) + await api.submitUpdatedFeedback({ feedback } as { feedback: CreateUpdateFeedback }) } else { - await api.submitFeedback(<{ feedback: CreateUpdateFeedback }>{feedback}) + await api.submitFeedback({feedback} as { feedback: CreateUpdateFeedback }) } // delete those comments that have been marked for deletion return SubmissionNotes.deleteComments() diff --git a/frontend/src/store/modules/subscriptions.ts b/frontend/src/store/modules/subscriptions.ts index 99b949c8..88a2cf71 100644 --- a/frontend/src/store/modules/subscriptions.ts +++ b/frontend/src/store/modules/subscriptions.ts @@ -79,6 +79,9 @@ const resolveSubscriptionKeyToNameGetter = mb.read(function resolveSubscriptionK case Subscription.QueryTypeEnum.Student: return subscription.queryKey ? rootState.students[subscription.queryKey].name : 'Student' + + default: + return undefined } } }) @@ -172,7 +175,7 @@ async function getSubscriptions () { async function changeToSubscription({state}: BareActionContext<SubscriptionsState, RootState>, subscriptionPk: string) { const currAssignment = state.currentAssignment - if (currAssignment && currAssignment.subscription == subscriptionPk) { + if (currAssignment && currAssignment.subscription === subscriptionPk) { return } @@ -187,7 +190,7 @@ async function changeToSubscription({state}: BareActionContext<SubscriptionsStat async function createNextAssignment() { const activeSubscription = Subscriptions.activeSubscription if (!activeSubscription) { - throw new Error("There must be an active Subscription before calling createNextAssignment") + throw new Error('There must be an active Subscription before calling createNextAssignment') } const newAssignment = await api.createAssignment({subscription: activeSubscription}) Subscriptions.SET_CURRENT_ASSIGNMENT(newAssignment) @@ -210,7 +213,7 @@ async function cleanAssignmentsFromSubscriptions async function skipAssignment ({ state }: BareActionContext<SubscriptionsState, RootState>) { if (!state.currentAssignment || !state.currentAssignment.subscription) { - throw new Error("skipAssignment can only be called with active assignment") + throw new Error('skipAssignment can only be called with active assignment') } const newAssignment = await api.createAssignment({subscriptionPk: state.currentAssignment.subscription}) @@ -221,7 +224,7 @@ async function skipAssignment ({ state }: BareActionContext<SubscriptionsState, async function deleteCurrentAssignment ({ state }: BareActionContext<SubscriptionsState, RootState>) { if (!state.currentAssignment) { - throw new Error("No active assignment to delete") + throw new Error('No active assignment to delete') } await api.deleteAssignment({assignment: state.currentAssignment}) Subscriptions.SET_CURRENT_ASSIGNMENT(undefined) @@ -253,6 +256,9 @@ async function subscribeToType Subscriptions.subscribeTo({ stage, type, key }) }) break + + default: + return } } diff --git a/frontend/src/store/store.ts b/frontend/src/store/store.ts index 2e04131f..7b014268 100644 --- a/frontend/src/store/store.ts +++ b/frontend/src/store/store.ts @@ -40,7 +40,7 @@ import { SubmissionNoType, SubmissionType, Tutor, FeedbackLabel } from '@/models' -import { FeedbackLabelsState } from './modules/feedback-labels'; +import { FeedbackLabelsState } from './modules/feedback-labels' Vue.use(Vuex) @@ -93,7 +93,7 @@ const store = getStoreBuilder<RootState>().vuexStore({ strict: process.env.NODE_ENV === 'development', plugins: [lastInteraction], // TODO is there a better way than casting the initialState ? - state: <RootState> initialState() + state: initialState() as RootState }) export default store diff --git a/frontend/src/util/helpers.ts b/frontend/src/util/helpers.ts index 6aff2308..6e939f9c 100644 --- a/frontend/src/util/helpers.ts +++ b/frontend/src/util/helpers.ts @@ -115,12 +115,12 @@ interface OnceFunc { export function once (fn: Function, context?: object): OnceFunc { let result: any - let wrapped = <OnceFunc> function (this: any) { + let wrapped = function (this: any) { if (!result) { result = fn.apply(context || this, arguments) } return result - } + } as OnceFunc wrapped.reset = function () { result = undefined } return wrapped } @@ -135,14 +135,14 @@ export function syntaxPostProcess (code: string): string { splitted[i] = spanPrefix + splitted[i] + spanSuffix } - return splitted.join("\n") + return splitted.join('\n') }) return code } export function parseBlacklist (blacklist: Array<string>): string { return blacklist.reduce((acc, curr) => { - return acc + "|" + curr + return acc + '|' + curr }) } @@ -150,22 +150,22 @@ export function parseErrorNotification (response: AxiosResponse): string { if (!response.data || Object.keys(response.data).length === 0) { return 'There is no useful error data. Please ask the staff for help.' } else { - let msg = "<ul>"; + let msg = '<ul>' function pickRecursive(obj: any) { if (obj instanceof Object) { for (let k of Object.keys(obj)) { pickRecursive(obj[k]) } } else { - msg += "<li>" + obj + "</li>" + msg += '<li>' + obj + '</li>' } } pickRecursive(response.data) - msg += "</ul>" + msg += '</ul>' if (response.status === 404) { - msg += "<br/>If you experience unusual behaviour, finish all unfinished work and relog." + - " If not, this is probably not a critical error." + msg += '<br/>If you experience unusual behaviour, finish all unfinished work and relog.' + + ' If not, this is probably not a critical error.' } return msg diff --git a/frontend/src/util/interceptor.ts b/frontend/src/util/interceptor.ts index d82e0885..e6b60bb0 100644 --- a/frontend/src/util/interceptor.ts +++ b/frontend/src/util/interceptor.ts @@ -4,9 +4,9 @@ import * as Sentry from '@sentry/browser' const errorUrlBlacklist = [ - "/api/get-token/", + '/api/get-token/', ] -const blackListRegExp = new RegExp(parseBlacklist(errorUrlBlacklist), "g") +const blackListRegExp = new RegExp(parseBlacklist(errorUrlBlacklist), 'g') export function errorInterceptor (error: any): any { if (!error.response.request.responseURL.match(blackListRegExp)) { diff --git a/frontend/src/util/shortkeys.ts b/frontend/src/util/shortkeys.ts index 6820edf8..996c04d2 100644 --- a/frontend/src/util/shortkeys.ts +++ b/frontend/src/util/shortkeys.ts @@ -1,4 +1,4 @@ -import Vue from "vue"; +import Vue from 'vue' const shortkeyTypes = { numeric: (key: string) => { return Number(key) >= 0 && Number(key) <= 9 } @@ -7,7 +7,7 @@ const shortkeyTypes = { const handlerFunc = (el: any, bind: any) => { return (event: KeyboardEvent) => { // handle numeric key press - if (bind.value === "numeric" && shortkeyTypes.numeric(event.key)) { + if (bind.value === 'numeric' && shortkeyTypes.numeric(event.key)) { const e = new KeyboardEvent('shortkey', { bubbles: false, key: event.key }) el.dispatchEvent(e) } @@ -18,9 +18,9 @@ const handlerFunc = (el: any, bind: any) => { // usage: <tag v-shortkey="<shortkeyType>" @shortkey="<handlerFunc>"></tag> Vue.directive('shortkey', { bind: (el, bind) => { - window.addEventListener("keypress", handlerFunc(el, bind)) + window.addEventListener('keypress', handlerFunc(el, bind)) }, unbind: (el, bind) => { - window.removeEventListener("keypress", handlerFunc(el, bind)) + window.removeEventListener('keypress', handlerFunc(el, bind)) } }) \ No newline at end of file diff --git a/frontend/tests/unit/components/DataExport.spec.ts b/frontend/tests/unit/components/DataExport.spec.ts index 36056941..3ed0ed38 100644 --- a/frontend/tests/unit/components/DataExport.spec.ts +++ b/frontend/tests/unit/components/DataExport.spec.ts @@ -8,7 +8,7 @@ import VueRouter from 'vue-router' import testUtils from '@/../tests/utils/testUtils' import * as api from '@/api' -import { mock } from '@/components/mixins/exportMixin'; +import { mock } from '@/components/mixins/exportMixin' chai.should() let localVue = createLocalVue() diff --git a/frontend/tests/unit/helpers/helpers.spec.ts b/frontend/tests/unit/helpers/helpers.spec.ts index 18c7aa96..b1cea479 100644 --- a/frontend/tests/unit/helpers/helpers.spec.ts +++ b/frontend/tests/unit/helpers/helpers.spec.ts @@ -1,51 +1,51 @@ -import * as helpers from "@/util/helpers" -import * as chai from "chai" -import { AxiosResponse } from 'axios'; +import * as helpers from '@/util/helpers' +import * as chai from 'chai' +import { AxiosResponse } from 'axios' -chai.should(); +chai.should() -describe("# Helpers Unit Tests", () => { - describe("# praseBlacklist", () => { - it("should correclty parse the blacklist object into a string that can be used for regex", () => { - const blacklist = ["test", "another", "final"] +describe('# Helpers Unit Tests', () => { + describe('# praseBlacklist', () => { + it('should correclty parse the blacklist object into a string that can be used for regex', () => { + const blacklist = ['test', 'another', 'final'] const parsed = helpers.parseBlacklist(blacklist) - const testUrl = "https:somehost:someport/api/feedback/final" - const isMatched = testUrl.match(new RegExp(parsed, "g")) + const testUrl = 'https:somehost:someport/api/feedback/final' + const isMatched = testUrl.match(new RegExp(parsed, 'g')) // @ts-ignore isMatched.should.not.be.null - parsed.should.equal("test|another|final") + parsed.should.equal('test|another|final') }) }) - describe("# parseErrorNotification", () => { - it("should return html parsed information about the error if existing", () => { - const response = { data: { someKey: "this is an error message" } } + describe('# parseErrorNotification', () => { + it('should return html parsed information about the error if existing', () => { + const response = { data: { someKey: 'this is an error message' } } const parsed = helpers.parseErrorNotification(response as AxiosResponse) - parsed.should.equal("<ul><li>this is an error message</li></ul>") + parsed.should.equal('<ul><li>this is an error message</li></ul>') }) - it("should return html parsed list of all values of data object if existing", () => { + it('should return html parsed list of all values of data object if existing', () => { const response = { data: { - someKey: "some debug information", - someOtherKey: "some error information", - someFinalKey: "some response stuff" + someKey: 'some debug information', + someOtherKey: 'some error information', + someFinalKey: 'some response stuff' } } const parsed = helpers.parseErrorNotification(response as AxiosResponse) - const expected = "<ul><li>some debug information</li><li>some error information</li>" + - "<li>some response stuff</li></ul>" + const expected = '<ul><li>some debug information</li><li>some error information</li>' + + '<li>some response stuff</li></ul>' parsed.should.equal(expected) }) - it("should return default message when no error information exists", () => { - const response = { data: {}, someKey: "test" } + it('should return default message when no error information exists', () => { + const response = { data: {}, someKey: 'test' } const parsed = helpers.parseErrorNotification(response as unknown as AxiosResponse) - parsed.should.equal("There is no useful error data. Please ask the staff for help.") + parsed.should.equal('There is no useful error data. Please ask the staff for help.') }) - it("should give additional information for 404 requests", () => { - const response = { status: 404, data: { someKey: "Not found." } } + it('should give additional information for 404 requests', () => { + const response = { status: 404, data: { someKey: 'Not found.' } } const parsed = helpers.parseErrorNotification(response as AxiosResponse) - parsed.should.include("Not found.") - parsed.should.include("If you experience unusual behaviour, finish all unfinished work and relog." + - " If not, this is probably not a critical error.") + parsed.should.include('Not found.') + parsed.should.include('If you experience unusual behaviour, finish all unfinished work and relog.' + + ' If not, this is probably not a critical error.') }) }) }) \ No newline at end of file diff --git a/frontend/tests/utils/testUtils.ts b/frontend/tests/utils/testUtils.ts index 7009a255..de893b98 100644 --- a/frontend/tests/utils/testUtils.ts +++ b/frontend/tests/utils/testUtils.ts @@ -10,7 +10,7 @@ export class FakeFileReader { } export default { - studentExports: <StudentExportItem[]> [{ + studentExports: [{ Matrikel: '1000000', Name: 'name', Username: 'username', @@ -18,8 +18,8 @@ export default { Exam: 'exam', Password: 'pwd', Scores: [{ type: 'test01', score: 100 }] - }], - studentExportsObfuscated: <StudentExportItem[]> [{ + }] as StudentExportItem[], + studentExportsObfuscated: [{ Matrikel: 'username', Name: 'name', Username: 'username', @@ -27,26 +27,26 @@ export default { Exam: 'exam', Password: 'pwd', Scores: [{ type: 'test01', score: 100 }] - }], - instanceExports: <InstanceExportData> { + }] as StudentExportItem[], + instanceExports: { students: [{ name: 'name', matrikelNo: '1000000' }] - }, - instanceExportsObfuscated: <InstanceExportData> { + } as InstanceExportData, + instanceExportsObfuscated: { students: [{ name: 'name', matrikelNo: 'username' }] - }, - fakeFile: <File> { + } as InstanceExportData, + fakeFile: { lastModified: 1, name: 'Grady testUtils fake file', size: 1, slice: (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob => { return new Blob() }, type: 'fake file' - }, + } as File, studentMap: { 'username': { matrikelNo: '1000000', name: 'name' diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 3171ecfe..cc0bb390 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -90,6 +90,38 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" +"@hapi/address@2.x.x": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222" + integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q== + +"@hapi/bourne@1.x.x": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a" + integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA== + +"@hapi/hoek@8.x.x": + version "8.2.5" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.5.tgz#b307d3f1aced22e05bd6a2403c302eaebb577da3" + integrity sha512-rmGFzok1zR3xZKd5m3ihWdqafXFxvPHoQ/78+AG5URKbEbJiwBBfRgzbu+07W5f3+07JRshw6QqGbVmCp8ntig== + +"@hapi/joi@^15.0.1": + version "15.1.1" + resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7" + integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ== + dependencies: + "@hapi/address" "2.x.x" + "@hapi/bourne" "1.x.x" + "@hapi/hoek" "8.x.x" + "@hapi/topo" "3.x.x" + +"@hapi/topo@3.x.x": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.4.tgz#42e2fe36f593d90ad258a08b582be128c141c45d" + integrity sha512-aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA== + dependencies: + "@hapi/hoek" "8.x.x" + "@intervolga/optimize-cssnano-plugin@^1.0.5": version "1.0.6" resolved "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz#be7c7846128b88f6a9b1d1261a0ad06eb5c0fdf8" @@ -196,21 +228,59 @@ array-from "^2.1.1" lodash.get "^4.4.2" +"@soda/friendly-errors-webpack-plugin@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d" + integrity sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ== + dependencies: + chalk "^1.1.3" + error-stack-parser "^2.0.0" + string-width "^2.0.0" + "@types/chai@^4.1.0": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a" integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA== +"@types/eslint-visitor-keys@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" + integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== + +"@types/events@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" + integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== + "@types/file-saver@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.1.tgz#e18eb8b069e442f7b956d313f4fadd3ef887354e" integrity sha512-g1QUuhYVVAamfCifK7oB7G3aIl4BbOyzDOqVyUfEr4tfBKrXfeH+M+Tg7HKCXSrbzxYdhyCP7z9WbKo0R2hBCw== +"@types/glob@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" + integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + dependencies: + "@types/events" "*" + "@types/minimatch" "*" + "@types/node" "*" + "@types/highlight.js@^9.12.3": version "9.12.3" resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca" integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ== +"@types/json-schema@^7.0.3": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" + integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== + +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + "@types/mocha@^5.2.5": version "5.2.5" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.5.tgz#8a4accfc403c124a0bafe8a9fc61a05ec1032073" @@ -221,6 +291,16 @@ resolved "https://registry.yarnpkg.com/@types/nightwatch/-/nightwatch-0.9.11.tgz#2d5e83359a453f58a662d462008cee3c6613018f" integrity sha512-wMg/PX1vbmKW5vyikHv+GJQdw3RB5cD5bB87DRvRsQFoQNJrCrks0Zw9GsOTwTog3iEOJ3bUI64MjbLgAxDiXA== +"@types/node@*": + version "12.7.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.9.tgz#da0210f91096aa67138cf5afd04c4d629f8a406a" + integrity sha512-P57oKTJ/vYivL2BCfxCC5tQjlS8qW31pbOL6qt99Yrjm95YdHgNZwjrTTjMBh+C2/y6PXIX4oz253+jUzxKKfQ== + +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + "@types/q@^1.5.1": version "1.5.1" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18" @@ -231,168 +311,246 @@ resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.3.tgz#f8647e883d873962130f906a6114a4e187755696" integrity sha512-cjmJQLx2B5Hp9SzO7rdSivipo3kBqRqeYkTW17nLST1tn5YLWBjTdnzdmeTJXA1+KrrBLsEuvKQ0fUPGrfazQg== -"@types/webpack-env@^1.13.6": - version "1.13.6" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976" - integrity sha512-5Th3OsZ4gTRdr9Mho83BQ23cex4sRhOR4XTG+m+cJc0FhtUBK9Vn62hBJ+pnQYnSxoPOsKoAPOx6FcphxBC8ng== +"@types/webpack-env@^1.13.9": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.0.tgz#8edfc5f8e6eae20eeed3ca0d02974ed4ee5e4efc" + integrity sha512-Fv+0gYJzE/czLoRKq+gnXWr4yBpPM3tO3C8pDLFwqVKlMICQUq5OsxwwFZYDaVr7+L6mgNDp16iOcJHEz3J5RQ== -"@vue/cli-overlay@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.3.0.tgz#286fe26509a949aeadaa45c87648b76c99c52fd2" - integrity sha512-UyfeuX6txu8sRtfhJOJlPgETzU3KjshKY2qAnC34KJKcS+7oIYRpeOo8jMMLjImVE0g6d8Rn3A1GkXjRiKWW6w== +"@typescript-eslint/eslint-plugin@^1.1.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz#22fed9b16ddfeb402fd7bcde56307820f6ebc49f" + integrity sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g== + dependencies: + "@typescript-eslint/experimental-utils" "1.13.0" + eslint-utils "^1.3.1" + functional-red-black-tree "^1.0.1" + regexpp "^2.0.1" + tsutils "^3.7.0" -"@vue/cli-plugin-eslint@^3.0.0-rc.10": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.3.0.tgz#74689305e8623057106ed7654dfb0ea7d11395b1" - integrity sha512-kL68xVHv8xFqB06DmzACSviuNPaJcTvlKrCeZarxrXecry2MiOhbyiBToCQXiu2YhfxH8pUy3GFsSRyn3eYEuw== +"@typescript-eslint/eslint-plugin@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.3.2.tgz#7e112ca0bb29044d915baf10163a8199a20f7c69" + integrity sha512-tcnpksq1bXzcIRbYLeXkgp6l+ggEMXXUcl1wsSvL807fRtmvVQKygElwEUf4hBA76dNag3VAK1q2m3vd7qJaZA== + dependencies: + "@typescript-eslint/experimental-utils" "2.3.2" + eslint-utils "^1.4.2" + functional-red-black-tree "^1.0.1" + regexpp "^2.0.1" + tsutils "^3.17.1" + +"@typescript-eslint/experimental-utils@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" + integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "1.13.0" + eslint-scope "^4.0.0" + +"@typescript-eslint/experimental-utils@2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.2.tgz#e50f31264507e6fec7b33840bb6af260c24f4ea8" + integrity sha512-t+JGdTT6dRbmvKDlhlVkEueoZa0fhJNfG6z2cpnRPLwm3VwYr2BjR//acJGC1Yza0I9ZNcDfRY7ubQEvvfG6Jg== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.3.2" + eslint-scope "^5.0.0" + +"@typescript-eslint/parser@^1.1.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355" + integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ== + dependencies: + "@types/eslint-visitor-keys" "^1.0.0" + "@typescript-eslint/experimental-utils" "1.13.0" + "@typescript-eslint/typescript-estree" "1.13.0" + eslint-visitor-keys "^1.0.0" + +"@typescript-eslint/parser@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.3.2.tgz#e9b742e191cd1209930da469cde379591ad0af5b" + integrity sha512-nq1UQeNGdKdqdgF6Ww+Ov2OidWgiL96+JYdXXZ2rkP/OWyc6KMNSbs6MpRCpI8q+PmDa7hBnHNQIo7w/drYccA== + dependencies: + "@types/eslint-visitor-keys" "^1.0.0" + "@typescript-eslint/experimental-utils" "2.3.2" + "@typescript-eslint/typescript-estree" "2.3.2" + eslint-visitor-keys "^1.1.0" + +"@typescript-eslint/typescript-estree@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e" + integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw== + dependencies: + lodash.unescape "4.0.1" + semver "5.5.0" + +"@typescript-eslint/typescript-estree@2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.2.tgz#107414aa04e689fe6f7251eb63fb500217f2b7f4" + integrity sha512-eZNEAai16nwyhIVIEaWQlaUgAU3S9CkQ58qvK0+3IuSdLJD3W1PNuehQFMIhW/mTP1oFR9GNoTcLg7gtXz6lzA== + dependencies: + glob "^7.1.4" + is-glob "^4.0.1" + lodash.unescape "4.0.1" + semver "^6.3.0" + +"@vue/cli-overlay@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.11.0.tgz#88d49060095c9c5168ac6014d4c4eb66e7dd4874" + integrity sha512-yYZP27vjioWmohwXQ9mTPHHxktfAaTM6RDehyG83yvY07wcdxhwrNNCMm8eE9My/K2F8oAPf8uoDZZmkr/EXBw== + +"@vue/cli-plugin-eslint@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.11.0.tgz#99b14a9d4ab05d96fc707d958db9de4856133329" + integrity sha512-cZWTXFbMu7/Ha6uAyvFsOxjC82afmHk0M9ye2MyeXmkvdL+tB2rcIITbd9HZypPaky1qv46Mp5l/lSd9W4PVCA== dependencies: - "@vue/cli-shared-utils" "^3.3.0" + "@vue/cli-shared-utils" "^3.11.0" babel-eslint "^10.0.1" + eslint-loader "^2.1.2" + globby "^9.2.0" + webpack "^4.0.0" + yorkie "^2.0.0" + optionalDependencies: eslint "^4.19.1" - eslint-loader "^2.1.1" eslint-plugin-vue "^4.7.1" - globby "^8.0.1" -"@vue/cli-plugin-typescript@^3.2.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-3.3.0.tgz#a278010e0959ea9be44b23dfdf65d3c3e01c66a9" - integrity sha512-JZ+RYMXL27zq3hU/RnJJaVb6OvsQ5M7qTfZEBWnc45oyw/nFBRLkmFYgQztktvxXvlLcTkJeb8I2cTwxZ2BxnA== +"@vue/cli-plugin-typescript@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-3.11.0.tgz#5396905af9df574935e47a0507450f76fae6b196" + integrity sha512-oL0ctNVvbD7gZr3DDv6gxxWjw0lUrh4sGMk7InCakEooo/790DqZRX6lx9stXEv/+zELkgddcY3hjNEopbJg+w== dependencies: - "@types/webpack-env" "^1.13.6" - "@vue/cli-shared-utils" "^3.3.0" + "@types/webpack-env" "^1.13.9" + "@vue/cli-shared-utils" "^3.11.0" fork-ts-checker-webpack-plugin "^0.5.2" - globby "^8.0.1" - ts-loader "^5.3.2" - tslint "^5.12.0" + globby "^9.2.0" + ts-loader "^5.3.3" + tslint "^5.15.0" + webpack "^4.0.0" + yorkie "^2.0.0" -"@vue/cli-plugin-unit-mocha@^3.2.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-3.3.0.tgz#26a7274b4e8670aa3573232ec0c0251a34ba80f7" - integrity sha512-ErMMgdJ8PumXP7Clvy+sYwBFQDOxEADUfoVBX7Gm/EzTw++utziLz85N0vNBttWWMJTPIcYPAJn0A6tv82IFAg== +"@vue/cli-plugin-unit-mocha@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-3.11.0.tgz#07d253bacc4c4bf673e351e0467f81154ef240a8" + integrity sha512-VLk6Z4OEWYQ9iSB1A1Pc5wWijOFXYzBs1AvtZernMu9m1M/hzitf1YALSUJrV853CA5u1yaBK4NpyGYm36rKgg== dependencies: - "@vue/cli-shared-utils" "^3.3.0" - jsdom "^13.1.0" + "@vue/cli-shared-utils" "^3.11.0" + jsdom "^13.2.0" jsdom-global "^3.0.2" mocha "^5.2.0" mocha-webpack "^2.0.0-beta.0" -"@vue/cli-service@^3.2.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.3.0.tgz#d269209c891bf0772b619c4d3647fc731285a729" - integrity sha512-7PNitKBBCFcGfCvXSiuUGV2GpGA6KEupQcuxQ2xPL5T3UMSAzJLpx7Siw/9++yO4nQEib6yP3YQk2zTfeXWTSA== +"@vue/cli-service@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.11.0.tgz#356526e9100a7a0a258e3c4a13ff421de29eadde" + integrity sha512-HSU4wHlYKQt8O968JUz/AeYvFSokxJjMkr7dgVNVb6rpBn859Emkr960plWGr1z1hc3qNOwLuSUGk5OSfq1inA== dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" - "@vue/cli-overlay" "^3.3.0" - "@vue/cli-shared-utils" "^3.3.0" + "@soda/friendly-errors-webpack-plugin" "^1.7.1" + "@vue/cli-overlay" "^3.11.0" + "@vue/cli-shared-utils" "^3.11.0" + "@vue/component-compiler-utils" "^3.0.0" "@vue/preload-webpack-plugin" "^1.1.0" "@vue/web-component-wrapper" "^1.2.0" - acorn "^6.0.4" + acorn "^6.1.1" acorn-walk "^6.1.1" address "^1.0.3" - autoprefixer "^8.6.5" - cache-loader "^1.2.5" - case-sensitive-paths-webpack-plugin "^2.1.2" - chalk "^2.4.1" - clipboardy "^1.2.3" - cliui "^4.1.0" + autoprefixer "^9.5.1" + browserslist "^4.5.4" + cache-loader "^2.0.1" + case-sensitive-paths-webpack-plugin "^2.2.0" + chalk "^2.4.2" + cli-highlight "^2.1.0" + clipboardy "^2.0.0" + cliui "^5.0.0" copy-webpack-plugin "^4.6.0" css-loader "^1.0.1" - cssnano "^4.1.8" + cssnano "^4.1.10" + current-script-polyfill "^1.0.0" debug "^4.1.1" + default-gateway "^5.0.2" + dotenv "^7.0.0" + dotenv-expand "^5.1.0" escape-string-regexp "^1.0.5" - file-loader "^2.0.0" - friendly-errors-webpack-plugin "^1.7.0" + file-loader "^3.0.1" fs-extra "^7.0.1" - globby "^8.0.1" + globby "^9.2.0" hash-sum "^1.0.2" html-webpack-plugin "^3.2.0" launch-editor-middleware "^2.2.1" - lodash.defaultsdeep "^4.6.0" + lodash.defaultsdeep "^4.6.1" lodash.mapvalues "^4.6.0" lodash.transform "^4.6.0" - mini-css-extract-plugin "^0.5.0" + mini-css-extract-plugin "^0.6.0" minimist "^1.2.0" - ora "^3.0.0" + ora "^3.4.0" portfinder "^1.0.20" postcss-loader "^3.0.0" - read-pkg "^4.0.1" - semver "^5.6.0" + read-pkg "^5.0.0" + semver "^6.0.0" slash "^2.0.0" source-map-url "^0.4.0" ssri "^6.0.1" string.prototype.padend "^3.0.0" - terser-webpack-plugin "^1.2.1" - thread-loader "^1.2.0" + terser-webpack-plugin "^1.2.3" + thread-loader "^2.1.2" url-loader "^1.1.2" - vue-loader "^15.4.2" - webpack "4" - webpack-bundle-analyzer "^3.0.3" + vue-loader "^15.7.0" + webpack "^4.0.0" + webpack-bundle-analyzer "^3.3.0" webpack-chain "^4.11.0" - webpack-dev-server "^3.1.14" - webpack-merge "^4.1.5" - yorkie "^2.0.0" + webpack-dev-server "^3.4.1" + webpack-merge "^4.2.1" -"@vue/cli-shared-utils@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.3.0.tgz#aba6c435bf9affb8180c43195ee85eb8d736d70f" - integrity sha512-V/sU1jc7/jMCAbU8uA5f4j9Yd8lTqdi3I6FEHfLG1nstwhaNi4BU3WKWOAl72NYVWFYG8VuCrYWDn75kMimtuw== +"@vue/cli-shared-utils@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz#a3d6f809b0dfb367e626b71405f85dea0631310b" + integrity sha512-D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA== dependencies: + "@hapi/joi" "^15.0.1" chalk "^2.4.1" execa "^1.0.0" - joi "^14.3.0" launch-editor "^2.2.1" lru-cache "^5.1.1" node-ipc "^9.1.1" - opn "^5.3.0" - ora "^3.0.0" + open "^6.3.0" + ora "^3.4.0" request "^2.87.0" - request-promise-native "^1.0.5" - semver "^5.5.0" + request-promise-native "^1.0.7" + semver "^6.0.0" string.prototype.padstart "^3.0.0" -"@vue/component-compiler-utils@^2.4.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.0.tgz#411846d582d393f701f747517ddd29275ce64ca4" - integrity sha512-mSB8jWmE/ZeYZHPDEx9hNiiRh5P2V1Q0tObxEQWtxxfXtkIAvPnj7oucGm5SO8Y/QwIlDJgAGqHfj5MCjoKoOg== +"@vue/component-compiler-utils@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634" + integrity sha512-am+04/0UX7ektcmvhYmrf84BDVAD8afFOf4asZjN84q8xzxFclbk5x0MtxuKGfp+zjN5WWPJn3fjFAWtDdIGSw== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" lru-cache "^4.1.2" merge-source-map "^1.1.0" - postcss "^7.0.7" + postcss "^7.0.14" postcss-selector-parser "^5.0.0" - prettier "1.13.7" - source-map "^0.7.3" - vue-template-es2015-compiler "^1.6.0" - -"@vue/eslint-config-standard@^3.0.0-rc.10": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-3.0.5.tgz#7d6ae809eaec90993c6033d9543f48f687b9ebf1" - integrity sha512-qijT6OWUgsCO/MTC9Qpw4JtRL01cX0+kIikU0bXQxWXyh8WfNnfvxPouo7tKf7W28qqqiGmwDUnbvTB50SLcTw== - dependencies: - eslint-config-standard "^12.0.0-alpha.0" - eslint-plugin-import "^2.11.0" - eslint-plugin-node "^6.0.1" - eslint-plugin-promise "^3.7.0" - eslint-plugin-standard "^3.1.0" - -"@vue/eslint-config-typescript@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-3.2.0.tgz#cbb19f11b74149f49febb52c92167458a22ba002" - integrity sha512-rDcOpHpxVOyKVe5kaxV63UOQulYvIAwpX0HZO4+rEnDoxkKtS9iAw2VeaamvrYp+TCFMsguo3CsGg0leu1xWAg== + prettier "1.16.3" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + +"@vue/eslint-config-typescript@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-4.0.0.tgz#a202983598a4a826460cbb8ee43826875b0f6673" + integrity sha512-uSMAMgw4xDgVdZQhpbtJRo8nMV4oOy3Ht8olfOo7xvYFYLMF2JZ1tDRKd9/NSusxA72O2Vma+HzmyzDHg9evcQ== dependencies: - eslint-plugin-typescript "^0.14.0" - typescript-eslint-parser "^21.0.1" + "@typescript-eslint/eslint-plugin" "^1.1.0" + "@typescript-eslint/parser" "^1.1.0" "@vue/preload-webpack-plugin@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.0.tgz#d768dba004261c029b53a77c5ea2d5f9ee4f3cce" integrity sha512-rcn2KhSHESBFMPj5vc5X2pI9bcBNQQixvJXhD5gZ4rN2iym/uH2qfDSQfUS5+qwiz0a85TCkeUs6w6jxFDudbw== -"@vue/test-utils@^1.0.0-beta.27": - version "1.0.0-beta.28" - resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.28.tgz#767c43413df8cde86128735e58923803e444b9a5" - integrity sha512-uVbFJG0g/H9hf2pgWUdhvQYItRGzQ44cMFf00wp0YEo85pxuvM9e3mx8QLQfx6R2CogxbK4CvV7qvkLblehXeQ== +"@vue/test-utils@^1.0.0-beta.29": + version "1.0.0-beta.29" + resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0" + integrity sha512-yX4sxEIHh4M9yAbLA/ikpEnGKMNBCnoX98xE1RwxfhQVcn0MaXNSj1Qmac+ZydTj6VBSEVukchBogXBTwc+9iA== dependencies: dom-event-types "^1.0.0" lodash "^4.17.4" @@ -402,158 +560,161 @@ resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz#bb0e46f1585a7e289b4ee6067dcc5a6ae62f1dd1" integrity sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw== -"@webassemblyjs/ast@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" - integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA== - dependencies: - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - -"@webassemblyjs/floating-point-hex-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" - integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== - -"@webassemblyjs/helper-api-error@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" - integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== - -"@webassemblyjs/helper-buffer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" - integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== - -"@webassemblyjs/helper-code-frame@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" - integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw== - dependencies: - "@webassemblyjs/wast-printer" "1.7.11" - -"@webassemblyjs/helper-fsm@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" - integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== - -"@webassemblyjs/helper-module-context@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" - integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== - -"@webassemblyjs/helper-wasm-bytecode@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" - integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== - -"@webassemblyjs/helper-wasm-section@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" - integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - -"@webassemblyjs/ieee754@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" - integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ== +"@webassemblyjs/ast@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" + integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== + dependencies: + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + +"@webassemblyjs/floating-point-hex-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" + integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== + +"@webassemblyjs/helper-api-error@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" + integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== + +"@webassemblyjs/helper-buffer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" + integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== + +"@webassemblyjs/helper-code-frame@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" + integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== + dependencies: + "@webassemblyjs/wast-printer" "1.8.5" + +"@webassemblyjs/helper-fsm@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" + integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== + +"@webassemblyjs/helper-module-context@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" + integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== + dependencies: + "@webassemblyjs/ast" "1.8.5" + mamacro "^0.0.3" + +"@webassemblyjs/helper-wasm-bytecode@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" + integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== + +"@webassemblyjs/helper-wasm-section@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" + integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + +"@webassemblyjs/ieee754@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" + integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" - integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw== - dependencies: - "@xtuc/long" "4.2.1" - -"@webassemblyjs/utf8@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" - integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== - -"@webassemblyjs/wasm-edit@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" - integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/helper-wasm-section" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-opt" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - "@webassemblyjs/wast-printer" "1.7.11" - -"@webassemblyjs/wasm-gen@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" - integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - -"@webassemblyjs/wasm-opt@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" - integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - -"@webassemblyjs/wasm-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" - integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - -"@webassemblyjs/wast-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" - integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/floating-point-hex-parser" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-code-frame" "1.7.11" - "@webassemblyjs/helper-fsm" "1.7.11" - "@xtuc/long" "4.2.1" - -"@webassemblyjs/wast-printer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" - integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - "@xtuc/long" "4.2.1" +"@webassemblyjs/leb128@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" + integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" + integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== + +"@webassemblyjs/wasm-edit@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" + integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/helper-wasm-section" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-opt" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/wast-printer" "1.8.5" + +"@webassemblyjs/wasm-gen@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" + integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + +"@webassemblyjs/wasm-opt@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" + integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-buffer" "1.8.5" + "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + +"@webassemblyjs/wasm-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" + integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-wasm-bytecode" "1.8.5" + "@webassemblyjs/ieee754" "1.8.5" + "@webassemblyjs/leb128" "1.8.5" + "@webassemblyjs/utf8" "1.8.5" + +"@webassemblyjs/wast-parser@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" + integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/floating-point-hex-parser" "1.8.5" + "@webassemblyjs/helper-api-error" "1.8.5" + "@webassemblyjs/helper-code-frame" "1.8.5" + "@webassemblyjs/helper-fsm" "1.8.5" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/wast-printer@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" + integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/wast-parser" "1.8.5" + "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== -"@xtuc/long@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8" - integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g== +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== abab@^2.0.0: version "2.0.0" @@ -573,12 +734,13 @@ accepts@~1.3.4, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" -acorn-dynamic-import@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" - integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg== +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== dependencies: - acorn "^5.0.0" + mime-types "~2.1.24" + negotiator "0.6.2" acorn-globals@^4.3.0: version "4.3.0" @@ -595,6 +757,11 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" +acorn-jsx@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" + integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== + acorn-walk@^6.0.1, acorn-walk@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" @@ -605,7 +772,7 @@ acorn@^3.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= -acorn@^5.0.0, acorn@^5.5.0, acorn@^5.6.2, acorn@^5.7.3: +acorn@^5.5.0: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== @@ -615,6 +782,11 @@ acorn@^6.0.1, acorn@^6.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a" integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg== +acorn@^6.0.2, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.1: + version "6.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" + integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== + address@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9" @@ -635,6 +807,11 @@ ajv-keywords@^3.1.0: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo= +ajv-keywords@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" + integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== + ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" @@ -655,6 +832,16 @@ ajv@^6.1.0, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.10.2, ajv@^6.9.1: + version "6.10.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" + integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -670,6 +857,11 @@ ansi-escapes@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw== +ansi-escapes@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -685,25 +877,27 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= anymatch@^2.0.0: version "2.0.0" @@ -718,7 +912,7 @@ aproba@^1.0.3, aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -arch@^2.1.0: +arch@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg== @@ -738,19 +932,12 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - dependencies: - arr-flatten "^1.0.1" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= -arr-flatten@^1.0.1, arr-flatten@^1.1.0: +arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== @@ -795,7 +982,7 @@ array-reduce@~0.0.0: resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys= -array-union@^1.0.1: +array-union@^1.0.1, array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= @@ -807,21 +994,11 @@ array-uniq@^1.0.1: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -860,11 +1037,21 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" integrity sha1-GdOGodntxufByF04iu28xW0zYC0= +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" @@ -875,13 +1062,6 @@ async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= -async@^2.3.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" - integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ== - dependencies: - lodash "^4.17.10" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -892,17 +1072,18 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^8.6.5: - version "8.6.5" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.5.tgz#343f3d193ed568b3208e00117a1b96eb691d4ee9" - integrity sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig== +autoprefixer@^9.5.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47" + integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw== dependencies: - browserslist "^3.2.8" - caniuse-lite "^1.0.30000864" + browserslist "^4.6.3" + caniuse-lite "^1.0.30000980" + chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.23" - postcss-value-parser "^3.2.3" + postcss "^7.0.17" + postcss-value-parser "^4.0.0" aws-sign2@~0.7.0: version "0.7.0" @@ -1011,11 +1192,16 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg== -bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.3: +bluebird@^3.1.1, bluebird@^3.5.1: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== +bluebird@^3.5.5: + version "3.7.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.0.tgz#56a6a886e03f6ae577cffedeb524f8f2450293cf" + integrity sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg== + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -1037,6 +1223,22 @@ body-parser@1.18.3: raw-body "2.3.3" type-is "~1.6.16" +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + bonjour@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -1062,16 +1264,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.0, braces@^2.3.1: +braces@^2.3.0, braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== @@ -1161,14 +1354,6 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^3.2.8: - version "3.2.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" - integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ== - dependencies: - caniuse-lite "^1.0.30000844" - electron-to-chromium "^1.3.47" - browserslist@^4.0.0: version "4.4.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.0.tgz#7050d1412cbfc5274aba609ed5e50359ca1a5fdf" @@ -1178,6 +1363,15 @@ browserslist@^4.0.0: electron-to-chromium "^1.3.100" node-releases "^1.1.3" +browserslist@^4.5.4, browserslist@^4.6.3: + version "4.7.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17" + integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA== + dependencies: + caniuse-lite "^1.0.30000989" + electron-to-chromium "^1.3.247" + node-releases "^1.1.29" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -1202,7 +1396,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -builtin-modules@^1.0.0, builtin-modules@^1.1.1: +builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= @@ -1217,6 +1411,11 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + cacache@^10.0.4: version "10.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" @@ -1236,22 +1435,23 @@ cacache@^10.0.4: unique-filename "^1.1.0" y18n "^4.0.0" -cacache@^11.0.2: - version "11.3.2" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa" - integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg== +cacache@^12.0.2: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== dependencies: - bluebird "^3.5.3" + bluebird "^3.5.5" chownr "^1.1.1" figgy-pudding "^3.5.1" - glob "^7.1.3" + glob "^7.1.4" graceful-fs "^4.1.15" + infer-owner "^1.0.3" lru-cache "^5.1.1" mississippi "^3.0.0" mkdirp "^0.5.1" move-concurrently "^1.0.1" promise-inflight "^1.0.1" - rimraf "^2.6.2" + rimraf "^2.6.3" ssri "^6.0.1" unique-filename "^1.1.1" y18n "^4.0.0" @@ -1271,15 +1471,16 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cache-loader@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.5.tgz#9ab15b0ae5f546f376083a695fc1a75f546cb266" - integrity sha512-enWKEQ4kO3YreDFd7AtVRjtJBmNiqh/X9hVDReu0C4qm8gsGmySkwuWtdc+N5O+vq5FzxL1mIZc30NyXCB7o/Q== +cache-loader@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz#5758f41a62d7c23941e3c3c7016e6faeb03acb07" + integrity sha512-V99T3FOynmGx26Zom+JrVBytLBsmUCzVG2/4NnUKgvXN4bEV42R1ERl1IyiH/cvFIDA1Ytq2lPZ9tXDSahcQpQ== dependencies: loader-utils "^1.1.0" mkdirp "^0.5.1" - neo-async "^2.5.0" - schema-utils "^0.4.2" + neo-async "^2.6.0" + normalize-path "^3.0.0" + schema-utils "^1.0.0" call-me-maybe@^1.0.1: version "1.0.1" @@ -1317,6 +1518,11 @@ callsites@^2.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + camel-case@3.0.x: version "3.0.0" resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" @@ -1325,16 +1531,16 @@ camel-case@3.0.x: no-case "^2.2.0" upper-case "^1.1.1" -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= - camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -1345,15 +1551,20 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000928: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000928: version "1.0.30000929" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317" integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw== -case-sensitive-paths-webpack-plugin@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.2.tgz#c899b52175763689224571dad778742e133f0192" - integrity sha512-oEZgAFfEvKtjSRCu6VgYkuGxwrWXMnQzyBmlLPP7r6PWQVtHxP5Z5N6XsuJvtoVax78am/r7lr46bwo3IVEBOg== +caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000989: + version "1.0.30000998" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744" + integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ== + +case-sensitive-paths-webpack-plugin@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e" + integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g== caseless@~0.12.0: version "0.12.0" @@ -1383,7 +1594,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1397,6 +1608,11 @@ chardet@^0.4.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== + check-error@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" @@ -1407,23 +1623,7 @@ check-types@^7.3.0: resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg== -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4: +chokidar@^2.0.2, chokidar@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ== @@ -1443,15 +1643,34 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4: optionalDependencies: fsevents "^1.2.2" +chokidar@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + chownr@^1.0.1, chownr@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== -chrome-trace-event@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48" - integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A== +chrome-trace-event@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" + integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== dependencies: tslib "^1.9.0" @@ -1502,34 +1721,36 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-spinners@^1.1.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" - integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg== +cli-highlight@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.1.tgz#2180223d51618b112f4509cf96e4a6c750b07e97" + integrity sha512-0y0VlNmdD99GXZHYnvrQcmHxP8Bi6T00qucGgBgGv4kJ0RyDthNnnFPupHV7PYv/OXSVk+azFbOeaW6+vGmx9A== + dependencies: + chalk "^2.3.0" + highlight.js "^9.6.0" + mz "^2.4.0" + parse5 "^4.0.0" + yargs "^13.0.0" + +cli-spinners@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77" + integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ== cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= -clipboardy@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef" - integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA== - dependencies: - arch "^2.1.0" - execa "^0.8.0" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= +clipboardy@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.1.0.tgz#0123a0c8fac92f256dc56335e0bb8be97a4909a5" + integrity sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ== dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" + arch "^2.1.1" + execa "^1.0.0" -cliui@^4.0.0, cliui@^4.1.0: +cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== @@ -1538,6 +1759,15 @@ cliui@^4.0.0, cliui@^4.1.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -1630,6 +1860,11 @@ commander@^2.12.1, commander@^2.18.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== +commander@^2.20.0: + version "2.20.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9" + integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -1640,23 +1875,23 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= -compressible@~2.0.14: - version "2.0.15" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212" - integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw== +compressible@~2.0.16: + version "2.0.17" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1" + integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw== dependencies: - mime-db ">= 1.36.0 < 2" + mime-db ">= 1.40.0 < 2" -compression@^1.5.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db" - integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== dependencies: accepts "~1.3.5" bytes "3.0.0" - compressible "~2.0.14" + compressible "~2.0.16" debug "2.6.9" - on-headers "~1.0.1" + on-headers "~1.0.2" safe-buffer "5.1.2" vary "~1.1.2" @@ -1675,7 +1910,7 @@ concat-stream@^1.5.0, concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -connect-history-api-fallback@^1.3.0: +connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== @@ -1704,16 +1939,18 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - content-disposition@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" @@ -1729,6 +1966,11 @@ cookie@0.3.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -1835,7 +2077,7 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0: +cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -2005,19 +2247,55 @@ cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.6: postcss-svgo "^4.0.1" postcss-unique-selectors "^4.0.1" -cssnano-util-get-arguments@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" - integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= - -cssnano-util-get-match@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" - integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= - -cssnano-util-raw-cache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" +cssnano-preset-default@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" + integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== + dependencies: + css-declaration-sorter "^4.0.1" + cssnano-util-raw-cache "^4.0.1" + postcss "^7.0.0" + postcss-calc "^7.0.1" + postcss-colormin "^4.0.3" + postcss-convert-values "^4.0.1" + postcss-discard-comments "^4.0.2" + postcss-discard-duplicates "^4.0.2" + postcss-discard-empty "^4.0.1" + postcss-discard-overridden "^4.0.1" + postcss-merge-longhand "^4.0.11" + postcss-merge-rules "^4.0.3" + postcss-minify-font-values "^4.0.2" + postcss-minify-gradients "^4.0.2" + postcss-minify-params "^4.0.2" + postcss-minify-selectors "^4.0.2" + postcss-normalize-charset "^4.0.1" + postcss-normalize-display-values "^4.0.2" + postcss-normalize-positions "^4.0.2" + postcss-normalize-repeat-style "^4.0.2" + postcss-normalize-string "^4.0.2" + postcss-normalize-timing-functions "^4.0.2" + postcss-normalize-unicode "^4.0.1" + postcss-normalize-url "^4.0.1" + postcss-normalize-whitespace "^4.0.2" + postcss-ordered-values "^4.1.2" + postcss-reduce-initial "^4.0.3" + postcss-reduce-transforms "^4.0.2" + postcss-svgo "^4.0.2" + postcss-unique-selectors "^4.0.1" + +cssnano-util-get-arguments@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" + integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= + +cssnano-util-get-match@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" + integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= + +cssnano-util-raw-cache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== dependencies: postcss "^7.0.0" @@ -2027,7 +2305,7 @@ cssnano-util-same-parent@^4.0.0: resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== -cssnano@^4.0.0, cssnano@^4.1.8: +cssnano@^4.0.0: version "4.1.8" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.8.tgz#8014989679d5fd42491e4499a521dbfb85c95fd1" integrity sha512-5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig== @@ -2037,6 +2315,16 @@ cssnano@^4.0.0, cssnano@^4.1.8: is-resolvable "^1.0.0" postcss "^7.0.0" +cssnano@^4.1.10: + version "4.1.10" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" + integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== + dependencies: + cosmiconfig "^5.0.0" + cssnano-preset-default "^4.0.7" + is-resolvable "^1.0.0" + postcss "^7.0.0" + csso@^3.5.0: version "3.5.1" resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b" @@ -2056,6 +2344,11 @@ cssstyle@^1.1.1: dependencies: cssom "0.3.x" +current-script-polyfill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz#f31cf7e4f3e218b0726e738ca92a02d3488ef615" + integrity sha1-8xz35PPiGLBybnOMqSoC00iO9hU= + cyclist@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" @@ -2087,7 +2380,7 @@ de-indent@^1.0.2: resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2108,25 +2401,18 @@ debug@^3.1.0, debug@^3.2.5: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1: +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== dependencies: ms "^2.1.1" -decamelize@^1.1.1: +decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decamelize@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" - integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg== - dependencies: - xregexp "4.0.0" - 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" @@ -2164,14 +2450,21 @@ deepmerge@^2.1.1: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== -default-gateway@^2.6.0: - version "2.7.2" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f" - integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ== +default-gateway@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" + integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== dependencies: - execa "^0.10.0" + execa "^1.0.0" ip-regex "^2.1.0" +default-gateway@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.3.tgz#18434c9430a18035a2861f7839bf7669b3436e6f" + integrity sha512-zW+ld9xtN0+q48wIwhitUzhfERJN7BPgvijPhuCKG6bfWqnoqtSNSnrXfvAME2ZJLpgYpz6UorpBddGfLzrJBw== + dependencies: + execa "^2.0.3" + defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -2208,17 +2501,18 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -del@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU= +del@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" + integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== dependencies: + "@types/glob" "^7.1.1" globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" + is-path-cwd "^2.0.0" + is-path-in-cwd "^2.0.0" + p-map "^2.0.0" + pify "^4.0.1" + rimraf "^2.6.3" delayed-stream@~1.0.0: version "1.0.0" @@ -2258,11 +2552,16 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== -diff@3.5.0, diff@^3.2.0, diff@^3.5.0: +diff@3.5.0, diff@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== +diff@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" + integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -2272,14 +2571,6 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dir-glob@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" - integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== - dependencies: - arrify "^1.0.1" - path-type "^3.0.0" - dir-glob@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.1.tgz#ce8413234ffe8452b76b7741c32f116cf2a7b1a7" @@ -2287,6 +2578,13 @@ dir-glob@^2.0.0: dependencies: path-type "^3.0.0" +dir-glob@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" + integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== + dependencies: + path-type "^3.0.0" + dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -2307,14 +2605,6 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -doctrine@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -2322,6 +2612,13 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + dom-converter@~0.2: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -2406,6 +2703,16 @@ dot-prop@^4.1.1: dependencies: is-obj "^1.0.0" +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c" + integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g== + duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -2444,11 +2751,16 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -electron-to-chromium@^1.3.100, electron-to-chromium@^1.3.47: +electron-to-chromium@^1.3.100: version "1.3.103" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz#a695777efdbc419cad6cbb0e58458251302cd52f" integrity sha512-tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ== +electron-to-chromium@^1.3.247: + version "1.3.273" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz#94872d6823219f2812f2e35a2ce2a7d03c1eaa3f" + integrity sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw== + elliptic@^6.0.0: version "6.4.1" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a" @@ -2462,6 +2774,11 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -2500,7 +2817,7 @@ errno@^0.1.3, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -2557,23 +2874,10 @@ escodegen@^1.11.0: optionalDependencies: source-map "~0.6.1" -eslint-config-standard@^12.0.0-alpha.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" - integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== - -eslint-import-resolver-node@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== - dependencies: - debug "^2.6.9" - resolve "^1.5.0" - -eslint-loader@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.1.1.tgz#2a9251523652430bfdd643efdb0afc1a2a89546a" - integrity sha512-1GrJFfSevQdYpoDzx8mEE2TDWsb/zmFuY09l6hURg1AeFIKQOvZ+vH0UPjzmd1CZIbfTV5HUkMeBmFiDBkgIsQ== +eslint-loader@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" + integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg== dependencies: loader-fs-cache "^1.0.0" loader-utils "^1.0.2" @@ -2581,57 +2885,6 @@ eslint-loader@^2.1.1: object-hash "^1.1.4" rimraf "^2.6.1" -eslint-module-utils@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" - integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y= - dependencies: - debug "^2.6.8" - pkg-dir "^1.0.0" - -eslint-plugin-import@^2.11.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" - integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g== - dependencies: - contains-path "^0.1.0" - debug "^2.6.8" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.2.0" - has "^1.0.1" - lodash "^4.17.4" - minimatch "^3.0.3" - read-pkg-up "^2.0.0" - resolve "^1.6.0" - -eslint-plugin-node@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4" - integrity sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw== - dependencies: - ignore "^3.3.6" - minimatch "^3.0.4" - resolve "^1.3.3" - semver "^5.4.1" - -eslint-plugin-promise@^3.7.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz#65ebf27a845e3c1e9d6f6a5622ddd3801694b621" - integrity sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ== - -eslint-plugin-standard@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz#2a9e21259ba4c47c02d53b2d0c9135d4b1022d47" - integrity sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w== - -eslint-plugin-typescript@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-typescript/-/eslint-plugin-typescript-0.14.0.tgz#068549c3f4c7f3f85d88d398c29fa96bf500884c" - integrity sha512-2u1WnnDF2mkWWgU1lFQ2RjypUlmRoBEvQN02y9u+IL12mjWlkKFGEBnVsjs9Y8190bfPQCvWly1c2rYYUSOxWw== - dependencies: - requireindex "~1.1.0" - eslint-plugin-vue@^4.7.1: version "4.7.1" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63" @@ -2639,6 +2892,13 @@ eslint-plugin-vue@^4.7.1: dependencies: vue-eslint-parser "^2.0.3" +eslint-plugin-vue@^5.0.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" + integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw== + dependencies: + vue-eslint-parser "^5.0.0" + eslint-scope@3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -2663,11 +2923,39 @@ eslint-scope@^4.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-scope@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" + integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-utils@^1.3.1, eslint-utils@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" + integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== + dependencies: + eslint-visitor-keys "^1.0.0" + eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== +eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + eslint@^4.19.1: version "4.19.1" resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" @@ -2712,6 +3000,48 @@ eslint@^4.19.1: table "4.0.2" text-table "~0.2.0" +eslint@^5.16.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" + integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== + dependencies: + "@babel/code-frame" "^7.0.0" + ajv "^6.9.1" + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^4.0.3" + eslint-utils "^1.3.1" + eslint-visitor-keys "^1.0.0" + espree "^5.0.1" + esquery "^1.0.1" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.7.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + inquirer "^6.2.2" + js-yaml "^3.13.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.11" + minimatch "^3.0.4" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + progress "^2.0.0" + regexpp "^2.0.1" + semver "^5.5.1" + strip-ansi "^4.0.0" + strip-json-comments "^2.0.1" + table "^5.2.3" + text-table "^0.2.0" + espree@^3.5.2, espree@^3.5.4: version "3.5.4" resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" @@ -2720,6 +3050,24 @@ espree@^3.5.2, espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" +espree@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f" + integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w== + dependencies: + acorn "^6.0.2" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" + +espree@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" + integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== + dependencies: + acorn "^6.0.7" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" + esprima@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -2730,7 +3078,7 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.0: +esquery@^1.0.0, esquery@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== @@ -2764,10 +3112,10 @@ event-pubsub@4.3.0: resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== -eventemitter3@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" - integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== +eventemitter3@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" + integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== events@^3.0.0: version "3.0.0" @@ -2789,19 +3137,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw== - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -2841,12 +3176,20 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= - dependencies: - is-posix-bracket "^0.1.0" +execa@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e" + integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ== + dependencies: + cross-spawn "^6.0.5" + get-stream "^5.0.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^3.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" expand-brackets@^2.1.4: version "2.1.4" @@ -2861,14 +3204,7 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - dependencies: - fill-range "^2.1.0" - -express@^4.16.2, express@^4.16.3: +express@^4.16.3: version "4.16.4" resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== @@ -2904,6 +3240,42 @@ express@^4.16.2, express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -2933,12 +3305,14 @@ external-editor@^2.0.4: iconv-lite "^0.4.17" tmp "^0.0.33" -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: - is-extglob "^1.0.0" + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" extglob@^2.0.4: version "2.0.4" @@ -2974,10 +3348,10 @@ fast-deep-equal@^2.0.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= -fast-glob@^2.0.2: - version "2.2.6" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295" - integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w== +fast-glob@^2.2.6: + version "2.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" + integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== dependencies: "@mrmlnc/readdir-enhanced" "^2.2.1" "@nodelib/fs.stat" "^1.1.2" @@ -3035,10 +3409,17 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" -file-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" - integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ== +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== + dependencies: + flat-cache "^2.0.1" + +file-loader@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa" + integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw== dependencies: loader-utils "^1.0.2" schema-utils "^1.0.0" @@ -3048,27 +3429,11 @@ file-saver@^2.0.2: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a" integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw== -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - filesize@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -3092,6 +3457,19 @@ finalhandler@1.1.1: statuses "~1.4.0" unpipe "~1.0.0" +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -3110,13 +3488,13 @@ find-cache-dir@^1.0.0: make-dir "^1.0.0" pkg-dir "^2.0.0" -find-cache-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d" - integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA== +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== dependencies: commondir "^1.0.1" - make-dir "^1.0.0" + make-dir "^2.0.0" pkg-dir "^3.0.0" find-up@^1.0.0: @@ -3127,7 +3505,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0, find-up@^2.1.0: +find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -3151,6 +3529,20 @@ flat-cache@^1.2.1: rimraf "~2.6.2" write "^0.2.1" +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== + dependencies: + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" + +flatted@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" + integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + flush-write-stream@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" @@ -3166,18 +3558,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.3.0: dependencies: debug "=3.1.0" -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3221,15 +3606,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -friendly-errors-webpack-plugin@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136" - integrity sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw== - dependencies: - chalk "^1.1.3" - error-stack-parser "^2.0.0" - string-width "^2.0.0" - from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" @@ -3269,7 +3645,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.0.0, fsevents@^1.2.2: +fsevents@^1.2.2: version "1.2.6" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.6.tgz#d3a1864a71876a2eb9b244e3bd8f606eb09568c0" integrity sha512-BalK54tfK0pMC0jQFb2oHn1nz7JNQD/2ex5pBnCHgBi2xG7VV0cAOGy2RS2VbCqUXx5/6obMrMcQTJ8yjcGzbg== @@ -3277,6 +3653,14 @@ fsevents@^1.0.0, fsevents@^1.2.2: nan "^2.9.2" node-pre-gyp "^0.10.0" +fsevents@^1.2.7: + version "1.2.9" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" + integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + dependencies: + nan "^2.12.1" + node-pre-gyp "^0.12.0" + function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3306,6 +3690,11 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" @@ -3323,6 +3712,13 @@ get-stream@^4.0.0: dependencies: pump "^3.0.0" +get-stream@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" + integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -3335,21 +3731,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - dependencies: - is-glob "^2.0.0" - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -3387,6 +3768,18 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" @@ -3400,6 +3793,11 @@ globals@^11.0.1, globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ== +globals@^11.7.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -3423,18 +3821,19 @@ globby@^7.1.1: pify "^3.0.0" slash "^1.0.0" -globby@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d" - integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w== +globby@^9.2.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" + integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== dependencies: - array-union "^1.0.1" - dir-glob "2.0.0" - fast-glob "^2.0.2" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" + "@types/glob" "^7.1.1" + array-union "^1.0.2" + dir-glob "^2.2.2" + fast-glob "^2.2.6" + glob "^7.1.3" + ignore "^4.0.3" + pify "^4.0.1" + slash "^2.0.0" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" @@ -3573,6 +3972,11 @@ highlight.js@^9.12.0: resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e" integrity sha512-Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A== +highlight.js@^9.6.0: + version "9.15.10" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2" + integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw== + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -3582,11 +3986,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoek@6.x.x: - version "6.1.2" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6" - integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q== - hoopy@^0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" @@ -3629,7 +4028,7 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" -html-entities@^1.2.0: +html-entities@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= @@ -3685,27 +4084,49 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-parser-js@>=0.4.0: version "0.5.0" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8" integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w== -http-proxy-middleware@~0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab" - integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q== +http-proxy-middleware@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" + integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== dependencies: - http-proxy "^1.16.2" + http-proxy "^1.17.0" is-glob "^4.0.0" - lodash "^4.17.5" - micromatch "^3.1.9" + lodash "^4.17.11" + micromatch "^3.1.10" -http-proxy@^1.16.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" - integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g== +http-proxy@^1.17.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" + integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== dependencies: - eventemitter3 "^3.0.0" + eventemitter3 "^4.0.0" follow-redirects "^1.0.0" requires-port "^1.0.0" @@ -3730,7 +4151,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3766,11 +4187,16 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6: +ignore@^3.3.3, ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== +ignore@^4.0.3, ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -3786,6 +4212,14 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +import-fresh@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" + integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-from@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" @@ -3811,10 +4245,10 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= +infer-owner@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== inflight@^1.0.4: version "1.0.6" @@ -3834,6 +4268,11 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= +inherits@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -3859,13 +4298,32 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -internal-ip@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27" - integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q== +inquirer@^6.2.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: - default-gateway "^2.6.0" - ipaddr.js "^1.5.2" + ansi-escapes "^3.2.0" + chalk "^2.4.2" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^3.0.3" + figures "^2.0.0" + lodash "^4.17.12" + mute-stream "0.0.7" + run-async "^2.2.0" + rxjs "^6.4.0" + string-width "^2.1.0" + strip-ansi "^5.1.0" + through "^2.3.6" + +internal-ip@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" + integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== + dependencies: + default-gateway "^4.2.0" + ipaddr.js "^1.9.0" interpret@^1.0.1: version "1.2.0" @@ -3902,16 +4360,26 @@ ipaddr.js@1.8.0: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4= -ipaddr.js@^1.5.2: - version "1.8.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427" - integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc= +ipaddr.js@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" + integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== + +ipaddr.js@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= +is-absolute-url@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -3948,13 +4416,6 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74= - dependencies: - builtin-modules "^1.0.0" - is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" @@ -4021,18 +4482,6 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= - dependencies: - is-primitive "^2.0.0" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4045,11 +4494,6 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4067,13 +4511,6 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -4088,12 +4525,12 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= +is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: - kind-of "^3.0.2" + is-extglob "^2.1.1" is-number@^3.0.0: version "3.0.0" @@ -4102,34 +4539,34 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0= +is-path-cwd@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== -is-path-in-cwd@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" - integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ== +is-path-in-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" + integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== dependencies: - is-path-inside "^1.0.0" + is-path-inside "^2.1.0" -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - integrity sha1-jvW33lBDej/cprToZe96pVy0gDY= +is-path-inside@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" + integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== dependencies: - path-is-inside "^1.0.1" + path-is-inside "^1.0.2" + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" @@ -4138,16 +4575,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= - is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" @@ -4170,6 +4597,11 @@ is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + is-svg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" @@ -4189,11 +4621,6 @@ is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4214,13 +4641,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isemail@3.x.x: - version "3.2.0" - resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" - integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg== - dependencies: - punycode "2.x.x" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4248,15 +4668,6 @@ javascript-stringify@^1.6.0: resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3" integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM= -joi@^14.3.0: - version "14.3.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-14.3.1.tgz#164a262ec0b855466e0c35eea2a885ae8b6c703c" - integrity sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ== - dependencies: - hoek "6.x.x" - isemail "3.x.x" - topo "3.x.x" - js-message@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15" @@ -4279,7 +4690,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: +js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1: version "3.12.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA== @@ -4287,6 +4698,14 @@ js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.13.0, js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -4297,10 +4716,10 @@ jsdom-global@^3.0.2: resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk= -jsdom@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-13.1.0.tgz#fa7356f0cc8111d0f1077cb7800d06f22f1d66c7" - integrity sha512-C2Kp0qNuopw0smXFaHeayvharqF3kkcNqlcIlSX71+3XrsOFwkEPLt/9f5JksMmaul2JZYIQuY+WTpqHpQQcLg== +jsdom@^13.2.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-13.2.0.tgz#b1a0dbdadc255435262be8ea3723d2dba0d7eb3a" + integrity sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw== dependencies: abab "^2.0.0" acorn "^6.0.4" @@ -4317,7 +4736,7 @@ jsdom@^13.1.0: pn "^1.1.0" request "^2.88.0" request-promise-native "^1.0.5" - saxes "^3.1.4" + saxes "^3.1.5" symbol-tree "^3.2.2" tough-cookie "^2.5.0" w3c-hr-time "^1.0.1" @@ -4413,7 +4832,7 @@ just-extend@^4.0.2: resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc" integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw== -killable@^1.0.0: +killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== @@ -4479,26 +4898,10 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -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" - integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= loader-fs-cache@^1.0.0: version "1.0.1" @@ -4508,7 +4911,7 @@ loader-fs-cache@^1.0.0: find-cache-dir "^0.1.1" mkdirp "0.5.1" -loader-runner@^2.3.0: +loader-runner@^2.3.1, loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== @@ -4523,7 +4926,7 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -loader-utils@^1.0.2, loader-utils@^1.1.0: +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -4548,20 +4951,15 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.assign@^4.0.3, lodash.assign@^4.0.6: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.defaultsdeep@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81" - integrity sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E= +lodash.defaultsdeep@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" + integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== lodash.get@^4.4.2: version "4.4.2" @@ -4603,11 +5001,16 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: +lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" @@ -4615,10 +5018,10 @@ log-symbols@^2.2.0: dependencies: chalk "^2.0.1" -loglevel@^1.4.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" - integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po= +loglevel@^1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56" + integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g== lolex@^2.3.2: version "2.7.5" @@ -4657,6 +5060,19 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +mamacro@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" + integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== + map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -4681,11 +5097,6 @@ material-colors@^1.0.0: resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46" integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg== -math-random@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" - integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== - md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -4721,7 +5132,7 @@ mem@^4.0.0: mimic-fn "^1.0.0" p-is-promise "^1.1.0" -memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1: +memory-fs@^0.4.0, memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= @@ -4741,6 +5152,11 @@ merge-source-map@^1.1.0: dependencies: source-map "^0.6.1" +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + merge2@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" @@ -4751,26 +5167,7 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -4797,7 +5194,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0: +mime-db@1.40.0: + version "1.40.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" + integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== + +"mime-db@>= 1.40.0 < 2": + version "1.42.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" + integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== + +mime-db@~1.37.0: version "1.37.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg== @@ -4809,21 +5216,43 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19: dependencies: mime-db "~1.37.0" +mime-types@~2.1.24: + version "2.1.24" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" + integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + dependencies: + mime-db "1.40.0" + mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== -mime@^2.0.3, mime@^2.3.1: +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.0.3: version "2.4.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w== +mime@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -4831,12 +5260,13 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -mini-css-extract-plugin@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0" - integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw== +mini-css-extract-plugin@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9" + integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw== dependencies: loader-utils "^1.1.0" + normalize-url "^2.0.1" schema-utils "^1.0.0" webpack-sources "^1.1.0" @@ -4850,7 +5280,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -4922,36 +5352,13 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= dependencies: minimist "0.0.8" -mocha-webpack@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mocha-webpack/-/mocha-webpack-1.1.0.tgz#292158fc191641c943c1ee615329504f47c4b0ba" - integrity sha512-brmE0tR6G5JbEzZXspJmF/uZm2J/YM/69M3VS6ND76i6wXbebFpE+bQDaehilK8CZanNSsTCcqTTLh1PZuRKJw== - dependencies: - babel-runtime "^6.18.0" - chalk "^2.3.0" - chokidar "^1.6.1" - glob-parent "^3.1.0" - globby "^6.1.0" - interpret "^1.0.1" - is-glob "^4.0.0" - loader-utils "^1.1.0" - lodash "^4.3.0" - memory-fs "^0.4.1" - nodent-runtime "^3.0.3" - normalize-path "^2.0.1" - progress "^2.0.0" - source-map-support "^0.5.0" - strip-ansi "^4.0.0" - toposort "^1.0.0" - yargs "^4.8.0" - mocha-webpack@^2.0.0-beta.0: version "2.0.0-beta.0" resolved "https://registry.yarnpkg.com/mocha-webpack/-/mocha-webpack-2.0.0-beta.0.tgz#d85fc9a70f82a4ad595b7702a1181605dfa59549" @@ -5017,7 +5424,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@^2.1.1: +ms@2.1.1, ms@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== @@ -5040,6 +5447,20 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= +mz@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + nan@^2.9.2: version "2.12.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" @@ -5081,11 +5502,21 @@ negotiator@0.6.1: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk= +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + neo-async@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== +neo-async@^2.6.0, neo-async@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5109,10 +5540,10 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" -node-forge@0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" - integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ== +node-forge@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" + integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== node-ipc@^9.1.1: version "9.1.1" @@ -5123,10 +5554,10 @@ node-ipc@^9.1.1: js-message "1.0.5" js-queue "2.0.0" -node-libs-browser@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77" - integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA== +node-libs-browser@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" + integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== dependencies: assert "^1.1.1" browserify-zlib "^0.2.0" @@ -5138,7 +5569,7 @@ node-libs-browser@^2.0.0: events "^3.0.0" https-browserify "^1.0.0" os-browserify "^0.3.0" - path-browserify "0.0.0" + path-browserify "0.0.1" process "^0.11.10" punycode "^1.2.4" querystring-es3 "^0.2.0" @@ -5150,7 +5581,7 @@ node-libs-browser@^2.0.0: tty-browserify "0.0.0" url "^0.11.0" util "^0.11.0" - vm-browserify "0.0.4" + vm-browserify "^1.0.1" node-pre-gyp@^0.10.0: version "0.10.3" @@ -5168,6 +5599,29 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + +node-releases@^1.1.29: + version "1.1.33" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.33.tgz#349f10291234624574f44cf32b7de259bf028303" + integrity sha512-I0V30bWQEoHb+10W8oedVoUrdjW5wIkYm0w7vvcrPO95pZY738m1k77GF5sO0vKg5eXYg9oGtrMAETbgZGm11A== + dependencies: + semver "^5.3.0" + node-releases@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2" @@ -5188,13 +5642,13 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" @@ -5203,18 +5657,32 @@ normalize-path@^1.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k= -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: +normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= dependencies: remove-trailing-separator "^1.0.1" +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= +normalize-url@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" + integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== + dependencies: + prepend-http "^2.0.0" + query-string "^5.0.1" + sort-keys "^2.0.0" + normalize-url@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" @@ -5240,6 +5708,13 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npm-run-path@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" + integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== + dependencies: + path-key "^3.0.0" + npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -5316,14 +5791,6 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.2" es-abstract "^1.5.1" -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -5353,10 +5820,10 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -on-headers@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" - integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c= +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" @@ -5372,15 +5839,29 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" +onetime@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" + integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + dependencies: + mimic-fn "^2.1.0" + +open@^6.3.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9" + integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg== + dependencies: + is-wsl "^1.1.0" + opener@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== -opn@^5.1.0, opn@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035" - integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw== +opn@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== dependencies: is-wsl "^1.1.0" @@ -5396,16 +5877,16 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-3.0.0.tgz#8179e3525b9aafd99242d63cc206fd64732741d0" - integrity sha512-LBS97LFe2RV6GJmXBi6OKcETKyklHNMV0xw7BtsVn2MlsgsydyZetSCbCANr+PFLmDyv4KV88nn0eCKza665Mg== +ora@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" + integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg== dependencies: - chalk "^2.3.1" + chalk "^2.4.2" cli-cursor "^2.1.0" - cli-spinners "^1.1.0" + cli-spinners "^2.0.0" log-symbols "^2.2.0" - strip-ansi "^4.0.0" + strip-ansi "^5.2.0" wcwidth "^1.0.1" original@^1.0.0: @@ -5425,13 +5906,6 @@ os-homedir@^1.0.0: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -5473,6 +5947,11 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + 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" @@ -5506,10 +5985,17 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" -p-map@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-retry@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" + integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== + dependencies: + retry "^0.12.0" p-try@^1.0.0: version "1.0.0" @@ -5542,6 +6028,13 @@ param-case@2.1.x: dependencies: no-case "^2.2.0" +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + parse-asn1@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.2.tgz#13efbaaac8da669a9751a6b50a7cfccfdef756ae" @@ -5554,23 +6047,6 @@ parse-asn1@^5.0.0: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" - parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -5579,25 +6055,45 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + parse5@5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== +parse5@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" + integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== + parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M= +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo= +path-browserify@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" + integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== path-dirname@^1.0.0: version "1.0.2" @@ -5621,7 +6117,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-is-inside@^1.0.1, path-is-inside@^1.0.2: +path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= @@ -5631,6 +6127,11 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= +path-key@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3" + integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg== + path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" @@ -5648,22 +6149,6 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -5702,6 +6187,11 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -5745,7 +6235,7 @@ pn@^1.1.0: resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== -portfinder@^1.0.20, portfinder@^1.0.9: +portfinder@^1.0.20: version "1.0.20" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a" integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw== @@ -5754,12 +6244,21 @@ portfinder@^1.0.20, portfinder@^1.0.9: debug "^2.2.0" mkdirp "0.5.x" +portfinder@^1.0.24: + version "1.0.24" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa" + integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg== + dependencies: + async "^1.5.2" + debug "^2.2.0" + mkdirp "0.5.x" + 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" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-calc@^7.0.0: +postcss-calc@^7.0.0, postcss-calc@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436" integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ== @@ -5780,6 +6279,17 @@ postcss-colormin@^4.0.2: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-colormin@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" + integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== + dependencies: + browserslist "^4.0.0" + color "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-convert-values@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" @@ -5795,6 +6305,13 @@ postcss-discard-comments@^4.0.1: dependencies: postcss "^7.0.0" +postcss-discard-comments@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" + integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== + dependencies: + postcss "^7.0.0" + postcss-discard-duplicates@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" @@ -5844,6 +6361,16 @@ postcss-merge-longhand@^4.0.10: postcss-value-parser "^3.0.0" stylehacks "^4.0.0" +postcss-merge-longhand@^4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" + integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== + dependencies: + css-color-names "0.0.4" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + stylehacks "^4.0.0" + postcss-merge-rules@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz#2be44401bf19856f27f32b8b12c0df5af1b88e74" @@ -5856,6 +6383,18 @@ postcss-merge-rules@^4.0.2: postcss-selector-parser "^3.0.0" vendors "^1.0.0" +postcss-merge-rules@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" + integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + cssnano-util-same-parent "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + vendors "^1.0.0" + postcss-minify-font-values@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" @@ -5874,6 +6413,16 @@ postcss-minify-gradients@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-minify-gradients@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" + integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + is-color-stop "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-minify-params@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz#5b2e2d0264dd645ef5d68f8fec0d4c38c1cf93d2" @@ -5886,6 +6435,18 @@ postcss-minify-params@^4.0.1: postcss-value-parser "^3.0.0" uniqs "^2.0.0" +postcss-minify-params@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" + integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== + dependencies: + alphanum-sort "^1.0.0" + browserslist "^4.0.0" + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + uniqs "^2.0.0" + postcss-minify-selectors@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz#a891c197977cc37abf60b3ea06b84248b1c1e9cd" @@ -5896,6 +6457,16 @@ postcss-minify-selectors@^4.0.1: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +postcss-minify-selectors@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" + integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== + dependencies: + alphanum-sort "^1.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + postcss-modules-extract-imports@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" @@ -5943,6 +6514,15 @@ postcss-normalize-display-values@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-display-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" + integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-normalize-positions@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz#ee2d4b67818c961964c6be09d179894b94fd6ba1" @@ -5953,6 +6533,16 @@ postcss-normalize-positions@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-positions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" + integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== + dependencies: + cssnano-util-get-arguments "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-normalize-repeat-style@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz#5293f234b94d7669a9f805495d35b82a581c50e5" @@ -5963,6 +6553,16 @@ postcss-normalize-repeat-style@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-repeat-style@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" + integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-normalize-string@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz#23c5030c2cc24175f66c914fa5199e2e3c10fef3" @@ -5972,6 +6572,15 @@ postcss-normalize-string@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-string@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" + integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== + dependencies: + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-normalize-timing-functions@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz#8be83e0b9cb3ff2d1abddee032a49108f05f95d7" @@ -5981,6 +6590,15 @@ postcss-normalize-timing-functions@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-timing-functions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" + integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-normalize-unicode@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" @@ -6008,6 +6626,14 @@ postcss-normalize-whitespace@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-normalize-whitespace@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" + integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-ordered-values@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz#2e3b432ef3e489b18333aeca1f1295eb89be9fc2" @@ -6017,6 +6643,15 @@ postcss-ordered-values@^4.1.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-ordered-values@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" + integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== + dependencies: + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-reduce-initial@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz#bac8e325d67510ee01fa460676dc8ea9e3b40f15" @@ -6027,6 +6662,16 @@ postcss-reduce-initial@^4.0.2: has "^1.0.0" postcss "^7.0.0" +postcss-reduce-initial@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" + integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-reduce-transforms@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz#8600d5553bdd3ad640f43bff81eb52f8760d4561" @@ -6037,6 +6682,16 @@ postcss-reduce-transforms@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-reduce-transforms@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" + integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== + dependencies: + cssnano-util-get-match "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + postcss-selector-parser@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" @@ -6055,10 +6710,20 @@ postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-svgo@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d" - integrity sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw== +postcss-svgo@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d" + integrity sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw== + dependencies: + is-svg "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + svgo "^1.0.0" + +postcss-svgo@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" + integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== dependencies: is-svg "^3.0.0" postcss "^7.0.0" @@ -6074,11 +6739,16 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== +postcss-value-parser@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" + integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== + postcss@^6.0.1, postcss@^6.0.23: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" @@ -6088,7 +6758,7 @@ postcss@^6.0.1, postcss@^6.0.23: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5, postcss@^7.0.7: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5: version "7.0.13" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708" integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg== @@ -6097,20 +6767,29 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5, postcss@^7.0.7: source-map "^0.6.1" supports-color "^6.1.0" +postcss@^7.0.14, postcss@^7.0.17: + version "7.0.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233" + integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@1.13.7: - version "1.13.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" - integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w== +prettier@1.16.3: + version "1.16.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" + integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== pretty-error@^2.0.2: version "2.1.1" @@ -6153,6 +6832,14 @@ proxy-addr@~2.0.4: forwarded "~0.1.2" ipaddr.js "1.8.0" +proxy-addr@~2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" + integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.9.0" + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -6210,16 +6897,16 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -6230,6 +6917,20 @@ qs@6.5.2, qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +query-string@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== + dependencies: + decode-uri-component "^0.2.0" + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -6245,15 +6946,6 @@ querystringify@^2.0.0: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef" integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg== -randomatic@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" - integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" @@ -6269,7 +6961,12 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -range-parser@^1.0.3, range-parser@~1.2.0: +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= @@ -6284,6 +6981,16 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -6294,48 +7001,15 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -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" - integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -read-pkg@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237" - integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc= +read-pkg@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== dependencies: - normalize-package-data "^2.3.2" - parse-json "^4.0.0" - pify "^3.0.0" + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" @@ -6369,7 +7043,7 @@ readable-stream@^3.0.6: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readdirp@^2.0.0: +readdirp@^2.0.0, readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== @@ -6388,13 +7062,6 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - dependencies: - is-equal-shallow "^0.1.3" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -6408,6 +7075,11 @@ regexpp@^1.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw== +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" + integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== + regexpu-core@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" @@ -6455,7 +7127,7 @@ repeat-element@^1.1.2: resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -6467,6 +7139,13 @@ request-promise-core@1.1.1: dependencies: lodash "^4.13.1" +request-promise-core@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" + integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag== + dependencies: + lodash "^4.17.11" + request-promise-native@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5" @@ -6476,6 +7155,15 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" +request-promise-native@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59" + integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w== + dependencies: + request-promise-core "1.1.2" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -6517,6 +7205,11 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + require-uncached@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" @@ -6525,11 +7218,6 @@ require-uncached@^1.0.3: caller-path "^0.1.0" resolve-from "^1.0.0" -requireindex@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162" - integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI= - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -6552,12 +7240,24 @@ resolve-from@^3.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" integrity sha1-six699nWiBvItuZTM17rywoYh0g= +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.6.0: +resolve@^1.10.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== + dependencies: + path-parse "^1.0.6" + +resolve@^1.3.2: version "1.9.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== @@ -6577,6 +7277,11 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + rgb-regex@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" @@ -6587,13 +7292,20 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: +rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: glob "^7.1.3" +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -6628,6 +7340,13 @@ rx-lite@*, rx-lite@^4.0.8: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= +rxjs@^6.4.0: + version "6.5.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" + integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== + dependencies: + tslib "^1.9.0" + 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" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -6650,20 +7369,12 @@ sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^3.1.4: - version "3.1.6" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.6.tgz#2d948a47b54918516c5a64096f08865deb5bd8cd" - integrity sha512-LAYs+lChg1v5uKNzPtsgTxSS5hLo8aIhSMCJt1WMpefAxm3D1RTpMwSpb6ebdL31cubiLTnhokVktBW+cv9Y9w== +saxes@^3.1.5: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== dependencies: - xmlchars "^1.3.1" - -schema-utils@^0.4.2, schema-utils@^0.4.4: - version "0.4.7" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" - integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== - dependencies: - ajv "^6.1.0" - ajv-keywords "^3.1.0" + xmlchars "^2.1.1" schema-utils@^1.0.0: version "1.0.0" @@ -6679,14 +7390,14 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^1.9.1: - version "1.10.4" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd" - integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw== +selfsigned@^1.10.6: + version "1.10.7" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b" + integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA== dependencies: - node-forge "0.7.5" + node-forge "0.9.0" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== @@ -6696,6 +7407,16 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== +semver@^5.5.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -6715,12 +7436,36 @@ send@0.16.2: range-parser "~1.2.0" statuses "~1.4.0" +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + serialize-javascript@^1.4.0: version "1.6.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879" integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw== -serve-index@^1.7.2: +serialize-javascript@^1.7.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" + integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== + +serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= @@ -6743,6 +7488,16 @@ serve-static@1.13.2: parseurl "~1.3.2" send "0.16.2" +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + set-blocking@^2.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" @@ -6778,6 +7533,11 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -6850,6 +7610,15 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== + dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" + is-fullwidth-code-point "^2.0.0" + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -6880,10 +7649,10 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -sockjs-client@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177" - integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg== +sockjs-client@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" + integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== dependencies: debug "^3.2.5" eventsource "^1.0.7" @@ -6900,6 +7669,13 @@ sockjs@0.3.19: faye-websocket "^0.10.0" uuid "^3.0.1" +sort-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" + integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= + dependencies: + is-plain-obj "^1.0.0" + source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -6916,7 +7692,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.0, source-map-support@~0.5.6: +source-map-support@^0.5.0: version "0.5.10" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ== @@ -6924,6 +7700,14 @@ source-map-support@^0.5.0, source-map-support@~0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@~0.5.12: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -6939,11 +7723,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - spdx-correct@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" @@ -6982,10 +7761,10 @@ spdy-transport@^3.0.0: readable-stream "^3.0.6" wbuf "^1.7.3" -spdy@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52" - integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q== +spdy@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2" + integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA== dependencies: debug "^4.1.0" handle-thing "^2.0.0" @@ -7052,7 +7831,7 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.4.0 < 2": +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -7062,7 +7841,7 @@ statuses@~1.4.0: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== -stealthy-require@^1.1.0: +stealthy-require@^1.1.0, stealthy-require@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= @@ -7099,6 +7878,11 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= +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" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -7116,6 +7900,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string.prototype.padend@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" @@ -7167,29 +7960,29 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: - is-utf8 "^0.2.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + ansi-regex "^4.1.0" strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= +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" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + strip-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@~2.0.1: +strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= @@ -7215,7 +8008,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: +supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -7266,11 +8059,26 @@ table@4.0.2: slice-ansi "1.0.0" string-width "^2.1.1" -tapable@^1.0.0, tapable@^1.1.0: +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== + dependencies: + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" + +tapable@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA== +tapable@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== + tar@^4: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -7284,47 +8092,62 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26" - integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw== +terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" + integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg== dependencies: - cacache "^11.0.2" - find-cache-dir "^2.0.0" + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^1.4.0" + serialize-javascript "^1.7.0" source-map "^0.6.1" - terser "^3.8.1" - webpack-sources "^1.1.0" - worker-farm "^1.5.2" + terser "^4.1.2" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" -terser@^3.8.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz#cc4764014af570bc79c79742358bd46926018a32" - integrity sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw== +terser@^4.1.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.4.tgz#ad91bade95619e3434685d69efa621a5af5f877d" + integrity sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q== dependencies: - commander "~2.17.1" + commander "^2.20.0" source-map "~0.6.1" - source-map-support "~0.5.6" + source-map-support "~0.5.12" text-encoding@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" integrity sha1-45mpgiV6J22uQou5KEXLcb3CbRk= -text-table@~0.2.0: +text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thread-loader@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-1.2.0.tgz#35dedb23cf294afbbce6c45c1339b950ed17e7a4" - integrity sha512-acJ0rvUk53+ly9cqYWNOpPqOgCkNpmHLPDGduNm4hDQWF7EDKEJXAopG9iEWsPPcml09wePkq3NF+ZUqnO6tbg== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.0" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" + integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= dependencies: - async "^2.3.0" - loader-runner "^2.3.0" + any-promise "^1.0.0" + +thread-loader@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" + integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg== + dependencies: + loader-runner "^2.3.1" loader-utils "^1.1.0" + neo-async "^2.6.0" through2@^2.0.0: version "2.0.5" @@ -7403,12 +8226,10 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -topo@3.x.x: - version "3.0.3" - resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c" - integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ== - dependencies: - hoek "6.x.x" +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== toposort@^1.0.0: version "1.0.7" @@ -7424,7 +8245,7 @@ tough-cookie@>=2.3.3: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^2.5.0: +tough-cookie@^2.3.3, tough-cookie@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -7457,10 +8278,10 @@ tryer@^1.0.0: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== -ts-loader@^5.3.2: - version "5.3.3" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473" - integrity sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA== +ts-loader@^5.3.3: + version "5.4.5" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.4.5.tgz#a0c1f034b017a9344cef0961bfd97cc192492b8b" + integrity sha512-XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw== dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" @@ -7478,31 +8299,39 @@ tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslint@^5.12.0: - version "5.12.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1" - integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw== +tslint@^5.15.0: + version "5.20.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz#fac93bfa79568a5a24e7be9cdde5e02b02d00ec1" + integrity sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g== dependencies: - babel-code-frame "^6.22.0" + "@babel/code-frame" "^7.0.0" builtin-modules "^1.1.1" chalk "^2.3.0" commander "^2.12.1" - diff "^3.2.0" + diff "^4.0.1" glob "^7.1.1" - js-yaml "^3.7.0" + js-yaml "^3.13.1" minimatch "^3.0.4" + mkdirp "^0.5.1" resolve "^1.3.2" semver "^5.3.0" tslib "^1.8.0" - tsutils "^2.27.2" + tsutils "^2.29.0" -tsutils@^2.27.2: +tsutils@^2.29.0: version "2.29.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== dependencies: tslib "^1.8.1" +tsutils@^3.17.1, tsutils@^3.7.0: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + dependencies: + tslib "^1.8.1" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -7532,6 +8361,11 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" @@ -7540,32 +8374,23 @@ type-is@~1.6.16: media-typer "0.3.0" mime-types "~2.1.18" +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-eslint-parser@^21.0.1: - version "21.0.2" - resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-21.0.2.tgz#270af10e4724528677fbcf34ea495284bec3a894" - integrity sha512-u+pj4RVJBr4eTzj0n5npoXD/oRthvfUCjSKndhNI714MG0mQq2DJw5WP7qmonRNIFgmZuvdDOH3BHm9iOjIAfg== - dependencies: - eslint-scope "^4.0.0" - eslint-visitor-keys "^1.0.0" - typescript-estree "5.3.0" - -typescript-estree@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/typescript-estree/-/typescript-estree-5.3.0.tgz#fb6c977b5e21073eb16cbdc0338a7f752da99ff5" - integrity sha512-Vu0KmYdSCkpae+J48wsFC1ti19Hq3Wi/lODUaE+uesc3gzqhWbZ5itWbsjylLVbjNW4K41RqDzSfnaYNbmEiMQ== - dependencies: - lodash.unescape "4.0.1" - semver "5.5.0" - -typescript@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" - integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== +typescript@^3.4.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" + integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== uglify-js@3.4.x: version "3.4.9" @@ -7637,6 +8462,11 @@ upath@^1.0.5: resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== +upath@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== + upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" @@ -7758,12 +8588,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm-browserify@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" - integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM= - dependencies: - indexof "0.0.1" +vm-browserify@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" + integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw== vue-class-component@^6.0.0, vue-class-component@^6.2.0: version "6.3.2" @@ -7792,17 +8620,29 @@ vue-eslint-parser@^2.0.3: esquery "^1.0.0" lodash "^4.17.4" +vue-eslint-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1" + integrity sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g== + dependencies: + debug "^4.1.0" + eslint-scope "^4.0.0" + eslint-visitor-keys "^1.0.0" + espree "^4.1.0" + esquery "^1.0.1" + lodash "^4.17.11" + vue-hot-reload-api@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2" integrity sha512-AA86yKZ5uOKz87/q1UpngEXhbRkaYg1b7HMMVRobNV1IVKqZe8oLIzo6iMocVwZXnYitlGwf2k4ZRLOZlS8oPQ== -vue-loader@^15.4.2: - version "15.5.1" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.5.1.tgz#e005d5fc2481a55a19910f0dcf434206d68acc2a" - integrity sha512-gsTA9xRzu9jGBzkcrAB8my14RkHMzdr5rY/mCFmxgY2tOVsd2Z1MaYCDXHu5nX6PyHAsVK2/hXmarPln/2MiIw== +vue-loader@^15.7.0: + version "15.7.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd" + integrity sha512-fwIKtA23Pl/rqfYP5TSGK7gkEuLhoTvRYW+TU7ER3q9GpNLt/PjG5NLv3XHRDiTg7OPM1JcckBgds+VnAc+HbA== dependencies: - "@vue/component-compiler-utils" "^2.4.0" + "@vue/component-compiler-utils" "^3.0.0" hash-sum "^1.0.2" loader-utils "^1.1.0" vue-hot-reload-api "^2.3.0" @@ -7841,10 +8681,10 @@ vue-template-compiler@^2.5.16: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.6.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.1.tgz#e2ec4f42d16b6c712e61899c6b20bcdb1df128ca" - integrity sha512-mxBBMuSaPG9+NkVMbh28r8gvWQJ8UXxqDxVNeLy2KBUZiSNxZsagjYwLL8gjROb4oaaYtwRv3K8gAmw76I/U7Q== +vue-template-es2015-compiler@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" + integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== vue@^2.5.16: version "2.5.22" @@ -7884,7 +8724,7 @@ w3c-xmlserializer@^1.0.1: webidl-conversions "^4.0.2" xml-name-validator "^3.0.0" -watchpack@^1.5.0: +watchpack@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== @@ -7912,12 +8752,13 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webpack-bundle-analyzer@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz#dbc7fff8f52058b6714a20fddf309d0790e3e0a0" - integrity sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw== +webpack-bundle-analyzer@^3.3.0: + version "3.5.2" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz#ac02834f4b31de8e27d71e6c7a612301ebddb79f" + integrity sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A== dependencies: - acorn "^5.7.3" + acorn "^6.0.7" + acorn-walk "^6.1.1" bfj "^6.1.1" chalk "^2.4.1" commander "^2.18.0" @@ -7925,7 +8766,7 @@ webpack-bundle-analyzer@^3.0.3: express "^4.16.3" filesize "^3.6.1" gzip-size "^5.0.0" - lodash "^4.17.10" + lodash "^4.17.15" mkdirp "^0.5.1" opener "^1.5.1" ws "^6.0.0" @@ -7938,51 +8779,55 @@ webpack-chain@^4.11.0: deepmerge "^1.5.2" javascript-stringify "^1.6.0" -webpack-dev-middleware@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890" - integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA== +webpack-dev-middleware@^3.7.1: + version "3.7.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" + integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== dependencies: - memory-fs "~0.4.1" - mime "^2.3.1" - range-parser "^1.0.3" + memory-fs "^0.4.1" + mime "^2.4.4" + mkdirp "^0.5.1" + range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@^3.1.14: - version "3.1.14" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469" - integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ== +webpack-dev-server@^3.4.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.1.tgz#485b64c4aadc23f601e72114b40c1b1fea31d9f1" + integrity sha512-9F5DnfFA9bsrhpUCAfQic/AXBVHvq+3gQS+x6Zj0yc1fVVE0erKh2MV4IV12TBewuTrYeeTIRwCH9qLMvdNvTw== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" - chokidar "^2.0.0" - compression "^1.5.2" - connect-history-api-fallback "^1.3.0" - debug "^3.1.0" - del "^3.0.0" - express "^4.16.2" - html-entities "^1.2.0" - http-proxy-middleware "~0.18.0" + chokidar "^2.1.8" + compression "^1.7.4" + connect-history-api-fallback "^1.6.0" + debug "^4.1.1" + del "^4.1.1" + express "^4.17.1" + html-entities "^1.2.1" + http-proxy-middleware "^0.19.1" import-local "^2.0.0" - internal-ip "^3.0.1" + internal-ip "^4.3.0" ip "^1.1.5" - killable "^1.0.0" - loglevel "^1.4.1" - opn "^5.1.0" - portfinder "^1.0.9" + is-absolute-url "^3.0.2" + killable "^1.0.1" + loglevel "^1.6.4" + opn "^5.5.0" + p-retry "^3.0.1" + portfinder "^1.0.24" schema-utils "^1.0.0" - selfsigned "^1.9.1" - semver "^5.6.0" - serve-index "^1.7.2" + selfsigned "^1.10.6" + semver "^6.3.0" + serve-index "^1.9.1" sockjs "0.3.19" - sockjs-client "1.3.0" - spdy "^4.0.0" - strip-ansi "^3.0.0" - supports-color "^5.1.0" + sockjs-client "1.4.0" + spdy "^4.0.1" + strip-ansi "^3.0.1" + supports-color "^6.1.0" url "^0.11.0" - webpack-dev-middleware "3.4.0" + webpack-dev-middleware "^3.7.1" webpack-log "^2.0.0" - yargs "12.0.2" + ws "^6.2.1" + yargs "12.0.5" webpack-log@^2.0.0: version "2.0.0" @@ -7992,14 +8837,14 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@^4.1.5: - version "4.2.1" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4" - integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw== +webpack-merge@^4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" + integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== dependencies: - lodash "^4.17.5" + lodash "^4.17.15" -webpack-sources@^1.1.0, webpack-sources@^1.3.0: +webpack-sources@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85" integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA== @@ -8007,35 +8852,42 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4: - version "4.28.4" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0" - integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/wasm-edit" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - chrome-trace-event "^1.0.0" +webpack-sources@^1.4.0, webpack-sources@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack@^4.0.0, webpack@^4.41.0: + version "4.41.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b" + integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g== + dependencies: + "@webassemblyjs/ast" "1.8.5" + "@webassemblyjs/helper-module-context" "1.8.5" + "@webassemblyjs/wasm-edit" "1.8.5" + "@webassemblyjs/wasm-parser" "1.8.5" + acorn "^6.2.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" enhanced-resolve "^4.1.0" - eslint-scope "^4.0.0" + eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" - node-libs-browser "^2.0.0" - schema-utils "^0.4.4" - tapable "^1.1.0" - terser-webpack-plugin "^1.1.0" - watchpack "^1.5.0" - webpack-sources "^1.3.0" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.1" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.1" + watchpack "^1.6.0" + webpack-sources "^1.4.1" websocket-driver@>=0.5.1: version "0.7.0" @@ -8071,11 +8923,6 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= - which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -8095,20 +8942,15 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= - wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -worker-farm@^1.5.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0" - integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ== +worker-farm@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" + integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== dependencies: errno "~0.1.7" @@ -8120,11 +8962,27 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== + dependencies: + mkdirp "^0.5.1" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -8139,20 +8997,22 @@ ws@^6.0.0, ws@^6.1.2: dependencies: async-limiter "~1.0.0" +ws@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xmlchars@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf" - integrity sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw== - -xregexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" - integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== +xmlchars@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" @@ -8179,20 +9039,21 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" - integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== dependencies: - camelcase "^4.1.0" + camelcase "^5.0.0" + decamelize "^1.2.0" -yargs-parser@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" - integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ= +yargs-parser@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== dependencies: - camelcase "^3.0.0" - lodash.assign "^4.0.6" + camelcase "^5.0.0" + decamelize "^1.2.0" yargs-parser@^9.0.2: version "9.0.2" @@ -8201,13 +9062,13 @@ yargs-parser@^9.0.2: dependencies: camelcase "^4.1.0" -yargs@12.0.2: - version "12.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" - integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ== +yargs@12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== dependencies: cliui "^4.0.0" - decamelize "^2.0.0" + decamelize "^1.2.0" find-up "^3.0.0" get-caller-file "^1.0.1" os-locale "^3.0.0" @@ -8217,7 +9078,7 @@ yargs@12.0.2: string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1 || ^4.0.0" - yargs-parser "^10.1.0" + yargs-parser "^11.1.1" yargs@^11.0.0: version "11.1.0" @@ -8237,25 +9098,21 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^4.8.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" - integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA= +yargs@^13.0.0: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" + integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== dependencies: - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - lodash.assign "^4.0.3" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^1.0.1" - which-module "^1.0.0" - window-size "^0.2.0" - y18n "^3.2.1" - yargs-parser "^2.4.1" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.1" yorkie@^2.0.0: version "2.0.0" -- GitLab From 4cb7711c8877b81bfb9257b5e5a9f9e789cf2634 Mon Sep 17 00:00:00 2001 From: Dominik Seeger <dominik.seeger@gmx.net> Date: Sat, 12 Oct 2019 13:51:32 +0200 Subject: [PATCH 2/2] fixed linter warnings --- frontend/src/components/BaseLayout.vue | 13 +++- frontend/src/components/ImportDialog.vue | 71 ++++++++++++------- frontend/src/components/UserOptions.vue | 7 +- .../feedback_labels/FeedbackLabelForm.vue | 6 +- .../submission_notes/SubmissionCorrection.vue | 4 +- .../submission_notes/base/FeedbackComment.vue | 6 +- .../AnnotatedSubmissionTopToolbar.vue | 13 ++-- frontend/src/components/util/FileSelect.vue | 6 +- frontend/src/pages/StartPageSelector.vue | 2 +- .../src/pages/reviewer/ReviewerStartPage.vue | 32 ++++++--- 10 files changed, 100 insertions(+), 60 deletions(-) diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index 4c8f897c..863db3b9 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -90,8 +90,17 @@ <v-spacer /> <slot name="toolbar-center" /> <div class="toolbar-content"> - <v-menu bottom offset-y v-if="!isStudent"> - <v-btn id="user-options" slot="activator" color="cyan" style="text-transform: none"> + <v-menu + v-if="!isStudent" + bottom + offset-y + > + <v-btn + id="user-options" + slot="activator" + color="cyan" + style="text-transform: none" + > {{ userRole }} | {{ username }} <v-icon>arrow_drop_down</v-icon> </v-btn> <user-options diff --git a/frontend/src/components/ImportDialog.vue b/frontend/src/components/ImportDialog.vue index 1f88e5cd..c6c46935 100644 --- a/frontend/src/components/ImportDialog.vue +++ b/frontend/src/components/ImportDialog.vue @@ -1,7 +1,12 @@ <template> - <v-dialog v-model="show" width="30%"> + <v-dialog + v-model="show" + width="30%" + > <v-card> - <v-card-title class="title">Import data</v-card-title> + <v-card-title class="title"> + Import data + </v-card-title> <v-card-text> <p> You can use this component to import data into Grady. @@ -12,22 +17,36 @@ >rusty-hektor</a> to convert and pseudonomize ILIAS output. </p> - <file-select v-model="hektorFile" display-text="Select json file" /> + <file-select + v-model="hektorFile" + display-text="Select json file" + /> </v-card-text> <v-card-actions> - <v-btn @click="submitData" :loading="loading" id="submit-import">Import</v-btn> - <v-btn @click="$emit('hide')" color="red">Cancel</v-btn> + <v-btn + id="submit-import" + :loading="loading" + @click="submitData" + > + Import + </v-btn> + <v-btn + color="red" + @click="$emit('hide')" + > + Cancel + </v-btn> </v-card-actions> </v-card> </v-dialog> </template> <script> - import FileSelect from "@/components/util/FileSelect.vue"; - import { importData } from "@/api"; + import FileSelect from '@/components/util/FileSelect.vue' + import { importData } from '@/api' export default { - name: "ImportDialog", + name: 'ImportDialog', components: { FileSelect }, @@ -36,14 +55,21 @@ show: true, loading: false, hektorFile: null - }; + } + }, + watch: { + show(val) { + if (!val) { + this.$emit('hide') + } + } }, methods: { async submitData() { this.loading = true - let data; + let data try { - data = await this.readFile(); + data = await this.readFile() data = JSON.parse(data) } catch (error) { this.$notify({ @@ -67,25 +93,18 @@ } }, readFile() { - const fileReader = new FileReader(); + const fileReader = new FileReader() return new Promise((resolve, reject) => { fileReader.onload = event => { - resolve(event.target.result); - }; + resolve(event.target.result) + } fileReader.onerror = () => { - fileReader.abort(); - reject(new Error("Problem parsing input file.")); - }; + fileReader.abort() + reject(new Error('Problem parsing input file.')) + } fileReader.readAsText(this.hektorFile) - }); - } - }, - watch: { - show(val) { - if (!val) { - this.$emit("hide"); - } + }) } } - }; + } </script> diff --git a/frontend/src/components/UserOptions.vue b/frontend/src/components/UserOptions.vue index 7dbab930..f5c92ccc 100644 --- a/frontend/src/components/UserOptions.vue +++ b/frontend/src/components/UserOptions.vue @@ -4,7 +4,6 @@ <template v-for="(opt, i) in userOptions"> <v-list-tile v-if="opt.condition()" - @click="opt.action" :id="opt.id" :key="i" @click="opt.action" @@ -37,19 +36,19 @@ export default { display: 'Change password', action: () => { this.displayComponent = PasswordChangeDialog }, condition: () => !Authentication.isStudent, - id: "change-password-list-tile" + id: 'change-password-list-tile' }, { display: 'Free all reserved submissions', action: deleteAllActiveAssignments, condition: () => Authentication.isReviewer, - id: "free-assignments-list-tile" + id: 'free-assignments-list-tile' }, { display: 'Import data', action: () => { this.displayComponent = ImportDialog }, condition: () => Authentication.isReviewer, - id: "import-data-list-tile" + id: 'import-data-list-tile' } ] } diff --git a/frontend/src/components/feedback_labels/FeedbackLabelForm.vue b/frontend/src/components/feedback_labels/FeedbackLabelForm.vue index 45295f57..1f8311bb 100644 --- a/frontend/src/components/feedback_labels/FeedbackLabelForm.vue +++ b/frontend/src/components/feedback_labels/FeedbackLabelForm.vue @@ -75,9 +75,9 @@ import { FeedbackLabels } from '@/store/modules/feedback-labels' } }) export default class FeedbackLabelForm extends Vue { - @Prop({ type: String, default: "" }) readonly name!: string - @Prop({ type: String, default: "" }) readonly description!: string - @Prop({ type: String, default: "#4D4D4D" }) readonly colour!: string + @Prop({ type: String, default: '' }) readonly name!: string + @Prop({ type: String, default: '' }) readonly description!: string + @Prop({ type: String, default: '#4D4D4D' }) readonly colour!: string @Prop({ type: Number, required: false }) readonly pk!: number @Prop({ type: Boolean, default: false }) readonly is_update!: boolean diff --git a/frontend/src/components/submission_notes/SubmissionCorrection.vue b/frontend/src/components/submission_notes/SubmissionCorrection.vue index 344607b0..ac298e83 100644 --- a/frontend/src/components/submission_notes/SubmissionCorrection.vue +++ b/frontend/src/components/submission_notes/SubmissionCorrection.vue @@ -3,7 +3,7 @@ <base-annotated-submission> <annotated-submission-top-toolbar slot="header" - :ofStudent="submissionObj && submissionObj.ofStudent" + :of-student="submissionObj && submissionObj.ofStudent" /> <template id="sub-lines" @@ -26,7 +26,7 @@ v-for="(comment, index) in getSortedComments(lineNo)" :key="index" v-bind="comment" - :visible-to-student="updatedFeedback[lineNo] ? false : comment.visibleToStudent" + :visible-to-student-bool="updatedFeedback[lineNo] ? false : comment.visibleToStudent" :line-no="lineNo" :deletable="comment.ofTutor === user || isReviewer" @click.native="toggleEditorOnLine(lineNo, comment)" diff --git a/frontend/src/components/submission_notes/base/FeedbackComment.vue b/frontend/src/components/submission_notes/base/FeedbackComment.vue index ec60c19a..cda8c009 100644 --- a/frontend/src/components/submission_notes/base/FeedbackComment.vue +++ b/frontend/src/components/submission_notes/base/FeedbackComment.vue @@ -19,7 +19,7 @@ class="visibility-icon" > <v-tooltip - v-if="visibleToStudent" + v-if="visibleToStudentBool" top size="20px" > @@ -181,7 +181,7 @@ export default { type: Boolean, default: false }, - visibleToStudent: { + visibleToStudentBool: { type: Boolean, default: true }, @@ -197,7 +197,7 @@ export default { computed: { commentDisplayable () { return this.text !== '' }, showLabels () { - return this.visibleToStudent && + return this.visibleToStudentBool && (this.getUnchangedLabels().length > 0 || this.getAddedLabels().length > 0 || this.getRemovedLabels().length > 0) diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue index 624c6550..28134dba 100644 --- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue +++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionTopToolbar.vue @@ -12,9 +12,9 @@ > <correction-help-card /> </v-dialog> - <span class="title">Submission of {{ofStudent}}</span> - <toggle-feedback-visibility-button/> - <v-spacer/> + <span class="title">Submission of {{ ofStudent }}</span> + <toggle-feedback-visibility-button /> + <v-spacer /> <v-tooltip top> <v-btn slot="activator" @@ -36,19 +36,16 @@ import { SubmissionNotes } from '@/store/modules/submission-notes' export default { name: 'AnnotatedSubmissionTopToolbar', + name: 'annotated-submission-top-toolbar', components: { ToggleFeedbackVisibilityButton, CorrectionHelpCard }, -<<<<<<< HEAD - name: 'annotated-submission-top-toolbar', props: { ofStudent: { type: String, - default: "Participant" + default: 'Participant' } }, -======= ->>>>>>> 8db1f18... setup eslint to also lint vue templates data () { return { helpDialog: false, diff --git a/frontend/src/components/util/FileSelect.vue b/frontend/src/components/util/FileSelect.vue index aa69753a..b8692045 100644 --- a/frontend/src/components/util/FileSelect.vue +++ b/frontend/src/components/util/FileSelect.vue @@ -4,7 +4,11 @@ <span v-if="value">Selected: {{ value.name }}</span> <span v-else>{{ displayText }}</span> </div> - <input id="file-input" type="file" @change="handleFileChange"/> + <input + id="file-input" + type="file" + @change="handleFileChange" + > </label> </template> diff --git a/frontend/src/pages/StartPageSelector.vue b/frontend/src/pages/StartPageSelector.vue index 77f4ed7b..85edbc66 100644 --- a/frontend/src/pages/StartPageSelector.vue +++ b/frontend/src/pages/StartPageSelector.vue @@ -1,5 +1,5 @@ <template> - <component :is="startPage"/> + <component :is="startPage" /> </template> <script> diff --git a/frontend/src/pages/reviewer/ReviewerStartPage.vue b/frontend/src/pages/reviewer/ReviewerStartPage.vue index a850703d..39df51b4 100644 --- a/frontend/src/pages/reviewer/ReviewerStartPage.vue +++ b/frontend/src/pages/reviewer/ReviewerStartPage.vue @@ -1,8 +1,15 @@ <template> <div v-if="dataLoaded"> - <v-layout row wrap> - <v-flex lg5 md9 xs12> - <correction-statistics class="ma-4"></correction-statistics> + <v-layout + row + wrap + > + <v-flex + lg5 + md9 + xs12 + > + <correction-statistics class="ma-4" /> </v-flex> <v-flex lg5 @@ -14,7 +21,11 @@ </v-layout> <SubmissionTypesOverview class="ma-4" /> </div> - <v-layout v-else justify-center class="mt-4 pt-4"> + <v-layout + v-else + justify-center + class="mt-4 pt-4" + > <import-dialog v-if="showImportDialog" @hide="showImportDialog = false" @@ -29,7 +40,12 @@ Would you like to import some? </v-card-text> <v-card-actions class="justify-center"> - <v-btn @click="showImportDialog = true" class="info">Import data</v-btn> + <v-btn + class="info" + @click="showImportDialog = true" + > + Import data + </v-btn> </v-card-actions> </v-card> </v-layout> @@ -45,13 +61,12 @@ import { Subscriptions } from '../../store/modules/subscriptions' export default { name: 'ReviewerStartPage', + name: 'reviewer-start-page', components: { ImportDialog, SubmissionTypesOverview, SubscriptionList, -<<<<<<< HEAD CorrectionStatistics }, - name: 'reviewer-start-page', data: () => { return { showImportDialog: false, @@ -69,9 +84,6 @@ export default { Subscriptions.RESET_STATE() } } -======= - CorrectionStatistics } ->>>>>>> 8db1f18... setup eslint to also lint vue templates } </script> -- GitLab