From 79331936f6d7c9eee6f2725981518dbf80c56db7 Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:07:18 -0500 Subject: [PATCH 001/119] Fixed failing manual search tests (#1113) * fixed search.ts * added search.ts to no-auth tests * remove duplicated tests in no-auth --- cypress/integration/manualTests/search.ts | 17 ++++++++++++----- package.json | 6 +++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/cypress/integration/manualTests/search.ts b/cypress/integration/manualTests/search.ts index 2d12acdb9e..3963dbf986 100644 --- a/cypress/integration/manualTests/search.ts +++ b/cypress/integration/manualTests/search.ts @@ -11,11 +11,11 @@ describe('Admin UI', () => { it('should be able to select facet', () => { cy.get('mat-checkbox').parent().contains('workflow').click(); cy.contains('the Entry Type is workflow'); - cy.url().should('include', '/search?_type=workflow'); + cy.url().should('include', '/search?_index=workflow'); }); it('should be able to handle the back button', () => { cy.go('back'); - cy.url().should('not.include', '/search?_type=workflow'); + cy.url().should('not.include', '/search?_index=workflow'); cy.contains('the Entry Type is workflow').should('not.exist'); }); it('should be able to use basic search box and have suggestions', () => { @@ -29,19 +29,26 @@ describe('Admin UI', () => { cy.contains('Reset Filters').click(); cy.url().should('include', '/search'); }); + it('should remember paginator setting', () => { cy.contains('Items per page'); - cy.contains('1 - 10'); + cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('.mat-paginator-range-label').contains('10 of'); + }); cy.get('[data-cy=search-tool-table-paginator]').contains(10).should('be.visible').click(); cy.get('mat-option').contains(20).click(); cy.get('[data-cy=search-tool-table-paginator]').within(() => { cy.get('.mat-paginator-navigation-next').click(); }); - cy.contains('21 - 40'); + cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('.mat-paginator-range-label').contains('40 of'); + }); cy.get('[data-cy=search-tool-table-paginator]').contains(20); cy.get('a').contains('Organizations').click(); cy.go('back'); - cy.contains('21 - 40'); + cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('.mat-paginator-range-label').contains('40 of'); + }); cy.get('[data-cy=search-tool-table-paginator]').contains(20); cy.contains('pancancer/pcawg-dkfz-workflow').should('not.exist'); }); diff --git a/package.json b/package.json index 0260949206..13a12eaec4 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "test": "npx ng test", "lint": "npx ng lint", "e2e": "npx ng e2e", - "test-dev-no-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts\"", - "test-staging-no-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts\"", - "test-prod-no-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts\"", + "test-dev-no-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", + "test-staging-no-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", + "test-prod-no-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", "test-dev-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/auth-tests.ts\"", "test-staging-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/auth-tests.ts\"", "test-prod-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/auth-tests.ts\"" From 4e1ad18bed74884f9a8f814279f9e716a02dc177 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Tue, 24 Nov 2020 11:32:42 -0500 Subject: [PATCH 002/119] Fix alt images (#1102) --- src/app/sponsors/sponsors.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/sponsors/sponsors.component.html b/src/app/sponsors/sponsors.component.html index 315bb46bf8..bc1482e117 100644 --- a/src/app/sponsors/sponsors.component.html +++ b/src/app/sponsors/sponsors.component.html @@ -33,7 +33,7 @@
Workflow Languages
- +
From fa0eccc737bbd32a4979d07249508b4b2e11a1f8 Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Mon, 30 Nov 2020 13:11:28 -0500 Subject: [PATCH 003/119] feature/1781/upgrade to elasticsearch 7 (#1110) * update ES queries * changes * use query parameters to search only tools or workflows * remove unused constant * changes * added function to stub * corrected stub function * change to comment --- src/app/search/query-builder.service.ts | 9 ++++ src/app/search/search.component.ts | 69 ++++++++++++++++++++----- src/app/test/service-stubs.ts | 3 ++ 3 files changed, 68 insertions(+), 13 deletions(-) diff --git a/src/app/search/query-builder.service.ts b/src/app/search/query-builder.service.ts index d1b92dcb94..2a9f0192c4 100644 --- a/src/app/search/query-builder.service.ts +++ b/src/app/search/query-builder.service.ts @@ -111,6 +111,15 @@ export class QueryBuilderService { return tableQuery; } + getResultSingleIndexQuery(query_size: number, index: string): string { + let body = bodybuilder().size(query_size); + body = this.excludeVerifiedContent(body); + body = body.query('match', '_index', index); + const builtBody = body.build(); + const singleIndexQuery = JSON.stringify(builtBody); + return singleIndexQuery; + } + /**=============================================== * Append Functions * ============================================== diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts index a12ad5b25d..17a2c35d58 100644 --- a/src/app/search/search.component.ts +++ b/src/app/search/search.component.ts @@ -70,7 +70,9 @@ export class SearchComponent implements OnInit, OnDestroy { public hits: Hit[]; // Possibly 100 workflows and 100 tools (extra +1 is used to see if there are > 200 results) - public readonly query_size = 201; + // Set to 201 if searching both queries + public readonly query_size = 101; + public readonly query_size_full = 201; searchTerm = false; /** a map from a field (like _type or author) in elastic search to specific values for that field (tool, workflow) and how many @@ -358,7 +360,7 @@ export class SearchComponent implements OnInit, OnDestroy { const advancedSearchObject = this.advancedSearchQuery.getValue().advancedSearch; const values = this.advancedSearchQuery.getValue().searchText; const sideBarQuery = this.queryBuilderService.getSidebarQuery( - this.query_size, + this.query_size_full, values, advancedSearchObject, this.searchTerm, @@ -366,16 +368,24 @@ export class SearchComponent implements OnInit, OnDestroy { this.filters, this.sortModeMap ); - const tableQuery = this.queryBuilderService.getResultQuery( - this.query_size, - values, - advancedSearchObject, - this.searchTerm, - this.filters - ); - this.resetEntryOrder(); - this.updateSideBar(sideBarQuery); - this.updateResultsTable(tableQuery); + if (!values) { + const toolsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'tools'); + const workflowsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'workflows'); + this.resetEntryOrder(); + this.updateSideBar(sideBarQuery); + this.updateResultsTableSeparately(toolsQuery, workflowsQuery); + } else { + const tableQuery = this.queryBuilderService.getResultQuery( + this.query_size_full, + values, + advancedSearchObject, + this.searchTerm, + this.filters + ); + this.resetEntryOrder(); + this.updateSideBar(sideBarQuery); + this.updateResultsTable(tableQuery); + } } updateSideBar(value: string) { @@ -405,7 +415,7 @@ export class SearchComponent implements OnInit, OnDestroy { }) .then((hits) => { this.hits = hits.hits.hits; - const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size); + const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); const searchText = this.searchQuery.getValue().searchText; this.searchService.setHits(filteredHits[0], filteredHits[1]); if (searchText.length > 0 && hits) { @@ -418,6 +428,39 @@ export class SearchComponent implements OnInit, OnDestroy { .catch((error) => console.log(error)); } + /** + * Updates the results table when there is no search term + * + * @param {string} value the elastic search query + * @memberof SearchComponent + */ + updateResultsTableSeparately(toolsQuery: string, workflowsQuery: string) { + let toolHits; + let workflowHits; + // Combine array of tools and workflows to filter into results table + ELASTIC_SEARCH_CLIENT.search({ + index: 'tools', + type: 'entry', + body: toolsQuery, + }) + .then((tools) => { + toolHits = tools.hits.hits; + ELASTIC_SEARCH_CLIENT.search({ + index: 'tools', + type: 'entry', + body: workflowsQuery, + }) + .then((workflows) => { + workflowHits = workflows.hits.hits; + this.hits = toolHits.concat(workflowHits); + const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); + this.searchService.setHits(filteredHits[0], filteredHits[1]); + }) + .catch((error) => console.log(error)); + }) + .catch((error) => console.log(error)); + } + /**=============================================== * Reset Functions * ============================================== diff --git a/src/app/test/service-stubs.ts b/src/app/test/service-stubs.ts index 9ae4a96dd1..28b0048e57 100644 --- a/src/app/test/service-stubs.ts +++ b/src/app/test/service-stubs.ts @@ -111,6 +111,9 @@ export class QueryBuilderStubService { ): string { return 'thisissomefakequery'; } + getResultSingleIndexQuery(query_size: number, index: string): string { + return 'thisissomefakequery'; + } getNonVerifiedQuery(query_size: number, values: string, advancedSearchObject: AdvancedSearchObject, searchTerm: boolean, filters: any) { return 'thisissomefakequery'; } From a260bd4bf157908a3747dd513a6589786fbab258 Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Mon, 30 Nov 2020 14:02:21 -0500 Subject: [PATCH 004/119] Feature/1781/elastic search response size (#1115) * update ES queries * changes * use query parameters to search only tools or workflows * remove unused constant * changes * added function to stub * corrected stub function * change to comment * include relevant properties in _source * reenable autocomplete request * use forkjoin for querying single indices * remove whitespace --- src/app/search/query-builder.service.ts | 44 ++++++++++++------------- src/app/search/search.component.ts | 43 +++++++++++------------- src/app/search/state/search.query.ts | 2 +- src/app/test/service-stubs.ts | 2 +- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/app/search/query-builder.service.ts b/src/app/search/query-builder.service.ts index 2a9f0192c4..a738cbd274 100644 --- a/src/app/search/query-builder.service.ts +++ b/src/app/search/query-builder.service.ts @@ -65,26 +65,24 @@ export class QueryBuilderService { return body.rawOption('_source', false); } - private excludeVerifiedContent(body: any) { - // TODO: it should be possible to exclude tags and workflowVersions too - // however, it currently breaks the contents of the datatables since verified information is not aggregated by - // tool or workflow properly. - return body.rawOption('_source', { - excludes: [ - '*.content', - '*.sourceFiles', - 'description', - 'users', - 'workflowVersions.dirtyBit', - 'workflowVersions.hidden', - 'workflowVersions.last_modified', - 'workflowVersions.name', - 'workflowVersions.valid', - 'workflowVersions.workflow_path', - 'workflowVersions.workingDirectory', - 'workflowVersions.reference', - ], - }); + // These are the properties to return in the search to display the results table correctly + private sourceOptions(body: any) { + return body.rawOption('_source', [ + 'author', + 'descriptorType', + 'full_workflow_path', + 'gitUrl', + 'name', + 'namespace', + 'organization', + 'providerUrl', + 'repository', + 'starredUsers', + 'toolname', + 'tool_path', + 'verified', + 'workflowName', + ]); } getNumberOfFilters(filters: any) { @@ -103,7 +101,7 @@ export class QueryBuilderService { filters: any ): string { let tableBody = bodybuilder().size(query_size); - tableBody = this.excludeVerifiedContent(tableBody); + tableBody = this.sourceOptions(tableBody); tableBody = this.appendQuery(tableBody, values, advancedSearchObject, searchTerm); tableBody = this.appendFilter(tableBody, null, filters); const builtTableBody = tableBody.build(); @@ -111,9 +109,9 @@ export class QueryBuilderService { return tableQuery; } - getResultSingleIndexQuery(query_size: number, index: string): string { + getResultSingleIndexQuery(query_size: number, index: 'tools' | 'workflows'): string { let body = bodybuilder().size(query_size); - body = this.excludeVerifiedContent(body); + body = this.sourceOptions(body); body = body.query('match', '_index', index); const builtBody = body.build(); const singleIndexQuery = JSON.stringify(builtBody); diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts index 17a2c35d58..48646e8570 100644 --- a/src/app/search/search.component.ts +++ b/src/app/search/search.component.ts @@ -18,7 +18,7 @@ import { MatAccordion } from '@angular/material/expansion'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { faSortAlphaDown, faSortAlphaUp, faSortNumericDown, faSortNumericUp } from '@fortawesome/free-solid-svg-icons'; import { SearchResponse } from 'elasticsearch'; -import { Observable, Subject } from 'rxjs'; +import { forkJoin, Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators'; import { formInputDebounceTime } from '../shared/constants'; import { AdvancedSearchObject, initialAdvancedSearchObject } from '../shared/models/AdvancedSearchObject'; @@ -430,35 +430,32 @@ export class SearchComponent implements OnInit, OnDestroy { /** * Updates the results table when there is no search term + * We need to send one request per index + * When each index returns its results, join the results into a single array and filter into table * - * @param {string} value the elastic search query + * @param {string} toolsQuery the elastic search query for tools index + * @param {string} workflowsQuery the elastic search query for workflows index * @memberof SearchComponent */ updateResultsTableSeparately(toolsQuery: string, workflowsQuery: string) { - let toolHits; - let workflowHits; - // Combine array of tools and workflows to filter into results table - ELASTIC_SEARCH_CLIENT.search({ + const tools = ELASTIC_SEARCH_CLIENT.search({ index: 'tools', type: 'entry', body: toolsQuery, - }) - .then((tools) => { - toolHits = tools.hits.hits; - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: workflowsQuery, - }) - .then((workflows) => { - workflowHits = workflows.hits.hits; - this.hits = toolHits.concat(workflowHits); - const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); - this.searchService.setHits(filteredHits[0], filteredHits[1]); - }) - .catch((error) => console.log(error)); - }) - .catch((error) => console.log(error)); + }).catch((error) => console.log(error)); + const workflows = ELASTIC_SEARCH_CLIENT.search({ + index: 'tools', + type: 'entry', + body: workflowsQuery, + }).catch((error) => console.log(error)); + + forkJoin([tools, workflows]).subscribe((results: Array) => { + const toolHits = results[0].hits.hits; + const workflowHits = results[1].hits.hits; + this.hits = toolHits.concat(workflowHits); + const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); + this.searchService.setHits(filteredHits[0], filteredHits[1]); + }); } /**=============================================== diff --git a/src/app/search/state/search.query.ts b/src/app/search/state/search.query.ts index 198f8c9daf..fc5d001edc 100644 --- a/src/app/search/state/search.query.ts +++ b/src/app/search/state/search.query.ts @@ -65,7 +65,7 @@ export class SearchQuery extends Query { if (!tools || !workflows) { return this.TOOLS_TAB_INDEX; } - const param = this.route.snapshot.queryParams['_type']; + const param = this.route.snapshot.queryParams['_index']; if (tools.length === 0 && workflows.length > 0) { return this.WORKFLOWS_TAB_INDEX; diff --git a/src/app/test/service-stubs.ts b/src/app/test/service-stubs.ts index 28b0048e57..ab1af5906b 100644 --- a/src/app/test/service-stubs.ts +++ b/src/app/test/service-stubs.ts @@ -111,7 +111,7 @@ export class QueryBuilderStubService { ): string { return 'thisissomefakequery'; } - getResultSingleIndexQuery(query_size: number, index: string): string { + getResultSingleIndexQuery(query_size: number, index: 'tools' | 'workflows'): string { return 'thisissomefakequery'; } getNonVerifiedQuery(query_size: number, values: string, advancedSearchObject: AdvancedSearchObject, searchTerm: boolean, filters: any) { From bda83ecb0a8c2419d18f78e4042b5fdf61f55a52 Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Thu, 3 Dec 2020 16:15:20 -0500 Subject: [PATCH 005/119] update results table when facet selected (#1118) --- src/app/search/search.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts index 48646e8570..d1568fae92 100644 --- a/src/app/search/search.component.ts +++ b/src/app/search/search.component.ts @@ -368,7 +368,7 @@ export class SearchComponent implements OnInit, OnDestroy { this.filters, this.sortModeMap ); - if (!values) { + if (!values && this.filters.size === 0) { const toolsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'tools'); const workflowsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'workflows'); this.resetEntryOrder(); From d9e512c1facf7f15b33a4f5372e10255c4dcef33 Mon Sep 17 00:00:00 2001 From: latfariha <42546041+latfariha@users.noreply.github.com> Date: Fri, 4 Dec 2020 10:36:14 -0800 Subject: [PATCH 006/119] Added success message and methods (#1112) * added two methods: getIdOfNewestVersion, and getNewestVersion. Not sure if the former is necessary, also added detailed success message * here's the message, got split somehow * removed 'getIdOfNewestVersion' method and removed getNewestVersion method from both workflow and tool file editor to file-editing.ts * added 'or' statement in replacement of any keyword in getNewestVersion function * replaced some changes from when I was testing new variables * minor edits with imports and success message --- .../tool-file-editor/tool-file-editor.component.ts | 3 ++- src/app/shared/file-editing.ts | 8 ++++++++ .../workflow-file-editor.component.ts | 8 -------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/app/container/tool-file-editor/tool-file-editor.component.ts b/src/app/container/tool-file-editor/tool-file-editor.component.ts index 37076869ec..cfca4caaf5 100644 --- a/src/app/container/tool-file-editor/tool-file-editor.component.ts +++ b/src/app/container/tool-file-editor/tool-file-editor.component.ts @@ -113,7 +113,8 @@ export class ToolFileEditorComponent extends FileEditing { // Only stop editing when version change was successful (not 204) this.toggleEdit(); this.containerService.setTool(editedDockstoreTool); - this.alertService.detailedSuccess(); + const updatedVersion = this.getNewestVersion(editedDockstoreTool.workflowVersions); + this.alertService.detailedSuccess('Saved version ' + updatedVersion.name + ' of hosted entry ' + editedDockstoreTool.namespace); } else { // Probably encountered a 204 this.handleNoContentResponse(); diff --git a/src/app/shared/file-editing.ts b/src/app/shared/file-editing.ts index c8a20bbcad..0b5fdffd16 100644 --- a/src/app/shared/file-editing.ts +++ b/src/app/shared/file-editing.ts @@ -17,6 +17,7 @@ import { Directive } from '@angular/core'; import { AlertService } from './alert/state/alert.service'; import { Files } from './files'; +import { Tag, WorkflowVersion } from './swagger'; import { SourceFile } from './swagger/model/sourceFile'; @Directive() @@ -107,4 +108,11 @@ export class FileEditing extends Files { return newSourceFiles; } + /** + * Getting the newest workflowVersion based on the id + */ + + getNewestVersion(versions: Array): WorkflowVersion | Tag { + return versions.reduce((p, c) => (p.id > c.id ? p : c)); + } } diff --git a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.ts b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.ts index d83cdc50e3..6f717461a8 100644 --- a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.ts +++ b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.ts @@ -75,14 +75,6 @@ export class WorkflowFileEditorComponent extends FileEditing { getIdOfNewestVersion(versions: Array): number { return versions.reduce((max, n) => Math.max(max, n.id), this.versions[0].id); } - - /** - * Getting the newest workflowVersion based on the id - */ - getNewestVersion(versions: Array): WorkflowVersion { - return versions.reduce((p, c) => (p.id > c.id ? p : c)); - } - /** * Splits up the sourcefiles for the version into descriptor files and test parameter files */ From 75e1960be4461722fb6614b5f94fd664333dcfa6 Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Thu, 10 Dec 2020 13:55:47 -0500 Subject: [PATCH 007/119] Feature/2076/new tool tag and badges (#1116) * language badges * new tag cloud * fixed typo, added comments * remove unneeded variable * move badge styling to styles.scss --- .../search-results.component.html | 86 +++++++++++-------- .../search-results.component.scss | 34 ++++---- .../search-results.component.ts | 2 +- .../search-tool-table.component.html | 14 +-- .../search-workflow-table.component.html | 8 +- src/assets/images/dockstore/tag-cloud.svg | 23 +++++ src/styles.scss | 11 +++ 7 files changed, 118 insertions(+), 60 deletions(-) create mode 100644 src/assets/images/dockstore/tag-cloud.svg diff --git a/src/app/search/search-results/search-results.component.html b/src/app/search/search-results/search-results.component.html index 0ba7a83f16..dda9d41385 100644 --- a/src/app/search/search-results/search-results.component.html +++ b/src/app/search/search-results/search-results.component.html @@ -27,25 +27,34 @@
- -
- - +
+ +

A Tool uses a single container and performs a single action or step that is outlined by a descriptor

+ +
+ +
+ + +
+
- -

A tool is a docker container with an associated descriptor describing how to run it.

- - +
@@ -56,25 +65,34 @@
- -
- - +
+ +

A Workflow can use multiple containers and executes multiple actions or steps, outlined by one or more descriptors

+ +
+ +
+ + +
+
- -

A workflow is a series of tools strung together, with an associated descriptor describing how to run it.

- - +
diff --git a/src/app/search/search-results/search-results.component.scss b/src/app/search/search-results/search-results.component.scss index 205a5a8554..21709cdc23 100644 --- a/src/app/search/search-results/search-results.component.scss +++ b/src/app/search/search-results/search-results.component.scss @@ -23,33 +23,33 @@ mat-tab-group.homeComponent { .mat-tab-content { display: block; background-color: #fff; - margin: 3rem 1rem 2rem; + margin: 1rem 1rem 2rem; padding: 0.8rem; } +.tag-cloud-dropdown { + position: relative; + display: inline-block; +} + .tagCloud { - padding-left: 10%; - margin-bottom: 30px; - border-radius: 10px; - &.tool { - background-color: #f2faff; - box-shadow: 0 0 10px 0px #b0e0ee; - } - &.workflow { - background-color: #f2fffc; - box-shadow: 0 0 10px 0px #b0eed7; - } + position: absolute; + right: 0; + top: 3.5rem; + z-index: 1; + border-radius: 4px; + background-color: #fff; + box-shadow: 0 0 10px 0px #cfd1d7; } .tagCloud-btn { - width: 100%; + box-shadow: 1px 3px 5px 0px #cfd1d7; + color: #151c3d; + border: none; &.tool { - color: #2e629d; background-color: #aadeee; } &.workflow { - color: #198055; - background-color: #aaeed2; - border-color: #3fd999; + background-color: #b0f8e6; } } diff --git a/src/app/search/search-results/search-results.component.ts b/src/app/search/search-results/search-results.component.ts index 1fc13ec7a9..efc300f708 100644 --- a/src/app/search/search-results/search-results.component.ts +++ b/src/app/search/search-results/search-results.component.ts @@ -38,7 +38,7 @@ export class SearchResultsComponent extends Base implements OnInit { toolTagCloudData: Array; workflowTagCloudData: Array; options: CloudOptions = { - width: 600, + width: 500, height: 200, overflow: false, }; diff --git a/src/app/search/search-tool-table/search-tool-table.component.html b/src/app/search/search-tool-table/search-tool-table.component.html index a2efadb020..55bc02fcb7 100644 --- a/src/app/search/search-tool-table/search-tool-table.component.html +++ b/src/app/search/search-tool-table/search-tool-table.component.html @@ -49,11 +49,15 @@ Author {{ tool?.author || 'n/a' }} - - Format - {{ - tool?.descriptorType ? (tool?.descriptorType.toString() | uppercase) : '' - }} + + Format + +
+ + {{ language ? (language.toString() | uppercase) : '' }} + +
+ Project Links diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.html b/src/app/search/search-workflow-table/search-workflow-table.component.html index 3c22805b12..d944a475e9 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.html +++ b/src/app/search/search-workflow-table/search-workflow-table.component.html @@ -34,9 +34,11 @@ Format - {{ - workflow?.descriptorType | uppercase - }} + +
+ {{ workflow?.descriptorType | uppercase }} +
+ Project Links diff --git a/src/assets/images/dockstore/tag-cloud.svg b/src/assets/images/dockstore/tag-cloud.svg new file mode 100644 index 0000000000..64677053e5 --- /dev/null +++ b/src/assets/images/dockstore/tag-cloud.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/styles.scss b/src/styles.scss index f0e9705588..7bcd7efdb1 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1269,3 +1269,14 @@ mat-tab-group.no-pagination { font-size: smaller; color: rgba(0, 0, 0, 0.54); } + +// Styling from design mockups +// These badges are not clickable, thus different from Material Design Chips +.nonclick-badge { + border-radius: 8px; + background-color: #dfe0e2; + padding: 5px 8px; + color: #151c3d; + font-size: 1.3rem; + font-weight: 500; +} From d79e607ff1120c1891c9b07d59f29b2d2dbf835e Mon Sep 17 00:00:00 2001 From: nrzhao4 <50606789+nrzhao4@users.noreply.github.com> Date: Fri, 11 Dec 2020 12:20:26 -0500 Subject: [PATCH 008/119] changed tag cloud to popular keywords (#1122) --- cypress/integration/manualTests/basic-enduser.ts | 4 ++-- src/app/search/search-results/search-results.component.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/integration/manualTests/basic-enduser.ts b/cypress/integration/manualTests/basic-enduser.ts index 803891f7f1..8449741b22 100644 --- a/cypress/integration/manualTests/basic-enduser.ts +++ b/cypress/integration/manualTests/basic-enduser.ts @@ -111,9 +111,9 @@ describe('Test search page functionality', () => { }); it('has working tag cloud', () => { cy.get('[data-cy=tagCloud]').should('not.exist'); - cy.contains('button', 'Tag Cloud').click(); + cy.contains('button', 'Popular Keywords').click(); cy.get('[data-cy=tagCloud]').should('exist'); - cy.contains('button', 'Tag Cloud').click(); + cy.contains('button', 'Popular Keywords').click(); cy.get('[data-cy=tagCloud]').should('not.exist'); }); it('searches', () => { diff --git a/src/app/search/search-results/search-results.component.html b/src/app/search/search-results/search-results.component.html index dda9d41385..5069a48d48 100644 --- a/src/app/search/search-results/search-results.component.html +++ b/src/app/search/search-results/search-results.component.html @@ -41,7 +41,7 @@
-
+
Date: Wed, 16 Dec 2020 11:12:41 -0800 Subject: [PATCH 009/119] made some minor changes to the detailed success message (#1121) * made some minor changes to the detailed success message * changed "hosted entry" to "hosted tool" * added conditional operator to toolname * changed null to an empty string --- .../tool-file-editor/tool-file-editor.component.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/container/tool-file-editor/tool-file-editor.component.ts b/src/app/container/tool-file-editor/tool-file-editor.component.ts index cfca4caaf5..f0c0e2c4ce 100644 --- a/src/app/container/tool-file-editor/tool-file-editor.component.ts +++ b/src/app/container/tool-file-editor/tool-file-editor.component.ts @@ -114,7 +114,13 @@ export class ToolFileEditorComponent extends FileEditing { this.toggleEdit(); this.containerService.setTool(editedDockstoreTool); const updatedVersion = this.getNewestVersion(editedDockstoreTool.workflowVersions); - this.alertService.detailedSuccess('Saved version ' + updatedVersion.name + ' of hosted entry ' + editedDockstoreTool.namespace); + this.alertService.detailedSuccess( + 'Saved version ' + + updatedVersion.name + + ' of hosted tool ' + + editedDockstoreTool.name + + (editedDockstoreTool.toolname ? '/' + editedDockstoreTool.toolname : '') + ); } else { // Probably encountered a 204 this.handleNoContentResponse(); From 224a3d64d9c232604ffee1922e83825818c083fa Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Fri, 18 Dec 2020 13:32:31 -0500 Subject: [PATCH 010/119] Feature/seab 2017/angular10 (#1123) * Add ngcc postinstall * Remove all occurances of entryComponents, not needed in 10 * npx ng update @angular/core@10 @angular/cli@10 rxjs-tslint-rules --force * npx ng update @angular/material@10 @angular/flex-layout@10.0.0-beta.32 @material-extended/mde@latest --force * npm i typescript@~4.0.0 * Revert previous directive name change, add directive decorator to others * npm i ngx-window-token@latest * npm i tslib@^1.10.0 * npm i angular-tag-cloud-module@latest * npm i codelyzer@latest ngx-markdown@^10.0.0 * npm i @fortawesome/angular-fontawesome@latest * npm i rxjs@^6.5.5 * npm i tsutils-etc@1.3.2 tsutils@^3.0.0 * npm i @fortawesome/angular-fontawesome@~0.7.0 * npm i tsutils@^3.0.0 * Remove TODO * Update tslint, remove rxjs-tslint * npm i ngx-clipboard@latest tslib@^2.0.0 * Fix tslint? --- browserslist => .browserslistrc | 0 package-lock.json | 7215 +++++++++-------- package.json | 72 +- src/app/app.component.spec.ts | 53 +- src/app/app.module.ts | 7 +- src/app/banner/banner.component.spec.ts | 16 +- .../confirmation-dialog.component.ts | 2 +- .../descriptors/descriptors.component.spec.ts | 34 +- .../dockerfile/dockerfile.component.spec.ts | 26 +- ...efresh-tool-organization.component.spec.ts | 30 +- .../tool-file-editor.component.spec.ts | 72 +- .../version-modal.component.spec.ts | 36 +- src/app/docs/docs.component.spec.ts | 16 +- src/app/footer/footer.component.spec.ts | 18 +- src/app/funding/funding.component.spec.ts | 16 +- src/app/header/header.component.spec.ts | 18 +- .../home-logged-in.component.spec.ts | 21 +- .../home-logged-out/home.component.spec.ts | 20 +- src/app/home-page/home-page.component.spec.ts | 18 +- src/app/home-page/home-page.module.ts | 1 - .../widget/entries/entries.component.spec.ts | 16 +- src/app/home-page/widget/filtered-list.ts | 4 +- .../getting-started.component.spec.ts | 16 +- .../news-updates.component.spec.ts | 16 +- .../organizations.component.spec.ts | 16 +- .../requests/requests.component.spec.ts | 18 +- .../custom-header.interceptor.spec.ts | 2 +- src/app/login/login.component.spec.ts | 30 +- .../controls/controls.component.spec.ts | 26 +- .../delete-account-dialog.component.spec.ts | 36 +- .../change-username.component.spec.ts | 46 +- .../auth/auth.component.spec.ts | 24 +- .../downloadcliclient.component.spec.ts | 42 +- src/app/loginComponents/requests.module.ts | 1 - .../requests/requests.component.ts | 2 +- src/app/logout/logout.component.spec.ts | 14 +- .../maintenance/maintenance.component.spec.ts | 18 +- src/app/mytools/mytools.module.ts | 1 - .../sidebar-accordion.component.spec.ts | 42 +- .../my-workflow/my-workflow.component.spec.ts | 60 +- .../github-apps-logs.module.ts | 1 - .../sidebar-accordion.component.spec.ts | 48 +- src/app/navbar/navbar.component.spec.ts | 29 +- .../collection/add-entry.module.ts | 1 - .../add-entry/add-entry.component.ts | 2 +- .../collection/collection.component.ts | 2 +- src/app/organizations/collections.module.ts | 1 - .../collections/create-collection.module.ts | 1 - .../organization-stargazers.component.spec.ts | 27 +- .../organization-starring.component.spec.ts | 32 +- .../update-organization-description.module.ts | 1 - .../register-organization.module.ts | 1 - .../upsert-organization-member.module.ts | 1 - .../basic-search.component.spec.ts | 20 +- src/app/search/query-builder.service.spec.ts | 2 +- .../search-results.component.spec.ts | 26 +- .../search-tool-table.component.spec.ts | 30 +- .../search-workflow-table.component.spec.ts | 28 +- src/app/search/search.component.spec.ts | 28 +- src/app/search/search.module.ts | 1 - src/app/select/select.component.spec.ts | 16 +- .../shared-workflow-services.module.ts | 1 - src/app/shared/alert/alert.component.spec.ts | 16 +- src/app/shared/available-logs.module.ts | 1 - src/app/shared/base.ts | 4 +- .../code-editor-list.component.spec.ts | 44 +- .../code-editor/code-editor.component.spec.ts | 14 +- src/app/shared/entry/commit-url.pipe.spec.ts | 1 - src/app/shared/entry/entry.module.ts | 1 - ...ab-checker-workflow-path.component.spec.ts | 26 +- .../launch-checker-workflow.component.spec.ts | 18 +- ...egister-checker-workflow.component.spec.ts | 30 +- .../verified-by/verified-by.component.spec.ts | 17 +- .../verified-display.component.spec.ts | 16 +- .../entry/versionProviderUrl.pipe.spec.ts | 3 - .../shared/loading/loading.component.spec.ts | 18 +- .../markdown-wrapper.component.spec.ts | 129 +- src/app/shared/modules/container.module.ts | 1 - .../shared/modules/markdown-wrapper.module.ts | 1 - src/app/shared/modules/workflow.module.ts | 1 - .../shared/selectors/entry-file-selector.ts | 4 +- src/app/sitemap/sitemap.component.spec.ts | 16 +- .../source-file-tabs.component.spec.ts | 26 +- src/app/sponsors/sponsors.component.spec.ts | 18 +- .../stargazers/stargazers.component.spec.ts | 26 +- .../starredentries.component.spec.ts | 30 +- src/app/starring/starring.component.spec.ts | 30 +- .../cwl-viewer/cwl-viewer.component.spec.ts | 20 +- src/app/workflow/dag/dag.component.spec.ts | 30 +- .../wdl-viewer/wdl-viewer.component.spec.ts | 2 +- .../descriptors/descriptors.component.spec.ts | 30 +- .../workflow/files/files.component.spec.ts | 24 +- .../launch-third-party.component.spec.ts | 20 +- .../workflow/launch/launch.component.spec.ts | 32 +- .../paramfiles/paramfiles.component.spec.ts | 30 +- .../permissions/permissions.component.spec.ts | 26 +- ...sh-workflow-organization.component.spec.ts | 32 +- .../tool-tab/tool-tab.component.spec.ts | 24 +- .../versions/versions.component.spec.ts | 52 +- src/app/workflow/view/view.component.spec.ts | 36 +- .../workflow-file-editor.component.spec.ts | 70 +- tsconfig.json | 4 +- tslint.json | 8 +- 103 files changed, 5148 insertions(+), 4203 deletions(-) rename browserslist => .browserslistrc (100%) diff --git a/browserslist b/.browserslistrc similarity index 100% rename from browserslist rename to .browserslistrc diff --git a/package-lock.json b/package-lock.json index 09af3fc4f3..5491d2bde8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,32 +5,32 @@ "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.901.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.9.tgz", - "integrity": "sha512-Xokyh7bv4qICHpb5Xui1jPTi6ZZvzR5tbTIxT0DFWqw16TEkFgkNubQsW6mFSR3g3CXdySMfOwWExfa/rE1ggA==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz", + "integrity": "sha512-twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "rxjs": "6.5.4" + "@angular-devkit/core": "10.2.0", + "rxjs": "6.6.2" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -58,12 +58,20 @@ "dev": true }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "source-map": { @@ -75,115 +83,119 @@ } }, "@angular-devkit/build-angular": { - "version": "0.901.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.9.tgz", - "integrity": "sha512-eC6iZQR5tr9dz/SkR3/3Y8Fau/2IzEfHlFCf2mqsOLkbc0MWyM/3RcuZQhRGdVOyzDCIbfzJGY0N3ejkEn2EUg==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.901.9", - "@angular-devkit/build-optimizer": "0.901.9", - "@angular-devkit/build-webpack": "0.901.9", - "@angular-devkit/core": "9.1.9", - "@babel/core": "7.9.0", - "@babel/generator": "7.9.3", - "@babel/preset-env": "7.9.0", - "@babel/template": "7.8.6", - "@jsdevtools/coverage-istanbul-loader": "3.0.3", - "@ngtools/webpack": "9.1.9", - "ajv": "6.12.0", - "autoprefixer": "9.7.4", - "babel-loader": "8.0.6", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1002.0.tgz", + "integrity": "sha512-cPkdp1GceokGHc79Wg0hACMqqmnJ4W3H9kY4c9qp1Xz18b3vk1aq09JNawOpfUN09S9vBCnn4glg22lRyqmJNA==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.1002.0", + "@angular-devkit/build-optimizer": "0.1002.0", + "@angular-devkit/build-webpack": "0.1002.0", + "@angular-devkit/core": "10.2.0", + "@babel/core": "7.11.1", + "@babel/generator": "7.11.0", + "@babel/plugin-transform-runtime": "7.11.0", + "@babel/preset-env": "7.11.0", + "@babel/runtime": "7.11.2", + "@babel/template": "7.10.4", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "@ngtools/webpack": "10.2.0", + "autoprefixer": "9.8.6", + "babel-loader": "8.1.0", "browserslist": "^4.9.1", - "cacache": "15.0.0", + "cacache": "15.0.5", "caniuse-lite": "^1.0.30001032", "circular-dependency-plugin": "5.2.0", - "copy-webpack-plugin": "6.0.2", + "copy-webpack-plugin": "6.0.3", "core-js": "3.6.4", - "css-loader": "3.5.1", + "css-loader": "4.2.2", "cssnano": "4.1.10", "file-loader": "6.0.0", "find-cache-dir": "3.3.1", "glob": "7.1.6", - "jest-worker": "25.1.0", + "jest-worker": "26.3.0", "karma-source-map-support": "1.4.0", - "less": "3.11.3", - "less-loader": "5.0.0", - "license-webpack-plugin": "2.1.4", + "less-loader": "6.2.0", + "license-webpack-plugin": "2.3.0", "loader-utils": "2.0.0", - "mini-css-extract-plugin": "0.9.0", + "mini-css-extract-plugin": "0.10.0", "minimatch": "3.0.4", - "open": "7.0.3", - "parse5": "4.0.0", - "postcss": "7.0.27", + "open": "7.2.0", + "parse5": "6.0.1", + "parse5-htmlparser2-tree-adapter": "6.0.1", + "pnp-webpack-plugin": "1.6.4", + "postcss": "7.0.32", "postcss-import": "12.0.1", "postcss-loader": "3.0.0", - "raw-loader": "4.0.0", - "regenerator-runtime": "0.13.5", + "raw-loader": "4.0.1", + "regenerator-runtime": "0.13.7", + "resolve-url-loader": "3.1.2", "rimraf": "3.0.2", - "rollup": "2.1.0", - "rxjs": "6.5.4", - "sass": "1.26.3", - "sass-loader": "8.0.2", - "semver": "7.1.3", + "rollup": "2.26.5", + "rxjs": "6.6.2", + "sass": "1.26.10", + "sass-loader": "10.0.1", + "semver": "7.3.2", "source-map": "0.7.3", - "source-map-loader": "0.2.4", - "speed-measure-webpack-plugin": "1.3.1", - "style-loader": "1.1.3", - "stylus": "0.54.7", + "source-map-loader": "1.0.2", + "source-map-support": "0.5.19", + "speed-measure-webpack-plugin": "1.3.3", + "style-loader": "1.2.1", + "stylus": "0.54.8", "stylus-loader": "3.0.2", - "terser": "4.6.10", - "terser-webpack-plugin": "3.0.3", + "terser": "5.3.0", + "terser-webpack-plugin": "4.1.0", "tree-kill": "1.2.2", - "webpack": "4.42.0", + "webpack": "4.44.1", "webpack-dev-middleware": "3.7.2", "webpack-dev-server": "3.11.0", "webpack-merge": "4.2.2", "webpack-sources": "1.4.3", - "webpack-subresource-integrity": "1.4.0", - "worker-plugin": "4.0.3" + "webpack-subresource-integrity": "1.4.1", + "worker-plugin": "5.0.0" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "@babel/code-frame": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", - "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "^7.10.3" + "@babel/highlight": "^7.10.4" } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz", + "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.0", + "@babel/helper-module-transforms": "^7.11.0", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.11.1", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.11.0", + "@babel/types": "^7.11.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", "json5": "^2.1.2", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" @@ -204,14 +216,13 @@ } }, "@babel/generator": { - "version": "7.9.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.3.tgz", - "integrity": "sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", + "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", "dev": true, "requires": { - "@babel/types": "^7.9.0", + "@babel/types": "^7.11.0", "jsesc": "^2.5.1", - "lodash": "^4.17.13", "source-map": "^0.5.0" }, "dependencies": { @@ -224,353 +235,264 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz", - "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz", + "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==", "dev": true, "requires": { - "@babel/types": "^7.10.1" + "@babel/types": "^7.12.10" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz", - "integrity": "sha512-lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", + "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/helper-explode-assignable-expression": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-define-map": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz", - "integrity": "sha512-bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", + "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.3", - "@babel/types": "^7.10.3", - "lodash": "^4.17.13" + "@babel/helper-function-name": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz", - "integrity": "sha512-0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz", + "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==", "dev": true, "requires": { - "@babel/traverse": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.1" } }, "@babel/helper-function-name": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz", - "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.3", - "@babel/template": "^7.10.3", - "@babel/types": "^7.10.3" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz", - "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", + "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.10" } }, "@babel/helper-hoist-variables": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz", - "integrity": "sha512-9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", + "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz", - "integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz", - "integrity": "sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.5" } }, "@babel/helper-module-transforms": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz", - "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.1", - "@babel/helper-replace-supers": "^7.10.1", - "@babel/helper-simple-access": "^7.10.1", - "@babel/helper-split-export-declaration": "^7.10.1", - "@babel/template": "^7.10.1", - "@babel/types": "^7.10.1", - "lodash": "^4.17.13" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "lodash": "^4.17.19" } }, "@babel/helper-optimise-call-expression": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz", - "integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz", + "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.10" } }, "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true }, - "@babel/helper-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz", - "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==", - "dev": true, - "requires": { - "lodash": "^4.17.13" - } - }, "@babel/helper-remap-async-to-generator": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz", - "integrity": "sha512-sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", + "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.1", - "@babel/helper-wrap-function": "^7.10.1", - "@babel/template": "^7.10.3", - "@babel/traverse": "^7.10.3", - "@babel/types": "^7.10.3" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/types": "^7.12.1" } }, "@babel/helper-replace-supers": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", - "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz", + "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.1", - "@babel/helper-optimise-call-expression": "^7.10.1", - "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1" + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" } }, "@babel/helper-simple-access": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz", - "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", "dev": true, "requires": { - "@babel/template": "^7.10.1", - "@babel/types": "^7.10.1" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/types": "^7.12.1" } }, "@babel/helper-split-export-declaration": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", - "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "^7.10.1" + "@babel/types": "^7.11.0" } }, "@babel/helper-wrap-function": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz", - "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz", + "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.1", - "@babel/template": "^7.10.1", - "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/helper-function-name": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helpers": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", - "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", + "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", "dev": true, "requires": { - "@babel/template": "^7.10.1", - "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1" - }, - "dependencies": { - "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" - } - } + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" } }, "@babel/highlight": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz", - "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", + "@babel/helper-validator-identifier": "^7.10.4", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz", - "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz", + "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz", - "integrity": "sha512-WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz", + "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.3", - "@babel/helper-remap-async-to-generator": "^7.10.3", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.12.1", "@babel/plugin-syntax-async-generators": "^7.8.0" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz", - "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz", + "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-dynamic-import": "^7.8.0" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz", - "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz", + "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.0" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz", - "integrity": "sha512-ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", + "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.3", + "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.10.1" + "@babel/plugin-transform-parameters": "^7.12.1" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz", - "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz", + "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz", - "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz", + "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-async-generators": { @@ -619,364 +541,369 @@ } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz", - "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz", + "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz", - "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz", + "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1", - "@babel/helper-remap-async-to-generator": "^7.10.1" + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.12.1" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz", - "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz", + "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz", - "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz", + "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", - "lodash": "^4.17.13" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-classes": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz", - "integrity": "sha512-irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.10.1", - "@babel/helper-define-map": "^7.10.3", - "@babel/helper-function-name": "^7.10.3", - "@babel/helper-optimise-call-expression": "^7.10.3", - "@babel/helper-plugin-utils": "^7.10.3", - "@babel/helper-replace-supers": "^7.10.1", - "@babel/helper-split-export-declaration": "^7.10.1", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz", + "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-define-map": "^7.10.4", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.10.4", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz", - "integrity": "sha512-GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz", + "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.3" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-destructuring": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz", - "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz", + "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz", - "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz", + "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz", - "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz", + "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz", - "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz", + "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-for-of": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz", - "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz", + "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-function-name": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz", - "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz", + "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-literals": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz", - "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz", + "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz", - "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz", + "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz", - "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz", + "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz", - "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz", + "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1", - "@babel/helper-simple-access": "^7.10.1", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-simple-access": "^7.12.1", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz", - "integrity": "sha512-GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz", + "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.10.3", - "@babel/helper-module-transforms": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.3", + "@babel/helper-hoist-variables": "^7.10.4", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-validator-identifier": "^7.10.4", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz", - "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz", + "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz", - "integrity": "sha512-I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz", + "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3" + "@babel/helper-create-regexp-features-plugin": "^7.12.1" } }, "@babel/plugin-transform-new-target": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz", - "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz", + "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-object-super": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz", - "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz", + "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", - "@babel/helper-replace-supers": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1" } }, "@babel/plugin-transform-parameters": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz", - "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz", + "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-property-literals": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz", - "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz", + "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-regenerator": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz", - "integrity": "sha512-H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz", + "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==", "dev": true, "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz", - "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz", + "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz", - "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz", + "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz", - "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz", + "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", - "@babel/helper-regex": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-template-literals": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz", - "integrity": "sha512-yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz", + "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.3" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz", - "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz", + "integrity": "sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz", - "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz", + "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.1", - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/preset-env": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", - "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.9.0", - "@babel/helper-compilation-targets": "^7.8.7", - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-async-generator-functions": "^7.8.3", - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.9.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz", + "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.11.0", + "@babel/helper-compilation-targets": "^7.10.4", + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-proposal-async-generator-functions": "^7.10.4", + "@babel/plugin-proposal-class-properties": "^7.10.4", + "@babel/plugin-proposal-dynamic-import": "^7.10.4", + "@babel/plugin-proposal-export-namespace-from": "^7.10.4", + "@babel/plugin-proposal-json-strings": "^7.10.4", + "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", + "@babel/plugin-proposal-numeric-separator": "^7.10.4", + "@babel/plugin-proposal-object-rest-spread": "^7.11.0", + "@babel/plugin-proposal-optional-catch-binding": "^7.10.4", + "@babel/plugin-proposal-optional-chaining": "^7.11.0", + "@babel/plugin-proposal-private-methods": "^7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.10.4", "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-class-properties": "^7.10.4", "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-arrow-functions": "^7.8.3", - "@babel/plugin-transform-async-to-generator": "^7.8.3", - "@babel/plugin-transform-block-scoped-functions": "^7.8.3", - "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.9.0", - "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.8.3", - "@babel/plugin-transform-dotall-regex": "^7.8.3", - "@babel/plugin-transform-duplicate-keys": "^7.8.3", - "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.9.0", - "@babel/plugin-transform-function-name": "^7.8.3", - "@babel/plugin-transform-literals": "^7.8.3", - "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.0", - "@babel/plugin-transform-modules-commonjs": "^7.9.0", - "@babel/plugin-transform-modules-systemjs": "^7.9.0", - "@babel/plugin-transform-modules-umd": "^7.9.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.8.7", - "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.7", - "@babel/plugin-transform-reserved-words": "^7.8.3", - "@babel/plugin-transform-shorthand-properties": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/plugin-transform-sticky-regex": "^7.8.3", - "@babel/plugin-transform-template-literals": "^7.8.3", - "@babel/plugin-transform-typeof-symbol": "^7.8.4", - "@babel/plugin-transform-unicode-regex": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.10.4", + "@babel/plugin-transform-arrow-functions": "^7.10.4", + "@babel/plugin-transform-async-to-generator": "^7.10.4", + "@babel/plugin-transform-block-scoped-functions": "^7.10.4", + "@babel/plugin-transform-block-scoping": "^7.10.4", + "@babel/plugin-transform-classes": "^7.10.4", + "@babel/plugin-transform-computed-properties": "^7.10.4", + "@babel/plugin-transform-destructuring": "^7.10.4", + "@babel/plugin-transform-dotall-regex": "^7.10.4", + "@babel/plugin-transform-duplicate-keys": "^7.10.4", + "@babel/plugin-transform-exponentiation-operator": "^7.10.4", + "@babel/plugin-transform-for-of": "^7.10.4", + "@babel/plugin-transform-function-name": "^7.10.4", + "@babel/plugin-transform-literals": "^7.10.4", + "@babel/plugin-transform-member-expression-literals": "^7.10.4", + "@babel/plugin-transform-modules-amd": "^7.10.4", + "@babel/plugin-transform-modules-commonjs": "^7.10.4", + "@babel/plugin-transform-modules-systemjs": "^7.10.4", + "@babel/plugin-transform-modules-umd": "^7.10.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4", + "@babel/plugin-transform-new-target": "^7.10.4", + "@babel/plugin-transform-object-super": "^7.10.4", + "@babel/plugin-transform-parameters": "^7.10.4", + "@babel/plugin-transform-property-literals": "^7.10.4", + "@babel/plugin-transform-regenerator": "^7.10.4", + "@babel/plugin-transform-reserved-words": "^7.10.4", + "@babel/plugin-transform-shorthand-properties": "^7.10.4", + "@babel/plugin-transform-spread": "^7.11.0", + "@babel/plugin-transform-sticky-regex": "^7.10.4", + "@babel/plugin-transform-template-literals": "^7.10.4", + "@babel/plugin-transform-typeof-symbol": "^7.10.4", + "@babel/plugin-transform-unicode-escapes": "^7.10.4", + "@babel/plugin-transform-unicode-regex": "^7.10.4", "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.0", - "browserslist": "^4.9.1", + "@babel/types": "^7.11.0", + "browserslist": "^4.12.0", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", "levenary": "^1.1.1", @@ -992,42 +919,41 @@ } }, "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/traverse": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz", - "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz", + "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/generator": "^7.10.3", - "@babel/helper-function-name": "^7.10.3", - "@babel/helper-split-export-declaration": "^7.10.1", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3", + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.10", + "@babel/types": "^7.12.10", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.13" + "lodash": "^4.17.19" }, "dependencies": { "@babel/generator": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz", - "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz", + "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==", "dev": true, "requires": { - "@babel/types": "^7.10.3", + "@babel/types": "^7.12.10", "jsesc": "^2.5.1", - "lodash": "^4.17.13", "source-map": "^0.5.0" } }, @@ -1040,20 +966,20 @@ } }, "@babel/types": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", - "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1062,51 +988,6 @@ "uri-js": "^4.2.2" } }, - "babel-loader": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz", - "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==", - "dev": true, - "requires": { - "find-cache-dir": "^2.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1", - "pify": "^4.0.1" - }, - "dependencies": { - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - } - } - }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -1123,21 +1004,22 @@ "dev": true }, "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz", + "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" + "caniuse-lite": "^1.0.30001165", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.621", + "escalade": "^3.1.1", + "node-releases": "^1.1.67" } }, "caniuse-lite": { - "version": "1.0.30001087", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz", - "integrity": "sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==", + "version": "1.0.30001165", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz", + "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", "dev": true }, "convert-source-map": { @@ -1156,12 +1038,12 @@ "dev": true }, "core-js-compat": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz", - "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz", + "integrity": "sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==", "dev": true, "requires": { - "browserslist": "^4.8.5", + "browserslist": "^4.15.0", "semver": "7.0.0" }, "dependencies": { @@ -1174,18 +1056,18 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "electron-to-chromium": { - "version": "1.3.481", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz", - "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==", + "version": "1.3.623", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.623.tgz", + "integrity": "sha512-CgbWTyPmJ4f9pqtqR+HPL3O0ay6BRhnpFD52TqBB2K8kTAcmAar2e93Vo1q651E4vnCHuTDuZDdbj0sTMP2QQw==", "dev": true }, "emojis-list": { @@ -1258,12 +1140,6 @@ "json5": "^2.1.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -1271,43 +1147,41 @@ "dev": true }, "node-releases": { - "version": "1.1.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", - "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", + "version": "1.1.67", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", + "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==", "dev": true }, "regenerator-transform": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", - "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.8.4", - "private": "^0.1.8" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { - "glob": "^7.1.3" + "@babel/runtime": "^7.8.4" } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "semver": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", - "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, "source-map": { @@ -1315,19 +1189,37 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } } } }, "@angular-devkit/build-optimizer": { - "version": "0.901.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.9.tgz", - "integrity": "sha512-AcDhE7RHmaVEaDB02MHp1PR2gdUg3+G/12pDC3GeAlfP1GD/sVBpcqPL6DHFp0dMm/FsvSfVSaXpzD7jZBeIKQ==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1002.0.tgz", + "integrity": "sha512-ACnm9doPMbRtSy1UZN5ir7smeLMx0g0oW7jX3jyPepeQKZ+9U1Bn09t10NLZQH+Z509jWZgvNJH/aOh85P6euw==", "dev": true, "requires": { "loader-utils": "2.0.0", "source-map": "0.7.3", - "tslib": "1.11.1", - "typescript": "3.6.5", + "tslib": "2.0.1", + "typescript": "4.0.2", "webpack-sources": "1.4.3" }, "dependencies": { @@ -1363,12 +1255,6 @@ "json5": "^2.1.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", @@ -1376,47 +1262,47 @@ "dev": true }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==", "dev": true }, "typescript": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.5.tgz", - "integrity": "sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", + "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", "dev": true } } }, "@angular-devkit/build-webpack": { - "version": "0.901.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.9.tgz", - "integrity": "sha512-Bha9LruitixhtJm72FGzqfDfgsOsrMT3EbNSql2muyoELIYbLDOvNZjcDD06CPcOAWSg6/tH9caOTFS2Zj9yOw==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1002.0.tgz", + "integrity": "sha512-TLBBQ6ANOLKXOPxpCOnxAtoknwHA7XhsLuueN06w5qqF+QNNbWUMPoieKFGs2TnotfCgbiq6x57IDEZTyT6V0w==", "dev": true, "requires": { - "@angular-devkit/architect": "0.901.9", - "@angular-devkit/core": "9.1.9", - "rxjs": "6.5.4" + "@angular-devkit/architect": "0.1002.0", + "@angular-devkit/core": "10.2.0", + "rxjs": "6.6.2" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1444,12 +1330,20 @@ "dev": true }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "source-map": { @@ -1498,6 +1392,13 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "source-map": { @@ -1522,21 +1423,39 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } } } }, "@angular/animations": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.11.tgz", - "integrity": "sha512-VKAExUnEJfo1PDQKagpx2pn+QMZCsPLRiADzTdl4U0VPylK3ALbn4ZNY9UbdwyE2plitz++LkH7sEGGfh+PNrQ==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.2.3.tgz", + "integrity": "sha512-UP3aynCSkFqEJfZ9bQMyBIVo4mm5EuIHL6NfMqhqLQankKKnc25Pi3a7heq0xzV1EoAxGSd3UBn36Y8Jjav2fg==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/cdk": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.4.tgz", - "integrity": "sha512-iw2+qHMXHYVC6K/fttHeNHIieSKiTEodVutZoOEcBu9rmRTGbLB26V/CRsfIRmA1RBk+uFYWc6UQZnMC3RdnJQ==", + "version": "10.2.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-10.2.7.tgz", + "integrity": "sha512-ZQjDfTRTn7JuAKsf3jiIdU2XBaxxGBi/ZWYv5Pb3HCl6B4PISsIE5VWRhkoUogoAB0MiFHpjnWeIqknJEm11YQ==", "requires": { - "parse5": "^5.0.0" + "parse5": "^5.0.0", + "tslib": "^2.0.0" }, "dependencies": { "parse5": { @@ -1544,65 +1463,70 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", "optional": true + }, + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" } } }, "@angular/cli": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.9.tgz", - "integrity": "sha512-k8C0OY3oHoixd3buCgF8+VFe8YZGSGiprnbVMEF2WJHUUw87lPCu/d7dbID3AtVwdKdAB275rAt6IZEIzXInbw==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.2.0.tgz", + "integrity": "sha512-YBzwkFBmG6CdUJk8onsPXxHX/ByU5MERBQgYhLC873e2nZlXMUu+Ttq2Wai6apyskGvsXKxZNPOQSFZTGKXzXg==", "dev": true, "requires": { - "@angular-devkit/architect": "0.901.9", - "@angular-devkit/core": "9.1.9", - "@angular-devkit/schematics": "9.1.9", - "@schematics/angular": "9.1.9", - "@schematics/update": "0.901.9", + "@angular-devkit/architect": "0.1002.0", + "@angular-devkit/core": "10.2.0", + "@angular-devkit/schematics": "10.2.0", + "@schematics/angular": "10.2.0", + "@schematics/update": "0.1002.0", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "4.1.1", "ini": "1.3.5", - "inquirer": "7.1.0", + "inquirer": "7.3.3", "npm-package-arg": "8.0.1", - "npm-pick-manifest": "6.0.0", - "open": "7.0.3", + "npm-pick-manifest": "6.1.0", + "open": "7.2.0", "pacote": "9.5.12", "read-package-tree": "5.3.1", "rimraf": "3.0.2", - "semver": "7.1.3", + "semver": "7.3.2", "symbol-observable": "1.2.0", - "universal-analytics": "0.4.20", - "uuid": "7.0.2" + "universal-analytics": "0.4.23", + "uuid": "8.3.0" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "@angular-devkit/schematics": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz", - "integrity": "sha512-aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz", + "integrity": "sha512-TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "ora": "4.0.3", - "rxjs": "6.5.4" + "@angular-devkit/core": "10.2.0", + "ora": "5.0.0", + "rxjs": "6.6.2" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1638,27 +1562,13 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "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" - } - }, "hosted-git-info": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", - "integrity": "sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz", + "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==", "dev": true, "requires": { - "lru-cache": "^5.1.1" + "lru-cache": "^6.0.0" } }, "json-schema-traverse": { @@ -1667,19 +1577,10 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "npm-package-arg": { @@ -1693,28 +1594,27 @@ "validate-npm-package-name": "^3.0.0" } }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "semver": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", - "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, "source-map": { @@ -1724,33 +1624,47 @@ "dev": true }, "uuid": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz", - "integrity": "sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", + "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", "dev": true } } }, "@angular/common": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.11.tgz", - "integrity": "sha512-Vh5lF7zWwDK9RedmYXUc8vUXyrecR3j1mAWlTlnmcHYxxFThPzN/dr0slQcPi6nyJn0EmyRKUGvAoZx4rIb7wg==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.2.3.tgz", + "integrity": "sha512-xKKN8bgdudktVC/gwUtdeS2khYqSENWQe1CS8nE0V88qKCftwPhCD5Ovp6+6LflqvQhJWb0guf7HXjq9oBqO2w==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/compiler": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.11.tgz", - "integrity": "sha512-MbVheCG0U8gt6xtiipau20N26mD2sXjLChVmRKgO6rbDruxboNMZfEd94q9NP9JRaUsVnjXvY7GMDldoymdXig==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.2.3.tgz", + "integrity": "sha512-Bg+QbyvJVlfGQpJCagEMkkqoRi2LMQc8iuu+cVYVqQOETLO0LxmkPpMQ/7pRLTNWl36PoYEB7IjUkp+qng8xKg==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/compiler-cli": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.11.tgz", - "integrity": "sha512-9qIxbtpRXOQnRm6inxCa5HuH87MSuMzuceD0YBVzl8v+vLtewon9KXYMmF4kTBhWa/LEa8FrajljLh0azf3VLg==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.2.3.tgz", + "integrity": "sha512-29RL/lIbHpjoWMUz23cyRcyG50PXqvxlLk0IpyCUWDVtPp6Hc8S/JayxeSwxNST79miDobGaeiGmS0JHuCouVQ==", "dev": true, "requires": { "canonical-path": "1.0.0", @@ -1764,6 +1678,7 @@ "semver": "^6.3.0", "source-map": "^0.6.1", "sourcemap-codec": "^1.4.8", + "tslib": "^2.0.0", "yargs": "15.3.0" }, "dependencies": { @@ -1774,12 +1689,11 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, @@ -1851,12 +1765,6 @@ "p-locate": "^4.1.0" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -1904,6 +1812,12 @@ "ansi-regex": "^5.0.0" } }, + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==", + "dev": true + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -1947,54 +1861,132 @@ } }, "@angular/core": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.11.tgz", - "integrity": "sha512-KAlEedBo761O1aeoTJVziOSHi8Fttk9ipvbDZXYT/o0W/KdVwubxP34g9t5aD8LCcF8+L0z4VLw++HjdJAUpwg==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.2.3.tgz", + "integrity": "sha512-mE6nLpul/IJllk0VYrlrP69n0P7JPz+BHYAVobwO5+0EGO65ieTD18DxzfEt4eQgthnM3VQwSZxjW4n9Y1p/dQ==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/flex-layout": { - "version": "9.0.0-beta.31", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-9.0.0-beta.31.tgz", - "integrity": "sha512-g94u2mecDl87ORvFRuOBshV/S/ETE4bybClU2e1xXKWNG+rhRHchChneHSonc29ZLyROTjHhmAtKOYojL92uLA==" + "version": "10.0.0-beta.32", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-10.0.0-beta.32.tgz", + "integrity": "sha512-JvuY4dUoy5jyCTIrFiq7n30Znakh1pD3nbg0h0hs2r3t1OiDQb0ZSI1wcumosG/vYHsuJQTuNhbfaIZzA1x8nA==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/forms": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.11.tgz", - "integrity": "sha512-t4WHrh6ot1r8zdV+3fJz7g9rCok77c9CiIevhH2dR/idxD+HtFR0wqmcBQzsn+rNVB0f0TiSHDrj+TeELIFyWw==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.2.3.tgz", + "integrity": "sha512-IcQ0xK+f84khGAs6cd0BUJIebFV3KQsVF9kbAX10bpPmleI62xI074mIefAiu3ZLEOm3OnhYDDZwrrk7UIrmow==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/language-service": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.11.tgz", - "integrity": "sha512-jfm4etbqldj6MTwECwyoAs7tXEAR8K/8P8dBZnsELhY+V8oFidTJI3NY52PB3Ym7leSPorYdOAeUMMuQfPaVxg==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-10.2.3.tgz", + "integrity": "sha512-8rtNG3HjBdUMlKcakh6gDfFvYSS5X16ymbVR0i2L/Nc4d9HuqgKrIrsNY4We/jSBoAjo/CGS8AvbscMa8oW4Eg==", "dev": true }, "@angular/material": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.4.tgz", - "integrity": "sha512-LkoTXE6B0slvMhvfZDdPWaz4yaYLkaAp5VSPunI9pxGsPxzqEV9e210wC1/sjG/76Nk8Ep7/2z9XKac8Q9bMwA==" + "version": "10.2.7", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-10.2.7.tgz", + "integrity": "sha512-uk6JkRrKHaM9VFMzX7pWC83YNLVgXPB3D8U1yjSOafCdWwrRZgUHGr8MPlSILCr3o2nxgg5SsKdWcWwHuXXUZA==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@angular/platform-browser": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.11.tgz", - "integrity": "sha512-KDxoiFhW4UD+EqchcKpQVSLwg9Rd3JbWytZLchFV6nH8BFnshfJtw2tyPT8bMhFVG9n9zSR4QSGaozWgoDs9mw==" - }, - "@angular/platform-browser-dynamic": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.11.tgz", - "integrity": "sha512-Qw3rfVFF0Wtu+UwraqKPCgTA3uoNPGf4vKSfuCuXTrG0p7j+3mCP59aUv5gGH7GV1UQ++jZRx5pbWF43zrC8Hw==" - }, + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.2.3.tgz", + "integrity": "sha512-ElTuRF4SWhYxJypDlaa/n49DrqrWV2tYU5kkgF+VNbVbvzKHnVEZe4x1KSWrEzIyewcjxwwE6ZF0oXMdd4AZQQ==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } + }, + "@angular/platform-browser-dynamic": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.2.3.tgz", + "integrity": "sha512-ujwcGzlWQ6S83iHIF3ArfDn8ik8YETZcuSMCTxjaNv8kwEqiRzchZDkheJpoH9HyddnM6UVGL6D/5k11TMWTew==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } + }, "@angular/platform-server": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.11.tgz", - "integrity": "sha512-eHqlbtDHvYZIxtY6iKYpuRg9vTw5JoEH1M5rna2YDPI1MOnDdNhmpupIF6M3jnNAzN6xsh4X4wxW3PYHJVJviA==", + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-10.2.3.tgz", + "integrity": "sha512-iYs1fsdEio3TdN4HlZw0HNSmpGbTs/+FozVePP7m+k5ozjyxBg1J5kF9R/RSaT9Zqhyw54G3DE/KJ0tnOGUtdA==", "requires": { "domino": "^2.1.2", + "tslib": "^2.0.0", "xhr2": "^0.2.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } } }, "@angular/router": { - "version": "9.1.11", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.11.tgz", - "integrity": "sha512-D6CCDeSK/F6dWSB/a1g/zB072xG5LadLSV8afQ57oX1KHePx21LcoRG4tUtFMMHh/jZXRc9pMQIR1/9FrrXF3Q==" + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.2.3.tgz", + "integrity": "sha512-QUVqEOai3hASeMgTXIVo9Ql6EGJ+v0QHs/O+5pFplXGAzMQDpCnrpOuB4FExWxdafiiYfKfLlNvxj0tEJ2gU0w==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@babel/code-frame": { "version": "7.0.0", @@ -2006,56 +1998,10 @@ } }, "@babel/compat-data": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz", - "integrity": "sha512-BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "semver": "^5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001087", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz", - "integrity": "sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.481", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz", - "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==", - "dev": true - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "node-releases": { - "version": "1.1.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", - "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", - "dev": true - } - } + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz", + "integrity": "sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==", + "dev": true }, "@babel/core": { "version": "7.6.2", @@ -2210,6 +2156,7 @@ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz", "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", "dev": true, + "optional": true, "requires": { "@babel/types": "^7.4.0", "jsesc": "^2.5.1", @@ -2222,7 +2169,8 @@ "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true + "dev": true, + "optional": true } } }, @@ -2356,96 +2304,254 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz", - "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz", + "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==", "dev": true, "requires": { - "@babel/compat-data": "^7.10.1", - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "levenary": "^1.1.1", + "@babel/compat-data": "^7.12.5", + "@babel/helper-validator-option": "^7.12.1", + "browserslist": "^4.14.5", "semver": "^5.5.0" }, "dependencies": { "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz", + "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" + "caniuse-lite": "^1.0.30001165", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.621", + "escalade": "^3.1.1", + "node-releases": "^1.1.67" } }, "caniuse-lite": { - "version": "1.0.30001087", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz", - "integrity": "sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==", + "version": "1.0.30001165", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz", + "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", "dev": true }, "electron-to-chromium": { - "version": "1.3.481", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz", - "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==", + "version": "1.3.623", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.623.tgz", + "integrity": "sha512-CgbWTyPmJ4f9pqtqR+HPL3O0ay6BRhnpFD52TqBB2K8kTAcmAar2e93Vo1q651E4vnCHuTDuZDdbj0sTMP2QQw==", + "dev": true + }, + "node-releases": { + "version": "1.1.67", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", + "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==", + "dev": true + } + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz", + "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.10.4" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/generator": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz", + "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==", + "dev": true, + "requires": { + "@babel/types": "^7.12.10", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", + "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", + "dev": true, + "requires": { + "@babel/types": "^7.12.10" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", + "dev": true, + "requires": { + "@babel/types": "^7.12.7" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz", + "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==", + "dev": true, + "requires": { + "@babel/types": "^7.12.10" + } + }, + "@babel/helper-replace-supers": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz", + "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "dev": true, + "requires": { + "@babel/types": "^7.11.0" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz", + "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==", "dev": true }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "@babel/template": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", + "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7" } }, - "node-releases": { - "version": "1.1.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", - "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", + "@babel/traverse": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz", + "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.10", + "@babel/types": "^7.12.10", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz", - "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz", + "integrity": "sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.1", - "@babel/helper-regex": "^7.10.1", - "regexpu-core": "^4.7.0" + "@babel/helper-annotate-as-pure": "^7.10.4", + "regexpu-core": "^4.7.1" }, "dependencies": { "@babel/helper-annotate-as-pure": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz", - "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==", - "dev": true, - "requires": { - "@babel/types": "^7.10.1" - } - }, - "@babel/helper-regex": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz", - "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz", + "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==", "dev": true, "requires": { - "lodash": "^4.17.13" + "@babel/types": "^7.12.10" } }, "@babel/types": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", - "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } }, @@ -2459,9 +2565,9 @@ } }, "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", + "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { "regenerate": "^1.4.0", @@ -2472,21 +2578,6 @@ "unicode-match-property-value-ecmascript": "^1.2.0" } }, - "regjsgen": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", - "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", - "dev": true - }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - } - }, "unicode-match-property-value-ecmascript": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", @@ -2537,6 +2628,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", "dev": true, + "optional": true, "requires": { "@babel/helper-get-function-arity": "^7.0.0", "@babel/template": "^7.1.0", @@ -2548,6 +2640,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", "dev": true, + "optional": true, "requires": { "@babel/types": "^7.0.0" } @@ -2785,19 +2878,48 @@ "@babel/types": "^7.0.0" } }, + "@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", + "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", + "dev": true, + "requires": { + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-split-export-declaration": { "version": "7.4.0", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", "dev": true, + "optional": true, "requires": { "@babel/types": "^7.4.0" } }, "@babel/helper-validator-identifier": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz", - "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz", + "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==", "dev": true }, "@babel/helper-wrap-function": { @@ -2958,7 +3080,8 @@ "version": "7.4.3", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz", "integrity": "sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==", - "dev": true + "dev": true, + "optional": true }, "@babel/plugin-proposal-async-generator-functions": { "version": "7.2.0", @@ -2972,6 +3095,24 @@ "@babel/plugin-syntax-async-generators": "^7.2.0" } }, + "@babel/plugin-proposal-class-properties": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz", + "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-proposal-dynamic-import": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz", @@ -2983,6 +3124,24 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0" } }, + "@babel/plugin-proposal-export-namespace-from": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz", + "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-proposal-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", @@ -2994,38 +3153,56 @@ "@babel/plugin-syntax-json-strings": "^7.2.0" } }, + "@babel/plugin-proposal-logical-assignment-operators": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz", + "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz", - "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz", + "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz", - "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz", + "integrity": "sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1", - "@babel/plugin-syntax-numeric-separator": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } @@ -3053,19 +3230,38 @@ } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz", - "integrity": "sha512-yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz", + "integrity": "sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.3", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", "@babel/plugin-syntax-optional-chaining": "^7.8.0" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, + "@babel/plugin-proposal-private-methods": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz", + "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } @@ -3131,6 +3327,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", + "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-syntax-dynamic-import": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", @@ -3141,6 +3354,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-syntax-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", @@ -3151,6 +3381,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", @@ -3161,26 +3408,26 @@ }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } }, "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz", - "integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } @@ -3215,26 +3462,26 @@ }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz", - "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", + "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } @@ -3669,7 +3916,69 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-transform-shorthand-properties": { + "@babel/plugin-transform-runtime": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz", + "integrity": "sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "resolve": "^1.8.1", + "semver": "^5.5.1" + }, + "dependencies": { + "@babel/helper-module-imports": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + }, + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "dev": true, + "requires": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/plugin-transform-shorthand-properties": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", @@ -3680,18 +3989,19 @@ } }, "@babel/plugin-transform-spread": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz", - "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz", + "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.1" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz", - "integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true } } @@ -3728,6 +4038,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-unicode-escapes": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz", + "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-transform-unicode-regex": { "version": "7.6.2", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz", @@ -3868,9 +4195,9 @@ } }, "@babel/preset-modules": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", - "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -3881,22 +4208,22 @@ }, "dependencies": { "@babel/types": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", - "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } } } }, "@babel/runtime": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz", - "integrity": "sha512-RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -3907,6 +4234,7 @@ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz", "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==", "dev": true, + "optional": true, "requires": { "@babel/code-frame": "^7.0.0", "@babel/parser": "^7.4.0", @@ -3918,6 +4246,7 @@ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz", "integrity": "sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==", "dev": true, + "optional": true, "requires": { "@babel/code-frame": "^7.0.0", "@babel/generator": "^7.4.0", @@ -3935,6 +4264,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, + "optional": true, "requires": { "ms": "^2.1.1" } @@ -3943,13 +4273,15 @@ "version": "11.11.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz", "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==", - "dev": true + "dev": true, + "optional": true }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true + "dev": true, + "optional": true } } }, @@ -3958,6 +4290,7 @@ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", "dev": true, + "optional": true, "requires": { "esutils": "^2.0.2", "lodash": "^4.17.11", @@ -3968,7 +4301,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true + "dev": true, + "optional": true } } }, @@ -4142,6 +4476,13 @@ "requires": { "schematics-utilities": "^1.1.1", "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "@datorama/akita-ng-forms-manager": { @@ -4150,6 +4491,13 @@ "integrity": "sha512-gmiGUvEzVlrIXR2rjKRFPzo2Y4oA0+ZwZOPxsYf5j+UoDB7xhcShB87OEWbJ6Pf2NQ67pOHFSqzgRl5vlgE2Kg==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "@datorama/akita-ngdevtools": { @@ -4159,12 +4507,30 @@ "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "@fortawesome/angular-fontawesome": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.6.1.tgz", - "integrity": "sha512-ARQjtRuT+ZskzJDJKPwuiGO3+7nS0iyNLU/uHVJHfG4LwGJxwVIGldwg1SU957sra0Z0OtWEajHMhiS4vB9LwQ==" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.7.0.tgz", + "integrity": "sha512-U+eHYbKuVYrrm9SnIfl+z+6KTiI4Pu+S2OKh34JIi7C1jHhDcrVeDZISP/cpswHY7LWWDOPYeKE+yuWFlL4aVw==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "@fortawesome/fontawesome-common-types": { "version": "0.2.29", @@ -4216,16 +4582,16 @@ "dev": true }, "@jsdevtools/coverage-istanbul-loader": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz", - "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", + "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==", "dev": true, "requires": { "convert-source-map": "^1.7.0", - "istanbul-lib-instrument": "^4.0.1", - "loader-utils": "^1.4.0", + "istanbul-lib-instrument": "^4.0.3", + "loader-utils": "^2.0.0", "merge-source-map": "^1.1.0", - "schema-utils": "^2.6.4" + "schema-utils": "^2.7.0" }, "dependencies": { "big.js": { @@ -4250,70 +4616,60 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true } } }, "@material-extended/mde": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@material-extended/mde/-/mde-2.3.1.tgz", - "integrity": "sha512-UFbeOcfgpDxn3TRIVOMLOfXuIZOfu2cwnxFj0SSCY+s+2PPt7Oz/B7Ru2iZvekLbw6YXkRlx24O0h7Fm6gUwoQ==", - "requires": { - "tslib": "^1.9.0" - } + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@material-extended/mde/-/mde-3.0.3.tgz", + "integrity": "sha512-sX/ND9JcYbgScQqH7PtfnCE1B2uZABk5XS9J/h5NY1Fqz3DuQCFnIQH/XMgP3J1iqncmCoImmOiTf/7NufsvGw==" }, "@ngtools/webpack": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.9.tgz", - "integrity": "sha512-7UzRL54JcK1m2PvgpchV26TF9OYipj/8+dygdjaidqOyQujWpHncdtq/ScbUsoJ44nHjIRJPhaGE00NLpWZvnA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-10.2.0.tgz", + "integrity": "sha512-W4SSFNQhIiC8JRhIn3c4mb1+fsFKiHp+THVMAUNo+wRZEt/rgzsCdnqv0EmQJJojZhnilUIyB/wVYJu2+S/Bxg==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "enhanced-resolve": "4.1.1", - "rxjs": "6.5.4", + "@angular-devkit/core": "10.2.0", + "enhanced-resolve": "4.3.0", "webpack-sources": "1.4.3" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -4323,9 +4679,9 @@ } }, "enhanced-resolve": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", - "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", + "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -4362,12 +4718,20 @@ } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "source-map": { @@ -4384,6 +4748,13 @@ "integrity": "sha512-oFWyYqBPOKQZBqP2ev3Xkn5UjjiWAC1dKYsCduvpDJTA3phc573NhPDpBqxMDfoeIuu72QOJogPehFWJV5991w==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "@nodelib/fs.scandir": { @@ -4430,9 +4801,9 @@ } }, "@phenomnomnominal/tsquery": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz", - "integrity": "sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-4.1.1.tgz", + "integrity": "sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ==", "dev": true, "requires": { "esquery": "^1.0.1" @@ -4448,43 +4819,44 @@ } }, "@schematics/angular": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.9.tgz", - "integrity": "sha512-c8YGZ6pDfr8IDD1qaOjlEBAkEz14KFSxDj0hCWs0xIM0py513tu5sW8+ziYxGG4bgqpsgVR/KAxuY78iBfUVag==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.2.0.tgz", + "integrity": "sha512-rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "@angular-devkit/schematics": "9.1.9" + "@angular-devkit/core": "10.2.0", + "@angular-devkit/schematics": "10.2.0", + "jsonc-parser": "2.3.0" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "@angular-devkit/schematics": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz", - "integrity": "sha512-aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz", + "integrity": "sha512-TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "ora": "4.0.3", - "rxjs": "6.5.4" + "@angular-devkit/core": "10.2.0", + "ora": "5.0.0", + "rxjs": "6.6.2" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -4512,12 +4884,20 @@ "dev": true }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "source-map": { @@ -4529,50 +4909,49 @@ } }, "@schematics/update": { - "version": "0.901.9", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.9.tgz", - "integrity": "sha512-VChX0VO/oyfCF3y+HjMTU2qN3vGgJYxEI1V+Q9aAlwl95t3GAufuaFY1CNW3YV4XkYIjD88e3yWl8d5yO4qf4w==", + "version": "0.1002.0", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1002.0.tgz", + "integrity": "sha512-g2bfJSAj3x/YL0GNhnHsDSQmO6DoxSnLxoFLqNN5+ukxK5jq7OZNDwMJGxZ3X6RcSMWKEkIKL/wlq9yhj2T/kw==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "@angular-devkit/schematics": "9.1.9", + "@angular-devkit/core": "10.2.0", + "@angular-devkit/schematics": "10.2.0", "@yarnpkg/lockfile": "1.1.0", "ini": "1.3.5", "npm-package-arg": "^8.0.0", "pacote": "9.5.12", - "rxjs": "6.5.4", - "semver": "7.1.3", + "semver": "7.3.2", "semver-intersect": "1.4.0" }, "dependencies": { "@angular-devkit/core": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz", - "integrity": "sha512-SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz", + "integrity": "sha512-XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA==", "dev": true, "requires": { - "ajv": "6.12.0", + "ajv": "6.12.4", "fast-json-stable-stringify": "2.1.0", "magic-string": "0.25.7", - "rxjs": "6.5.4", + "rxjs": "6.6.2", "source-map": "0.7.3" } }, "@angular-devkit/schematics": { - "version": "9.1.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz", - "integrity": "sha512-aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz", + "integrity": "sha512-TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww==", "dev": true, "requires": { - "@angular-devkit/core": "9.1.9", - "ora": "4.0.3", - "rxjs": "6.5.4" + "@angular-devkit/core": "10.2.0", + "ora": "5.0.0", + "rxjs": "6.6.2" } }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -4594,12 +4973,12 @@ "dev": true }, "hosted-git-info": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", - "integrity": "sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz", + "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==", "dev": true, "requires": { - "lru-cache": "^5.1.1" + "lru-cache": "^6.0.0" } }, "json-schema-traverse": { @@ -4608,39 +4987,38 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, "npm-package-arg": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz", - "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz", + "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==", "dev": true, "requires": { - "hosted-git-info": "^3.0.2", + "hosted-git-info": "^3.0.6", "semver": "^7.0.0", "validate-npm-package-name": "^3.0.0" } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz", + "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==", "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "semver": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", - "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, "source-map": { @@ -4648,12 +5026,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true } } }, @@ -4729,9 +5101,9 @@ "dev": true }, "@types/marked": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.4.tgz", - "integrity": "sha512-fdg0NO4qpuHWtZk6dASgsrBggY+8N4dWthl1bAQG9ceKUNKFjqpHaDKCAhRUI6y8vavG7hLSJ4YBwJtZyZEXqw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-1.2.1.tgz", + "integrity": "sha512-d5adCgRHB+NAme23hkiTkvpfZUDqoNtL2Sr2nZBJqSj3zyHLxsfFWsGQ2sK2z9aX6L1xkJzon2c0jTPcsEjpaQ==" }, "@types/minimatch": { "version": "3.0.3", @@ -4794,179 +5166,193 @@ } } }, + "@types/yargs": { + "version": "15.0.11", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.11.tgz", + "integrity": "sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==", + "dev": true + }, "@webassemblyjs/ast": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", - "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", + "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz", + "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz", + "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz", + "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==", "dev": true }, "@webassemblyjs/helper-code-frame": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", - "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz", + "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/helper-fsm": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", - "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz", + "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", - "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz", + "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.8.5", - "mamacro": "^0.0.3" + "@webassemblyjs/ast": "1.9.0" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", - "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", + "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz", + "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==", "dev": true, "requires": { - "@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/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0" } }, "@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz", + "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz", + "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz", + "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz", + "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==", "dev": true, "requires": { - "@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/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/helper-wasm-section": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-opt": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz", + "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==", "dev": true, "requires": { - "@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/ast": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz", + "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0" } }, "@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz", + "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==", "dev": true, "requires": { - "@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/ast": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wast-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", - "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz", + "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==", "dev": true, "requires": { - "@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", + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/floating-point-hex-parser": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-code-frame": "1.9.0", + "@webassemblyjs/helper-fsm": "1.9.0", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz", + "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0", "@xtuc/long": "4.2.2" } }, @@ -4998,6 +5384,12 @@ "through": ">=2.2.7 <3" } }, + "abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", + "dev": true + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -5037,11 +5429,55 @@ "integrity": "sha512-JpuzcHQxTO6Nk8Q1Y8fVQAaxpimziAvVe/CX4h39ig0iHTtBNuySOGHUxmno8mNe4IMbjO8RJICmsrQKTdTWpQ==" }, "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true }, + "adjust-sourcemap-loader": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz", + "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "regex-parser": "^2.2.11" + }, + "dependencies": { + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", @@ -5118,11 +5554,18 @@ "dev": true }, "angular-tag-cloud-module": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-3.8.1.tgz", - "integrity": "sha512-PxOk9R+QsIzOMXX35SfzOX29tVI1IPC7/+UsgV4D/1xdWG8um6/uFLka26YydC1+u111ZsbJoMrDnUd65Ms9bw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.2.0.tgz", + "integrity": "sha512-F89pvDWmpy4VHMhw1CN5kSwiGjGhBIXS4ektJZraJTBwjxCf9GsTNiw0mjcMWpuqEIxccxcaN3kIx+Z+wvoV3Q==", "requires": { - "tslib": "^1.9.0" + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } } }, "ansi-colors": { @@ -5170,20 +5613,11 @@ } }, "app-root-path": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", - "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz", + "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==", "dev": true }, - "append-transform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true, - "requires": { - "default-require-extensions": "^2.0.0" - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -5230,6 +5664,12 @@ "commander": "^2.11.0" } }, + "arity-n": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz", + "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=", + "dev": true + }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", @@ -5290,14 +5730,15 @@ } }, "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { @@ -5389,78 +5830,50 @@ "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" }, "autoprefixer": { - "version": "9.7.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz", - "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==", + "version": "9.8.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", + "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", "dev": true, "requires": { - "browserslist": "^4.8.3", - "caniuse-lite": "^1.0.30001020", - "chalk": "^2.4.2", + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "colorette": "^1.2.1", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.26", - "postcss-value-parser": "^4.0.2" + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" }, "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz", + "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" + "caniuse-lite": "^1.0.30001165", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.621", + "escalade": "^3.1.1", + "node-releases": "^1.1.67" } }, "caniuse-lite": { - "version": "1.0.30001087", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz", - "integrity": "sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==", + "version": "1.0.30001165", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz", + "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==", "dev": true }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, "electron-to-chromium": { - "version": "1.3.481", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz", - "integrity": "sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==", + "version": "1.3.623", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.623.tgz", + "integrity": "sha512-CgbWTyPmJ4f9pqtqR+HPL3O0ay6BRhnpFD52TqBB2K8kTAcmAar2e93Vo1q651E4vnCHuTDuZDdbj0sTMP2QQw==", "dev": true }, "node-releases": { - "version": "1.1.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", - "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", + "version": "1.1.67", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", + "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==", "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -5490,7 +5903,6 @@ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz", "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "dev": true, - "optional": true, "requires": { "find-cache-dir": "^2.1.0", "loader-utils": "^1.4.0", @@ -5503,22 +5915,19 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true + "dev": true }, "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true + "dev": true }, "find-cache-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, - "optional": true, "requires": { "commondir": "^1.0.1", "make-dir": "^2.0.0", @@ -5530,7 +5939,6 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, - "optional": true, "requires": { "minimist": "^1.2.0" } @@ -5540,7 +5948,6 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, - "optional": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -5626,15 +6033,15 @@ } }, "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", + "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", "dev": true }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true }, "base64id": { @@ -5657,6 +6064,25 @@ "tweetnacl": "^0.14.3" } }, + "bent": { + "version": "7.3.12", + "resolved": "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz", + "integrity": "sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==", + "dev": true, + "requires": { + "bytesish": "^0.4.1", + "caseless": "~0.12.0", + "is-stream": "^2.0.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + } + } + }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -5699,15 +6125,15 @@ "dev": true }, "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, "bn.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", - "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", "dev": true }, "body-parser": { @@ -5889,34 +6315,26 @@ } }, "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", "dev": true, "requires": { - "bn.js": "^4.1.0", + "bn.js": "^5.0.0", "randombytes": "^2.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } } }, "browserify-sign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz", - "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.2", + "elliptic": "^6.5.3", "inherits": "^2.0.4", "parse-asn1": "^5.1.5", "readable-stream": "^3.6.0", @@ -6032,28 +6450,34 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, + "bytesish": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz", + "integrity": "sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==", + "dev": true + }, "cacache": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz", - "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz", + "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { - "chownr": "^1.1.2", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "glob": "^7.1.4", "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", + "lru-cache": "^6.0.0", "minipass": "^3.1.1", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.2", "mkdirp": "^1.0.3", - "move-concurrently": "^1.0.1", - "p-map": "^3.0.0", + "p-map": "^4.0.0", "promise-inflight": "^1.0.1", - "rimraf": "^2.7.1", + "rimraf": "^3.0.2", "ssri": "^8.0.0", - "tar": "^6.0.1", + "tar": "^6.0.2", "unique-filename": "^1.1.1" }, "dependencies": { @@ -6071,28 +6495,19 @@ "path-is-absolute": "^1.0.0" } }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "glob": "^7.1.3" + "aggregate-error": "^3.0.0" } }, "ssri": { @@ -6103,12 +6518,6 @@ "requires": { "minipass": "^3.1.1" } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true } } }, @@ -6141,6 +6550,16 @@ "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", "dev": true }, + "call-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } + }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", @@ -6256,25 +6675,25 @@ "dev": true }, "chokidar": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz", - "integrity": "sha512-df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==", - "dev": true, - "requires": { - "anymatch": "^3.1.0", - "braces": "^3.0.2", - "fsevents": "^2.0.6", - "glob-parent": "^5.0.0", - "is-binary-path": "^2.1.0", - "is-glob": "^4.0.1", - "normalize-path": "^3.0.0", - "readdirp": "^3.1.1" + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" }, "dependencies": { "anymatch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz", - "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -6282,9 +6701,9 @@ } }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, "braces": { @@ -6306,16 +6725,16 @@ } }, "fsevents": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", - "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "dev": true, "optional": true }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -6343,12 +6762,20 @@ "dev": true }, "readdirp": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz", - "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { - "picomatch": "^2.0.4" + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + } } }, "to-regex-range": { @@ -6363,9 +6790,9 @@ } }, "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true }, "chrome-trace-event": { @@ -6375,6 +6802,14 @@ "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "ci-info": { @@ -6436,9 +6871,9 @@ } }, "cli-spinners": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz", - "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz", + "integrity": "sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==", "dev": true }, "cli-table3": { @@ -6503,9 +6938,9 @@ } }, "cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, "clipboard": { @@ -6570,25 +7005,6 @@ "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", "dev": true }, - "clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - } - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -6642,27 +7058,50 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codelyzer": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.2.tgz", - "integrity": "sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz", + "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==", "dev": true, "requires": { - "app-root-path": "^2.2.1", + "@angular/compiler": "9.0.0", + "@angular/core": "9.0.0", + "app-root-path": "^3.0.0", "aria-query": "^3.0.0", "axobject-query": "2.0.2", "css-selector-tokenizer": "^0.7.1", "cssauron": "^1.4.0", "damerau-levenshtein": "^1.0.4", + "rxjs": "^6.5.3", "semver-dsl": "^1.0.1", "source-map": "^0.5.7", - "sprintf-js": "^1.1.2" + "sprintf-js": "^1.1.2", + "tslib": "^1.10.0", + "zone.js": "~0.10.3" }, "dependencies": { + "@angular/compiler": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz", + "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", + "dev": true + }, + "@angular/core": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz", + "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", + "dev": true + }, "sprintf-js": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", "dev": true + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true } } }, @@ -6676,13 +7115,13 @@ } }, "color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", - "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", + "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", "dev": true, "requires": { "color-convert": "^1.9.1", - "color-string": "^1.5.2" + "color-string": "^1.5.4" } }, "color-convert": { @@ -6701,15 +7140,21 @@ "dev": true }, "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", + "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", "dev": true, "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, + "colorette": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", + "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", + "dev": true + }, "colors": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", @@ -6743,12 +7188,6 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "compare-versions": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", - "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==", - "dev": true - }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -6767,6 +7206,15 @@ "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", "dev": true }, + "compose-function": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz", + "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=", + "dev": true, + "requires": { + "arity-n": "^1.0.4" + } + }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -6905,6 +7353,31 @@ "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "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" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "copy-descriptor": { @@ -6913,21 +7386,21 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-webpack-plugin": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.2.tgz", - "integrity": "sha512-9Gm8X0c6eXlKnmltMPFCBeGOKjtcRIyTt4VaO3k1TkNgVTe5Ov2lYsYVuyLp0kp8DItO3apewflM+1GYgh6V2Q==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz", + "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", "dev": true, "requires": { "cacache": "^15.0.4", - "fast-glob": "^3.2.2", + "fast-glob": "^3.2.4", "find-cache-dir": "^3.3.1", "glob-parent": "^5.1.1", "globby": "^11.0.1", "loader-utils": "^2.0.0", "normalize-path": "^3.0.0", - "p-limit": "^2.3.0", + "p-limit": "^3.0.1", "schema-utils": "^2.7.0", - "serialize-javascript": "^3.1.0", + "serialize-javascript": "^4.0.0", "webpack-sources": "^1.4.3" }, "dependencies": { @@ -6946,37 +7419,6 @@ "fill-range": "^7.0.1" } }, - "cacache": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.4.tgz", - "integrity": "sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==", - "dev": true, - "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.0", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", @@ -7006,20 +7448,6 @@ "to-regex-range": "^5.0.1" } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "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" - } - }, "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -7055,15 +7483,6 @@ "json5": "^2.1.2" } }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -7074,18 +7493,6 @@ "picomatch": "^2.0.5" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -7093,21 +7500,12 @@ "dev": true }, "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "aggregate-error": "^3.0.0" + "yocto-queue": "^0.1.0" } }, "picomatch": { @@ -7116,24 +7514,6 @@ "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "ssri": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", - "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -7142,12 +7522,6 @@ "requires": { "is-number": "^7.0.0" } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true } } }, @@ -7194,13 +7568,13 @@ } }, "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "elliptic": "^6.5.3" }, "dependencies": { "bn.js": { @@ -7307,24 +7681,23 @@ } }, "css-loader": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.1.tgz", - "integrity": "sha512-0G4CbcZzQ9D1Q6ndOfjFuMDo8uLYMu5vc9Abs5ztyHcKvmil6GJrMiNjzzi3tQvUF+mVRuDg7bE6Oc0Prolgig==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz", + "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==", "dev": true, "requires": { - "camelcase": "^5.3.1", + "camelcase": "^6.0.0", "cssesc": "^3.0.0", "icss-utils": "^4.1.1", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.27", + "loader-utils": "^2.0.0", + "postcss": "^7.0.32", "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^3.0.2", + "postcss-modules-local-by-default": "^3.0.3", "postcss-modules-scope": "^2.2.0", "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.0.3", - "schema-utils": "^2.6.5", - "semver": "^6.3.0" + "postcss-value-parser": "^4.1.0", + "schema-utils": "^2.7.0", + "semver": "^7.3.2" }, "dependencies": { "big.js": { @@ -7333,10 +7706,10 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", "dev": true }, "emojis-list": { @@ -7346,42 +7719,33 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -7413,14 +7777,13 @@ "dev": true }, "css-selector-tokenizer": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz", - "integrity": "sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz", + "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", "dev": true, "requires": { "cssesc": "^3.0.0", - "fastparse": "^1.1.2", - "regexpu-core": "^4.6.0" + "fastparse": "^1.1.2" } }, "css-tree": { @@ -7442,9 +7805,9 @@ } }, "css-what": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz", - "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", "dev": true }, "cssauron": { @@ -7540,28 +7903,28 @@ "dev": true }, "csso": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz", - "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", "dev": true, "requires": { - "css-tree": "1.0.0-alpha.39" + "css-tree": "^1.1.2" }, "dependencies": { "css-tree": { - "version": "1.0.0-alpha.39", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz", - "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz", + "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==", "dev": true, "requires": { - "mdn-data": "2.0.6", + "mdn-data": "2.0.14", "source-map": "^0.6.1" } }, "mdn-data": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz", - "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, "source-map": { @@ -7903,6 +8266,16 @@ "popper.js": "^1.0.0" } }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dev": true, + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, "dagre": { "version": "0.8.4", "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz", @@ -7933,6 +8306,17 @@ } } }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, "date-fns": { "version": "1.30.1", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", @@ -8000,15 +8384,6 @@ "ip-regex": "^2.1.0" } }, - "default-require-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", - "dev": true, - "requires": { - "strip-bom": "^3.0.0" - } - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -8322,9 +8697,9 @@ }, "dependencies": { "domelementtype": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", - "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", + "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==", "dev": true } } @@ -8342,9 +8717,9 @@ "dev": true }, "domino": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz", - "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww==" + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz", + "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==" }, "dompurify": { "version": "2.2.0", @@ -8362,9 +8737,9 @@ } }, "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "requires": { "is-obj": "^2.0.0" @@ -8452,9 +8827,9 @@ "dev": true }, "emoji-toolkit": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/emoji-toolkit/-/emoji-toolkit-5.5.1.tgz", - "integrity": "sha512-H8E6DNTsRLgy1FVWAiyuW4nqHka0rvUkXhmJPzL28gXo4pLKvuoEi6VhodJ1RfIZOZZ7Zmxo1sENYinyytl/ww==" + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/emoji-toolkit/-/emoji-toolkit-6.0.1.tgz", + "integrity": "sha512-QZZq0beHg753JxcBt89UBFqzwYNuMtXhNO+jY3viSAndewmn9biTE5glaro1RA0uWJ4hKqw4k1Mboe1M6sGkMA==" }, "emojis-list": { "version": "2.1.0", @@ -8469,12 +8844,12 @@ "dev": true }, "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, "requires": { - "iconv-lite": "~0.4.13" + "iconv-lite": "^0.6.2" } }, "end-of-stream": { @@ -8510,27 +8885,27 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } }, "engine.io-client": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz", - "integrity": "sha512-0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.4.tgz", + "integrity": "sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==", "dev": true, "requires": { "component-emitter": "~1.3.0", "component-inherit": "0.0.3", - "debug": "~4.1.0", + "debug": "~3.1.0", "engine.io-parser": "~2.2.0", "has-cors": "1.1.0", "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", + "parseqs": "0.0.6", + "parseuri": "0.0.6", "ws": "~6.1.0", "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" @@ -8543,18 +8918,24 @@ "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.0.0" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "parseqs": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", + "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", + "dev": true + }, + "parseuri": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", + "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", "dev": true }, "ws": { @@ -8569,14 +8950,14 @@ } }, "engine.io-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", - "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", + "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", "dev": true, "requires": { "after": "0.8.2", "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", + "base64-arraybuffer": "0.1.4", "blob": "0.0.5", "has-binary2": "~1.0.2" } @@ -8599,9 +8980,9 @@ "dev": true }, "entities": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", - "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", "dev": true }, "err-code": { @@ -8629,20 +9010,21 @@ } }, "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" }, @@ -8652,6 +9034,18 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } } } }, @@ -8666,6 +9060,28 @@ "is-symbol": "^1.0.2" } }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "dev": true, + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", @@ -8681,6 +9097,22 @@ "es6-promise": "^4.0.3" } }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "dev": true, + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -8704,21 +9136,37 @@ } }, "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "estraverse": { @@ -8752,9 +9200,9 @@ "dev": true }, "events": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz", - "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", + "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==", "dev": true }, "eventsource": { @@ -8920,6 +9368,23 @@ } } }, + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "dev": true, + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz", + "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==", + "dev": true + } + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -8953,6 +9418,17 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "extglob": { @@ -9226,12 +9702,6 @@ "emojis-list": "^3.0.0", "json5": "^2.1.2" } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true } } }, @@ -9241,16 +9711,6 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "optional": true }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "dev": true, - "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" - } - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -9564,9 +10024,9 @@ "dev": true }, "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true }, "get-caller-file": { @@ -9575,6 +10035,25 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + } + } + }, "get-own-enumerable-property-symbols": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", @@ -9797,53 +10276,20 @@ "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", "dev": true }, - "handlebars": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, - "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" + "ajv": "^6.12.3", + "har-schema": "^2.0.0" }, "dependencies": { "ajv": { @@ -10079,6 +10525,12 @@ "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==", "dev": true }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, "http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", @@ -10190,18 +10642,18 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -10330,12 +10782,12 @@ } }, "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", + "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "icss-utils": { @@ -10348,9 +10800,9 @@ } }, "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true }, "iferr": { @@ -10471,21 +10923,21 @@ "dev": true }, "inquirer": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", - "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", + "chalk": "^4.1.0", "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", + "cli-width": "^3.0.0", "external-editor": "^3.0.3", "figures": "^3.0.0", - "lodash": "^4.17.15", + "lodash": "^4.17.19", "mute-stream": "0.0.8", "run-async": "^2.4.0", - "rxjs": "^6.5.3", + "rxjs": "^6.6.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0", "through": "^2.3.6" @@ -10507,19 +10959,18 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -10587,6 +11038,23 @@ "signal-exit": "^3.0.2" } }, + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -10608,9 +11076,9 @@ } }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -10676,10 +11144,13 @@ } }, "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz", + "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0" + } }, "is-arrayish": { "version": "0.2.1", @@ -10709,9 +11180,9 @@ } }, "is-callable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz", - "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "dev": true }, "is-ci": { @@ -10737,6 +11208,15 @@ "rgba-regex": "^1.0.0" } }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -10775,9 +11255,9 @@ "dev": true }, "is-docker": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", - "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", "dev": true }, "is-extendable": { @@ -10822,6 +11302,12 @@ "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -10913,9 +11399,9 @@ "dev": true }, "is-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz", - "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { "has-symbols": "^1.0.1" @@ -11020,80 +11506,12 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "istanbul-api": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz", - "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==", - "dev": true, - "requires": { - "async": "^2.6.2", - "compare-versions": "^3.4.0", - "fileset": "^2.0.3", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-hook": "^2.0.7", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.4", - "js-yaml": "^3.13.1", - "make-dir": "^2.1.0", - "minimatch": "^3.0.4", - "once": "^1.4.0" - }, - "dependencies": { - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } - }, - "istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", - "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", - "dev": true, - "requires": { - "@babel/generator": "^7.4.0", - "@babel/parser": "^7.4.3", - "@babel/template": "^7.4.0", - "@babel/traverse": "^7.4.3", - "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5", - "semver": "^6.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, "istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", "dev": true }, - "istanbul-lib-hook": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", - "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "dev": true, - "requires": { - "append-transform": "^1.0.0" - } - }, "istanbul-lib-instrument": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", @@ -11107,34 +11525,33 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz", - "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "^7.10.3" + "@babel/highlight": "^7.10.4" } }, "@babel/core": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz", - "integrity": "sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/generator": "^7.10.3", - "@babel/helper-module-transforms": "^7.10.1", - "@babel/helpers": "^7.10.1", - "@babel/parser": "^7.10.3", - "@babel/template": "^7.10.3", - "@babel/traverse": "^7.10.3", - "@babel/types": "^7.10.3", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz", + "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helpers": "^7.12.5", + "@babel/parser": "^7.12.10", + "@babel/template": "^7.12.7", + "@babel/traverse": "^7.12.10", + "@babel/types": "^7.12.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", + "lodash": "^4.17.19", "semver": "^5.4.1", "source-map": "^0.5.0" }, @@ -11148,174 +11565,174 @@ } }, "@babel/generator": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz", - "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz", + "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==", "dev": true, "requires": { - "@babel/types": "^7.10.3", + "@babel/types": "^7.12.10", "jsesc": "^2.5.1", - "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz", - "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.3", - "@babel/template": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz", - "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", + "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.10" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz", - "integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", + "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.7" } }, "@babel/helper-module-imports": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz", - "integrity": "sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.5" } }, "@babel/helper-module-transforms": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz", - "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.1", - "@babel/helper-replace-supers": "^7.10.1", - "@babel/helper-simple-access": "^7.10.1", - "@babel/helper-split-export-declaration": "^7.10.1", - "@babel/template": "^7.10.1", - "@babel/types": "^7.10.1", - "lodash": "^4.17.13" + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "lodash": "^4.17.19" } }, "@babel/helper-optimise-call-expression": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz", - "integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz", + "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==", "dev": true, "requires": { - "@babel/types": "^7.10.3" + "@babel/types": "^7.12.10" } }, "@babel/helper-replace-supers": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", - "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz", + "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.1", - "@babel/helper-optimise-call-expression": "^7.10.1", - "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1" + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" } }, "@babel/helper-simple-access": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz", - "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", "dev": true, "requires": { - "@babel/template": "^7.10.1", - "@babel/types": "^7.10.1" + "@babel/types": "^7.12.1" } }, "@babel/helper-split-export-declaration": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", - "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "^7.10.1" + "@babel/types": "^7.11.0" } }, "@babel/helpers": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", - "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", + "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", "dev": true, "requires": { - "@babel/template": "^7.10.1", - "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1" + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" } }, "@babel/highlight": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz", - "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", + "@babel/helper-validator-identifier": "^7.10.4", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz", - "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz", + "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==", "dev": true }, "@babel/template": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz", - "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==", + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", + "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7" } }, "@babel/traverse": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz", - "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz", + "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.3", - "@babel/generator": "^7.10.3", - "@babel/helper-function-name": "^7.10.3", - "@babel/helper-split-export-declaration": "^7.10.1", - "@babel/parser": "^7.10.3", - "@babel/types": "^7.10.3", + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.10", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.10", + "@babel/types": "^7.12.10", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.13" + "lodash": "^4.17.19" } }, "@babel/types": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz", - "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.3", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } }, @@ -11329,12 +11746,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "js-tokens": { @@ -11358,12 +11775,6 @@ "minimist": "^1.2.5" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -11379,21 +11790,45 @@ } }, "istanbul-lib-report": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", - "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", "dev": true, "requires": { - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "supports-color": "^6.1.0" + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" }, "dependencies": { - "istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -11411,18 +11846,18 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -11463,12 +11898,13 @@ } }, "istanbul-reports": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", - "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", "dev": true, "requires": { - "handlebars": "^4.1.2" + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" } }, "jasmine-core": { @@ -11478,20 +11914,29 @@ "dev": true }, "jasmine-spec-reporter": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", - "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz", + "integrity": "sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g==", "dev": true, "requires": { - "colors": "1.1.2" + "colors": "1.4.0" + }, + "dependencies": { + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true + } } }, "jest-worker": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz", - "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==", + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", + "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { + "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^7.0.0" }, @@ -11503,9 +11948,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -11593,6 +12038,12 @@ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, + "jsonc-parser": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.0.tgz", + "integrity": "sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==", + "dev": true + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -11627,23 +12078,24 @@ } }, "karma": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.2.tgz", - "integrity": "sha512-rB3Ua5yDxmIupTj67r3Q8itz7TxJzRE6DmVcOfV20D509Uu9AoBKlVwbZhND4kcm6BqLfbHtv4DZC9QJfrUY+w==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.9.tgz", + "integrity": "sha512-dUA5z7Lo7G4FRSe1ZAXqOINEEWxmCjDBbfRBmU/wYlSMwxUQJP/tEEP90yJt3Uqo03s9rCgVnxtlfq+uDhxSPg==", "dev": true, "requires": { "body-parser": "^1.19.0", "braces": "^3.0.2", - "chokidar": "^3.4.2", + "chokidar": "^3.0.0", "colors": "^1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", + "flatted": "^2.0.2", "glob": "^7.1.6", "graceful-fs": "^4.2.4", "http-proxy": "^1.18.1", "isbinaryfile": "^4.0.6", - "lodash": "^4.17.19", + "lodash": "^4.17.15", "log4js": "^6.2.1", "mime": "^2.4.5", "minimatch": "^3.0.4", @@ -11664,31 +12116,14 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", - "dev": true - }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -11698,22 +12133,6 @@ "fill-range": "^7.0.1" } }, - "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -11771,13 +12190,6 @@ "path-exists": "^4.0.0" } }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, - "optional": true - }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -11792,30 +12204,12 @@ "path-is-absolute": "^1.0.0" } }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -11843,12 +12237,6 @@ "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", "dev": true }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -11864,32 +12252,6 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - }, - "dependencies": { - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true - } - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -11986,28 +12348,39 @@ } }, "karma-coverage-istanbul-reporter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz", - "integrity": "sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz", + "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==", "dev": true, "requires": { - "istanbul-api": "^2.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^3.0.6", + "istanbul-reports": "^3.0.2", "minimatch": "^3.0.4" } }, "karma-jasmine": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz", - "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz", + "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==", "dev": true, "requires": { - "jasmine-core": "^3.3" + "jasmine-core": "^3.6.0" + }, + "dependencies": { + "jasmine-core": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz", + "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==", + "dev": true + } } }, "karma-jasmine-html-reporter": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz", - "integrity": "sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz", + "integrity": "sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q==", "dev": true }, "karma-source-map-support": { @@ -12029,9 +12402,9 @@ } }, "katex": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", - "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.12.0.tgz", + "integrity": "sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg==", "requires": { "commander": "^2.19.0" }, @@ -12057,6 +12430,18 @@ "is-buffer": "^1.1.5" } }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true + }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", + "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==", + "dev": true + }, "lazy-ass": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", @@ -12064,19 +12449,17 @@ "dev": true }, "less": { - "version": "3.11.3", - "resolved": "https://registry.npmjs.org/less/-/less-3.11.3.tgz", - "integrity": "sha512-VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/less/-/less-3.12.2.tgz", + "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==", "dev": true, "requires": { - "clone": "^2.1.2", "errno": "^0.1.1", "graceful-fs": "^4.1.2", "image-size": "~0.5.0", "make-dir": "^2.1.0", "mime": "^1.4.1", - "promise": "^7.1.1", - "request": "^2.83.0", + "native-request": "^1.0.5", "source-map": "~0.6.0", "tslib": "^1.10.0" }, @@ -12087,18 +12470,59 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, "optional": true + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true } } }, "less-loader": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz", - "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", "dev": true, "requires": { - "clone": "^2.1.1", - "loader-utils": "^1.1.0", - "pify": "^4.0.1" + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } } }, "leven": { @@ -12181,9 +12605,9 @@ } }, "license-webpack-plugin": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.4.tgz", - "integrity": "sha512-1Xq72fmPbTg5KofXs+yI5L4QqPFjQ6mZxoeI6D7gfiEDOtaEIk6PGrdLaej90bpDqKNHNxlQ/MW4tMAL6xMPJQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.0.tgz", + "integrity": "sha512-JK/DXrtN6UeYQSgkg5q1+pgJ8aiKPL9tnz9Wzw+Ikkf+8mJxG56x6t8O+OH/tAeF/5NREnelTEMyFtbJNkjH4w==", "dev": true, "requires": { "@types/webpack-sources": "^0.1.5", @@ -12556,6 +12980,12 @@ "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", "dev": true }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -12670,9 +13100,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -12687,9 +13117,9 @@ } }, "loglevel": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", - "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", + "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", "dev": true }, "loose-envify": { @@ -12702,12 +13132,12 @@ } }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, "magic-string": { @@ -12768,12 +13198,6 @@ "ssri": "^6.0.0" }, "dependencies": { - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, "cacache": { "version": "12.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", @@ -12797,6 +13221,12 @@ "y18n": "^4.0.0" } }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -12852,12 +13282,6 @@ } } }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==", - "dev": true - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -12872,9 +13296,9 @@ } }, "marked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", - "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.6.tgz", + "integrity": "sha512-7vVuSEZ8g/HH3hK/BH/+7u/NJj7x9VY4EHzujLDcqAQLiOUeFJYAsfSAyoWtR17lKrx7b08qyIno4lffwrzTaA==" }, "material-design-icons-iconfont": { "version": "6.1.0", @@ -13020,9 +13444,9 @@ "dev": true }, "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", "dev": true }, "mime-types": { @@ -13049,9 +13473,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz", - "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz", + "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==", "dev": true, "requires": { "loader-utils": "^1.1.0", @@ -13119,14 +13543,6 @@ "dev": true, "requires": { "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "minipass-collect": { @@ -13148,30 +13564,22 @@ } }, "minipass-pipeline": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz", - "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, "requires": { "minipass": "^3.0.0" } }, "minizlib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", - "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "requires": { "minipass": "^3.0.0", "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "mississippi": { @@ -13238,6 +13646,31 @@ "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.3" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "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" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, "ms": { @@ -13309,6 +13742,13 @@ } } }, + "native-request": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", + "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", + "dev": true, + "optional": true + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", @@ -13321,32 +13761,54 @@ "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", "dev": true }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, "ng2-ui-auth": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/ng2-ui-auth/-/ng2-ui-auth-10.0.1.tgz", "integrity": "sha512-7LqWdH4/9Id21Ced5LCSIA9aUTPQU0DPwhtQhBMxHRCFx9P4bpCAUwTgJ0XLt2pczusdnGpmBxeDFILZnwupmA==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "ngx-clipboard": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-13.0.1.tgz", - "integrity": "sha512-e7QBsw7bX5ajhVR2++NAaYZYw90hKeEBlb006TW85WDUA3kmlrXpMDwOvVJuRewU6Nh+U1QiQMJq5a0ivk0zWg==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-14.0.1.tgz", + "integrity": "sha512-y6fDrvAso1cbM+VvHgB2kJ3dcQ/EBPol33nLaqqKB1jNO/Kd3l17EHdXNW/oKY0wUKCHk7ZCuiinREgUHEYfXg==", "requires": { - "ngx-window-token": ">=3.0.0" + "ngx-window-token": ">=4.0.0", + "tslib": "^2.0.0" } }, "ngx-markdown": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-9.1.1.tgz", - "integrity": "sha512-dEuR1KBa/Ivb1HT+DvSW1p6wLSx79EZz8/WpgDxiEZfL1PADTQUziNLgmtwAEgBTDjsXFhZ/Af7Zq5J9dQf6KQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-10.1.1.tgz", + "integrity": "sha512-bUVgN6asb35d5U4xM5CNfo7pSpuwqJSdTgK0PhNZzLiaiyPIK2owtLF6sWGhxTThJu+LngJPjj4MQ+AFe/s8XQ==", "requires": { - "@types/marked": "^0.7.4", - "emoji-toolkit": "^5.5.0", - "katex": "^0.11.0", + "@types/marked": "^1.1.0", + "emoji-toolkit": "^6.0.1", + "katex": "^0.12.0", "marked": "^1.1.0", - "prismjs": "^1.20.0" + "prismjs": "^1.20.0", + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } } }, "ngx-sharebuttons": { @@ -13355,12 +13817,29 @@ "integrity": "sha512-X/janRE4HBr3/ZZvsRF5go0rFDhIAquftDj1cHYzwweNa7vh2L9v2/tP+n9DzCtAUlHL7qXHPpwO9ON8+SBcIA==", "requires": { "tslib": "^1.10.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, "ngx-window-token": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ngx-window-token/-/ngx-window-token-3.0.0.tgz", - "integrity": "sha512-MDVIQB2SqFCbpoTqEXhO2529hsvpCYyw/iogjU6uskKqUKh79XVKWSMpRH9S1yTr0Ucgh8nFeNcpv2DnFdikJA==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ngx-window-token/-/ngx-window-token-4.0.0.tgz", + "integrity": "sha512-z6tS3UQoKULdABWHpE57l1xtoxFFzlwLe1n+nu9+xzCZUdSvkGqhb5dSje4NOVhA6mMOqzR4SctSBZARwqPPuQ==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } + } }, "nice-try": { "version": "1.0.5", @@ -13380,9 +13859,9 @@ } }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-libs-browser": { @@ -13485,10 +13964,13 @@ }, "dependencies": { "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -13521,9 +14003,9 @@ } }, "npm-pick-manifest": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz", - "integrity": "sha512-PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz", + "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==", "dev": true, "requires": { "npm-install-checks": "^4.0.0", @@ -13532,45 +14014,33 @@ }, "dependencies": { "hosted-git-info": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", - "integrity": "sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==", - "dev": true, - "requires": { - "lru-cache": "^5.1.1" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz", + "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==", "dev": true, "requires": { - "yallist": "^3.0.2" + "lru-cache": "^6.0.0" } }, "npm-package-arg": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz", - "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz", + "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==", "dev": true, "requires": { - "hosted-git-info": "^3.0.2", + "hosted-git-info": "^3.0.6", "semver": "^7.0.0", "validate-npm-package-name": "^3.0.0" } }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -13608,11 +14078,26 @@ "safe-buffer": "^5.2.0" }, "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true } } }, @@ -13695,19 +14180,19 @@ } }, "object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", + "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", "dev": true }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz", + "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" } }, "object-keys": { @@ -13737,13 +14222,14 @@ } }, "object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz", + "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "es-abstract": "^1.18.0-next.1" } }, "object.pick": { @@ -13755,14 +14241,14 @@ } }, "object.values": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", - "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz", + "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", + "es-abstract": "^1.18.0-next.1", "has": "^1.0.3" } }, @@ -13805,9 +14291,9 @@ } }, "open": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz", - "integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/open/-/open-7.2.0.tgz", + "integrity": "sha512-4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ==", "dev": true, "requires": { "is-docker": "^2.0.0", @@ -13838,16 +14324,16 @@ } }, "ora": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz", - "integrity": "sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.0.0.tgz", + "integrity": "sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==", "dev": true, "requires": { - "chalk": "^3.0.0", + "chalk": "^4.1.0", "cli-cursor": "^3.1.0", - "cli-spinners": "^2.2.0", + "cli-spinners": "^2.4.0", "is-interactive": "^1.0.0", - "log-symbols": "^3.0.0", + "log-symbols": "^4.0.0", "mute-stream": "0.0.8", "strip-ansi": "^6.0.0", "wcwidth": "^1.0.1" @@ -13860,19 +14346,18 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -13909,6 +14394,15 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "log-symbols": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "dev": true, + "requires": { + "chalk": "^4.0.0" + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -13929,9 +14423,9 @@ } }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -14073,12 +14567,6 @@ "which": "^1.3.1" }, "dependencies": { - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, "cacache": { "version": "12.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", @@ -14100,19 +14588,14 @@ "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } } }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -14181,6 +14664,15 @@ "semver": "^5.4.1" } }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -14235,9 +14727,9 @@ } }, "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", "dev": true }, "parallel-transform": { @@ -14252,14 +14744,13 @@ } }, "parse-asn1": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", - "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "^4.0.0", + "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", "pbkdf2": "^3.0.3", "safe-buffer": "^5.1.1" @@ -14276,11 +14767,20 @@ } }, "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, + "parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "dev": true, + "requires": { + "parse5": "^6.0.1" + } + }, "parseqs": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", @@ -14423,60 +14923,6 @@ "find-up": "^3.0.0" } }, - "pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } - } - }, "please-upgrade-node": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", @@ -14486,6 +14932,15 @@ "semver-compare": "^1.0.0" } }, + "pnp-webpack-plugin": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", + "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==", + "dev": true, + "requires": { + "ts-pnp": "^1.1.6" + } + }, "popper.js": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz", @@ -14503,18 +14958,18 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -14525,9 +14980,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", + "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -14575,9 +15030,9 @@ } }, "postcss-calc": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz", - "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", + "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", "dev": true, "requires": { "postcss": "^7.0.27", @@ -14681,9 +15136,9 @@ } }, "postcss-load-config": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", - "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", @@ -14857,15 +15312,15 @@ } }, "postcss-modules-local-by-default": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz", - "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz", + "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", "dev": true, "requires": { "icss-utils": "^4.1.1", - "postcss": "^7.0.16", + "postcss": "^7.0.32", "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.0" + "postcss-value-parser": "^4.1.0" } }, "postcss-modules-scope": { @@ -15103,22 +15558,15 @@ } }, "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", + "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "dev": true, "requires": { "cssesc": "^3.0.0", "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - }, - "dependencies": { - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - } + "uniq": "^1.0.1", + "util-deprecate": "^1.0.2" } }, "postcss-svgo": { @@ -15188,7 +15636,8 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true + "dev": true, + "optional": true }, "process": { "version": "0.11.10", @@ -15196,16 +15645,6 @@ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, - "optional": true, - "requires": { - "asap": "~2.0.3" - } - }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -15222,6 +15661,16 @@ "retry": "^0.10.0" } }, + "prompts": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz", + "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.4" + } + }, "protoduck": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", @@ -15359,9 +15808,9 @@ "dev": true }, "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, "ramda": { @@ -15425,13 +15874,13 @@ } }, "raw-loader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.0.tgz", - "integrity": "sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz", + "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==", "dev": true, "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.5.0" + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" }, "dependencies": { "big.js": { @@ -15447,30 +15896,24 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true } } }, @@ -15661,9 +16104,9 @@ } }, "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true }, "regenerator-transform": { @@ -15685,6 +16128,12 @@ "safe-regex": "^1.1.0" } }, + "regex-parser": { + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz", + "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==", + "dev": true + }, "regexp.prototype.flags": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", @@ -15693,36 +16142,44 @@ "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1" - } - }, - "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" }, "dependencies": { - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "regenerate": "^1.4.0" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } } } }, @@ -15956,53 +16413,180 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "resolve-url-loader": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz", + "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==", + "dev": true, + "requires": { + "adjust-sourcemap-loader": "3.0.0", + "camelcase": "5.3.1", + "compose-function": "3.0.3", + "convert-source-map": "1.7.0", + "es6-iterator": "2.0.3", + "loader-utils": "1.2.3", + "postcss": "7.0.21", + "rework": "1.0.1", + "rework-visit": "1.0.0", + "source-map": "0.6.1" }, "dependencies": { - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } - } - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - }, - "retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rfdc": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", - "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", + "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" + } + }, + "postcss": { + "version": "7.0.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz", + "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + }, + "dependencies": { + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + } + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" + }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, + "rework": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", + "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", + "dev": true, + "requires": { + "convert-source-map": "^0.3.3", + "css": "^2.0.0" + }, + "dependencies": { + "convert-source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", + "dev": true + } + } + }, + "rework-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz", + "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=", + "dev": true + }, + "rfdc": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", + "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", "dev": true }, "rgb-regex": { @@ -16018,12 +16602,28 @@ "dev": true }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "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" + } + } } }, "ripemd160": { @@ -16037,9 +16637,9 @@ } }, "rollup": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.1.0.tgz", - "integrity": "sha512-gfE1455AEazVVTJoeQtcOq/U6GSxwoj4XPSWVsuWmgIxj7sBQNLDOSA82PbdMe+cP8ql8fR1jogPFe8Wg8g4SQ==", + "version": "2.26.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz", + "integrity": "sha512-rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA==", "dev": true, "requires": { "fsevents": "~2.1.2" @@ -16082,162 +16682,236 @@ } }, "rxjs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", - "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, - "rxjs-tslint": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/rxjs-tslint/-/rxjs-tslint-0.1.8.tgz", - "integrity": "sha512-4MNcco1pugjNyjkUkvJ9ngJSMCuwmyc1g6EkEYzlTK0PrZxm8xVaBeBz5aPLE3AzldQbYkOErOVAayUlzQkjAg==", + "rxjs-report-usage": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/rxjs-report-usage/-/rxjs-report-usage-1.0.5.tgz", + "integrity": "sha512-jZeg+TTkvP8kAv0tIQj3WOuIhYLi+Ig9mG8DCc+nJHQ1ObJr8IaeNPbJmXDRfHvH3MKQMBzboY4RbQ6jWt6cIg==", "dev": true, "requires": { - "chalk": "^2.4.0", - "tslint": "^5.9.1", - "tsutils": "^2.25.0", - "typescript": ">=2.8.3", - "yargs": "^15.3.1" + "@babel/parser": "~7.10.3", + "@babel/traverse": "~7.10.3", + "@babel/types": "~7.10.3", + "bent": "~7.3.6", + "chalk": "~4.1.0", + "glob": "~7.1.6", + "prompts": "~2.3.2" }, "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "@babel/highlight": "^7.10.4" } }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "@babel/generator": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz", + "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "@babel/types": "^7.12.10", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "@babel/helper-get-function-arity": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", + "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "@babel/types": "^7.12.10" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "@babel/helper-split-export-declaration": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "@babel/types": "^7.11.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + } } }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "@babel/parser": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", "dev": true }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "@babel/template": { + "version": "7.12.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", + "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.12.7", + "@babel/types": "^7.12.7" + }, + "dependencies": { + "@babel/parser": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz", + "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==", + "dev": true + }, + "@babel/types": { + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz", + "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "@babel/traverse": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/types": "^7.10.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" } }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "@babel/types": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", + "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" } }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, @@ -16249,62 +16923,119 @@ "requires": { "color-name": "~1.1.4" } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, - "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "ms": "2.1.2" } }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "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" + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" } } } }, "rxjs-tslint-rules": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/rxjs-tslint-rules/-/rxjs-tslint-rules-4.17.0.tgz", - "integrity": "sha512-LDiLOSxB3+tFhXM4iXaB87izkmOPImByDjR08PsIp5NQfngx0hWW52l63+rJDBs4BFd0Ojwa+RLk09lFLz2JRA==", + "version": "4.34.7", + "resolved": "https://registry.npmjs.org/rxjs-tslint-rules/-/rxjs-tslint-rules-4.34.7.tgz", + "integrity": "sha512-AF6FlEQ6tj/tF3IyP0WzMRXvmMv8xoTsdN+wS/BNGxkQhO95o0JVTQEsc3jXCPPwYPCKYDYGfx/rbDuzY9xAag==", "dev": true, "requires": { - "@phenomnomnominal/tsquery": "^3.0.0", - "decamelize": "^2.0.0", + "@phenomnomnominal/tsquery": "^4.0.0", + "decamelize": "^4.0.0", "resolve": "^1.4.0", - "tslib": "^1.8.0", - "tsutils": "^3.0.0" + "rxjs-report-usage": "^1.0.4", + "semver": "^7.0.0", + "tslib": "^2.0.0", + "tsutils": "^3.0.0", + "tsutils-etc": "^1.2.2" }, "dependencies": { "decamelize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", - "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", "dev": true, "requires": { - "xregexp": "4.0.0" + "lru-cache": "^6.0.0" } }, + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==", + "dev": true + }, "tsutils": { "version": "3.17.1", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", @@ -16312,6 +17043,14 @@ "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } } } @@ -16335,25 +17074,25 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.26.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.3.tgz", - "integrity": "sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==", + "version": "1.26.10", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz", + "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" } }, "sass-loader": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz", - "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.1.tgz", + "integrity": "sha512-b2PSldKVTS3JcFPHSrEXh3BeAfR7XknGiGCAO5aHruR3Pf3kqLP3Gb2ypXLglRrAzgZkloNxLZ7GXEGDX0hBUQ==", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "loader-utils": "^1.2.3", - "neo-async": "^2.6.1", - "schema-utils": "^2.6.1", - "semver": "^6.3.0" + "klona": "^2.0.3", + "loader-utils": "^2.0.0", + "neo-async": "^2.6.2", + "schema-utils": "^2.7.0", + "semver": "^7.3.2" }, "dependencies": { "big.js": { @@ -16369,42 +17108,39 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -16468,6 +17204,11 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" + }, + "typescript": { + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==" } } }, @@ -16484,12 +17225,12 @@ "dev": true }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.9.0" + "node-forge": "^0.10.0" } }, "semver": { @@ -16551,9 +17292,9 @@ } }, "serialize-javascript": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", - "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -16654,23 +17395,6 @@ "safe-buffer": "^5.0.1" } }, - "shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "requires": { - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - } - } - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -16708,6 +17432,12 @@ } } }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -16847,9 +17577,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -16882,6 +17612,12 @@ "to-array": "0.1.4" }, "dependencies": { + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -16892,22 +17628,28 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "socket.io-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", - "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz", + "integrity": "sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==", "dev": true, "requires": { - "component-emitter": "1.2.1", + "component-emitter": "~1.3.0", "debug": "~3.1.0", "isarray": "2.0.1" }, "dependencies": { + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -16948,9 +17690,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -16989,9 +17731,9 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -17007,9 +17749,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -17066,13 +17808,56 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-loader": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", - "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.0.2.tgz", + "integrity": "sha512-oX8d6ndRjN+tVyjj6PlXSyFPhDdVAPsZA30nD3/II8g4uOv8fCz0DMn5sy8KtVbDfKQxOpGwGJnK3xIW3tauDw==", "dev": true, "requires": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" + "data-urls": "^2.0.0", + "iconv-lite": "^0.6.2", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "source-map-resolve": { @@ -17186,12 +17971,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -17217,12 +18002,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -17245,9 +18030,9 @@ } }, "speed-measure-webpack-plugin": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", - "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz", + "integrity": "sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ==", "dev": true, "requires": { "chalk": "^2.0.1" @@ -17386,9 +18171,9 @@ "dev": true }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -17425,23 +18210,23 @@ } }, "string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", + "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" } }, "string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", + "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" } }, "string_decoder": { @@ -17480,12 +18265,6 @@ "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -17499,13 +18278,13 @@ "dev": true }, "style-loader": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz", - "integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz", + "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==", "dev": true, "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.6.4" + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.6" }, "dependencies": { "big.js": { @@ -17521,30 +18300,24 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true } } }, @@ -17573,18 +18346,18 @@ } }, "stylus": { - "version": "0.54.7", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz", - "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==", + "version": "0.54.8", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz", + "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", "dev": true, "requires": { "css-parse": "~2.0.0", "debug": "~3.1.0", - "glob": "^7.1.3", - "mkdirp": "~0.5.x", + "glob": "^7.1.6", + "mkdirp": "~1.0.4", "safer-buffer": "^2.1.2", "sax": "~1.2.4", - "semver": "^6.0.0", + "semver": "^6.3.0", "source-map": "^0.7.3" }, "dependencies": { @@ -17611,6 +18384,12 @@ "path-is-absolute": "^1.0.0" } }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -17710,43 +18489,31 @@ "dev": true }, "tar": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz", - "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz", + "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", "minipass": "^3.0.0", - "minizlib": "^2.1.0", + "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" }, "dependencies": { - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true } } }, "terser": { - "version": "4.6.10", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz", - "integrity": "sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz", + "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==", "dev": true, "requires": { "commander": "^2.20.0", @@ -17775,184 +18542,39 @@ "buffer-from": "^1.0.0", "source-map": "^0.6.0" } - } - } - }, - "terser-webpack-plugin": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz", - "integrity": "sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==", - "dev": true, - "requires": { - "cacache": "^15.0.4", - "find-cache-dir": "^3.3.1", - "jest-worker": "^26.0.0", - "p-limit": "^2.3.0", - "schema-utils": "^2.6.6", - "serialize-javascript": "^3.1.0", - "source-map": "^0.6.1", - "terser": "^4.6.13", - "webpack-sources": "^1.4.3" - }, - "dependencies": { - "cacache": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.4.tgz", - "integrity": "sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==", - "dev": true, - "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.0", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "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" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "jest-worker": { - "version": "26.1.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz", - "integrity": "sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==", - "dev": true, - "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "ssri": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", - "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + } + } + }, + "terser-webpack-plugin": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz", + "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", + "dev": true, + "requires": { + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "jest-worker": "^26.3.0", + "p-limit": "^3.0.2", + "schema-utils": "^2.6.6", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^5.0.0", + "webpack-sources": "^1.4.3" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "yocto-queue": "^0.1.0" } }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } } @@ -17986,9 +18608,9 @@ "dev": true }, "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" @@ -18095,6 +18717,23 @@ } } }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + } + } + }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -18111,7 +18750,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true + "dev": true, + "optional": true }, "ts-loader": { "version": "5.4.5", @@ -18144,15 +18784,21 @@ "yn": "^3.0.0" } }, + "ts-pnp": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", + "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==", + "dev": true + }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" }, "tslint": { - "version": "5.20.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", - "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz", + "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -18163,11 +18809,28 @@ "glob": "^7.1.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", + "mkdirp": "^0.5.3", "resolve": "^1.3.2", "semver": "^5.3.0", - "tslib": "^1.8.0", + "tslib": "^1.13.0", "tsutils": "^2.29.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } } }, "tslint-config-prettier": { @@ -18177,12 +18840,177 @@ "dev": true }, "tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "tsutils-etc": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/tsutils-etc/-/tsutils-etc-1.3.2.tgz", + "integrity": "sha512-hAQoELuJxKiJ7nISOuTFI+OKcwtbBTfQh47DquqG4R0bDvhfK6vXvykoKTNpBBS1n67vGvGPqEtnR9zE6dfWdg==", + "dev": true, + "requires": { + "@types/yargs": "^15.0.5", + "yargs": "^15.4.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } } }, "tty-browserify": { @@ -18204,6 +19032,12 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", + "dev": true + }, "type-fest": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", @@ -18222,46 +19056,20 @@ }, "typedarray": { "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==" - }, - "ua-parser-js": { - "version": "0.7.21", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", - "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==", - "dev": true - }, - "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", - "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "typescript": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", + "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", + "dev": true + }, + "ua-parser-js": { + "version": "0.7.21", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", + "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==", + "dev": true }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", @@ -18333,23 +19141,23 @@ } }, "universal-analytics": { - "version": "0.4.20", - "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", - "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz", + "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==", "dev": true, "requires": { - "debug": "^3.0.0", - "request": "^2.88.0", + "debug": "^4.1.1", + "request": "^2.88.2", "uuid": "^3.0.0" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -18358,6 +19166,46 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + }, "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", @@ -18540,11 +19388,42 @@ "object.getownpropertydescriptors": "^2.1.0" }, "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } } } }, @@ -18618,148 +19497,21 @@ "dev": true }, "watchpack": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz", - "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", + "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "requires": { - "chokidar": "^3.4.0", + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" - }, - "dependencies": { - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "optional": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true, - "optional": true - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "optional": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", - "dev": true, - "optional": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "optional": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "dev": true, - "optional": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "optional": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "optional": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "optional": true - }, - "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", - "dev": true, - "optional": true, - "requires": { - "picomatch": "^2.2.1" - }, - "dependencies": { - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true, - "optional": true - } - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "optional": true, - "requires": { - "is-number": "^7.0.0" - } - } + "watchpack-chokidar2": "^2.0.1" } }, "watchpack-chokidar2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", - "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz", + "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==", "dev": true, "optional": true, "requires": { @@ -18814,41 +19566,47 @@ "defaults": "^1.0.3" } }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, "webpack": { - "version": "4.42.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", - "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==", + "version": "4.44.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", + "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", "dev": true, "requires": { - "@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", + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/wasm-edit": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "acorn": "^6.4.1", "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.1.0", + "enhanced-resolve": "^4.3.0", "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", "loader-runner": "^2.4.0", "loader-utils": "^1.2.3", "memory-fs": "^0.4.1", "micromatch": "^3.1.10", - "mkdirp": "^0.5.1", + "mkdirp": "^0.5.3", "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.3", - "watchpack": "^1.6.0", + "watchpack": "^1.7.4", "webpack-sources": "^1.4.1" }, "dependencies": { "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -18863,12 +19621,6 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, "cacache": { "version": "12.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", @@ -18890,14 +19642,57 @@ "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } } }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true }, + "enhanced-resolve": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", + "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.5.0", + "tapable": "^1.0.0" + }, + "dependencies": { + "memory-fs": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "dev": true, + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + } + } + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -18929,12 +19724,6 @@ "path-is-absolute": "^1.0.0" } }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true - }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", @@ -18976,16 +19765,10 @@ "yallist": "^3.0.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "rimraf": { @@ -19014,6 +19797,16 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", @@ -19023,17 +19816,28 @@ "figgy-pudding": "^3.5.1" } }, + "terser": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", + "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } + }, "terser-webpack-plugin": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz", - "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^3.1.0", + "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -19140,12 +19944,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "del": { @@ -19307,9 +20111,9 @@ } }, "webpack-subresource-integrity": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.0.tgz", - "integrity": "sha512-GB1kB/LwAWC3CxwcedGhMkxGpNZxSheCe1q+KJP1bakuieAdX/rGHEcf5zsEzhKXpqsGqokgsDoD9dIkr61VDQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.1.tgz", + "integrity": "sha512-XMLFInbGbB1HV7K4vHWANzc1CN0t/c4bBvnlvGxGwV45yE/S/feAXIm8dJsCkzqWtSKnmaEgTp/meyeThxG4Iw==", "dev": true, "requires": { "webpack-sources": "^1.3.0" @@ -19330,6 +20134,23 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "whatwg-url": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz", + "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "webidl-conversions": "^6.1.0" + } + }, "when": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", @@ -19370,9 +20191,9 @@ } }, "worker-plugin": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz", - "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz", + "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==", "dev": true, "requires": { "loader-utils": "^1.1.0" @@ -19438,9 +20259,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz", + "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==", "dev": true }, "xhr2": { @@ -19454,12 +20275,6 @@ "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", "dev": true }, - "xregexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", - "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==", - "dev": true - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -19473,9 +20288,9 @@ "dev": true }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yargs": { @@ -19562,6 +20377,12 @@ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + }, "zone.js": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", diff --git a/package.json b/package.json index 2292bf8ad6..fed23b3ae4 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "test": "npx ng test", "lint": "npx ng lint", "e2e": "npx ng e2e", + "postinstall": "ngcc", "test-dev-no-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", "test-staging-no-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", "test-prod-no-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", @@ -28,28 +29,28 @@ }, "private": true, "dependencies": { - "@angular/animations": "^9.1.11", - "@angular/cdk": "^9.2.4", - "@angular/common": "^9.1.11", - "@angular/compiler": "^9.1.11", - "@angular/core": "^9.1.11", - "@angular/flex-layout": "^9.0.0-beta.31", - "@angular/forms": "^9.1.11", - "@angular/material": "^9.2.4", - "@angular/platform-browser": "^9.1.11", - "@angular/platform-browser-dynamic": "^9.1.11", - "@angular/platform-server": "^9.1.11", - "@angular/router": "^9.1.11", + "@angular/animations": "^10.2.3", + "@angular/cdk": "^10.2.7", + "@angular/common": "^10.2.3", + "@angular/compiler": "^10.2.3", + "@angular/core": "^10.2.3", + "@angular/flex-layout": "^10.0.0-beta.32", + "@angular/forms": "^10.2.3", + "@angular/material": "^10.2.7", + "@angular/platform-browser": "^10.2.3", + "@angular/platform-browser-dynamic": "^10.2.3", + "@angular/platform-server": "^10.2.3", + "@angular/router": "^10.2.3", "@datorama/akita": "^4.10.8", "@datorama/akita-ng-forms-manager": "^3.1.0", - "@fortawesome/angular-fontawesome": "^0.6.1", + "@fortawesome/angular-fontawesome": "^0.7.0", "@fortawesome/fontawesome-svg-core": "^1.2.29", "@fortawesome/free-brands-svg-icons": "^5.13.1", "@fortawesome/free-solid-svg-icons": "^5.13.1", - "@material-extended/mde": "^2.3.1", + "@material-extended/mde": "^3.0.3", "@ngx-lite/json-ld": "^0.6.2", "ace-builds": "^1.4.6", - "angular-tag-cloud-module": "^3.8.1", + "angular-tag-cloud-module": "^5.2.0", "bodybuilder": "^2.2.17", "bootstrap": "^3.4.1", "bootstrap-social": "^5.1.1", @@ -63,20 +64,22 @@ "jquery": "^3.5.1", "material-design-icons-iconfont": "^6.1.0", "ng2-ui-auth": "^10.0.1", - "ngx-clipboard": "^13.0.1", - "ngx-markdown": "^9.1.1", + "ngx-clipboard": "^14.0.1", + "ngx-markdown": "^10.1.1", "ngx-sharebuttons": "^8.0.0", - "rxjs": "^6.5.3", + "ngx-window-token": "^4.0.0", + "rxjs": "^6.6.3", "ts-md5": "^1.2.6", - "tslib": "^1.10.0", + "tslib": "^2.0.3", + "tsutils": "^3.17.1", "uuid": "^7.0.3", "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.901.9", - "@angular/cli": "^9.1.9", - "@angular/compiler-cli": "^9.1.11", - "@angular/language-service": "^9.1.11", + "@angular-devkit/build-angular": "~0.1002.0", + "@angular/cli": "^10.2.0", + "@angular/compiler-cli": "^10.2.3", + "@angular/language-service": "^10.2.3", "@cypress/webpack-preprocessor": "^4.1.0", "@datorama/akita-ngdevtools": "^3.0.2", "@types/cytoscape": "^3.8.2", @@ -86,27 +89,26 @@ "@types/jasminewd2": "^2.0.6", "@types/jquery": "^3.3.31", "@types/node": "^12.11.1", - "codelyzer": "^5.1.2", + "codelyzer": "^6.0.1", "cypress": "^5.0.0", "husky": "^3.0.5", - "jasmine-core": "^3.5.0", - "jasmine-spec-reporter": "^4.2.1", - "karma": "^5.2.2", - "karma-chrome-launcher": "^3.1.0", - "karma-coverage-istanbul-reporter": "^2.1.0", - "karma-jasmine": "^2.0.1", - "karma-jasmine-html-reporter": "^1.4.2", + "jasmine-core": "~3.5.0", + "jasmine-spec-reporter": "~5.0.0", + "karma": "~5.0.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~3.0.2", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "^1.5.0", "karma-spec-reporter": "0.0.32", "license-checker": "^25.0.1", "lint-staged": "^9.4.0", "prettier": "^2.1.1", - "rxjs-tslint": "^0.1.8", - "rxjs-tslint-rules": "^4.17.0", + "rxjs-tslint-rules": "^4.34.7", "ts-loader": "^5.4.5", "ts-node": "^8.4.1", - "tslint": "^5.20.0", + "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", - "typescript": "^3.8.3" + "typescript": "^4.0.5" }, "husky": { "hooks": { diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index f576002634..39e157bb46 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,4 +1,4 @@ -import { async, TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { RouterLinkStubDirective, RouterOutletStubComponent } from './test/router-stubs'; @@ -27,27 +27,32 @@ class TosBannerStubComponent {} class NotificationStubComponent {} describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - AppComponent, - NavbarStubComponent, - SponsorsStubComponent, - FooterStubComponent, - BannerStubComponent, - RouterLinkStubDirective, - RouterOutletStubComponent, - TosBannerStubComponent, - NotificationStubComponent, - ], - imports: [RouterTestingModule, MatSnackBarModule], - providers: [{ provide: TrackLoginService, useClass: TrackLoginStubService }], - }).compileComponents(); - })); - - it('should create the app', async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app).toBeTruthy(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + AppComponent, + NavbarStubComponent, + SponsorsStubComponent, + FooterStubComponent, + BannerStubComponent, + RouterLinkStubDirective, + RouterOutletStubComponent, + TosBannerStubComponent, + NotificationStubComponent, + ], + imports: [RouterTestingModule, MatSnackBarModule], + providers: [{ provide: TrackLoginService, useClass: TrackLoginStubService }], + }).compileComponents(); + }) + ); + + it( + 'should create the app', + waitForAsync(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + }) + ); }); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 723e93083c..5ffa679bbf 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http'; +import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { APP_INITIALIZER, NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MAT_SNACK_BAR_DEFAULT_OPTIONS, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions } from '@angular/material/tooltip'; +import { MatSnackBarConfig, MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar'; +import { MatTooltipDefaultOptions, MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip'; import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AkitaNgDevtools } from '@datorama/akita-ngdevtools'; @@ -220,7 +220,6 @@ export function configurationServiceFactory(configurationService: ConfigurationS { provide: HTTP_INTERCEPTORS, useClass: WorkflowVersionsInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: CustomHeaderInterceptor, multi: true }, ], - entryComponents: [DeleteAccountDialogComponent, YoutubeComponent, ConfirmationDialogComponent], bootstrap: [AppComponent], }) export class AppModule {} diff --git a/src/app/banner/banner.component.spec.ts b/src/app/banner/banner.component.spec.ts index a3b06b9b7b..6a2b295209 100644 --- a/src/app/banner/banner.component.spec.ts +++ b/src/app/banner/banner.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MetadataService } from '../metadata/metadata.service'; import { GA4GHService } from './../shared/swagger/api/gA4GH.service'; import { GA4GHStubService } from './../test/service-stubs'; @@ -8,12 +8,14 @@ describe('BannerComponent', () => { let component: BannerComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [BannerComponent], - providers: [MetadataService, { provide: GA4GHService, useClass: GA4GHStubService }], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [BannerComponent], + providers: [MetadataService, { provide: GA4GHService, useClass: GA4GHStubService }], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(BannerComponent); diff --git a/src/app/confirmation-dialog/confirmation-dialog.component.ts b/src/app/confirmation-dialog/confirmation-dialog.component.ts index 1104f3313e..a6061504dc 100644 --- a/src/app/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/app/confirmation-dialog/confirmation-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; export class ConfirmationDialogData { message?: string; diff --git a/src/app/container/descriptors/descriptors.component.spec.ts b/src/app/container/descriptors/descriptors.component.spec.ts index c00fd72fd5..951cd42c97 100644 --- a/src/app/container/descriptors/descriptors.component.spec.ts +++ b/src/app/container/descriptors/descriptors.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientModule } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ContainersStubService, ContainerStubService, EntryStubService, GA4GHV20StubService } from '../../../../src/app/test/service-stubs'; @@ -32,21 +32,23 @@ describe('DescriptorsComponent', () => { let fixture: ComponentFixture; class FileStubService {} - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DescriptorsComponent], - imports: [HttpClientModule, MatSnackBarModule], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - DescriptorService, - { provide: ContainersService, useClass: ContainersStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: FileService, useClass: FileStubService }, - { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, - { provide: EntriesService, useClass: EntryStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DescriptorsComponent], + imports: [HttpClientModule, MatSnackBarModule], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + DescriptorService, + { provide: ContainersService, useClass: ContainersStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: FileService, useClass: FileStubService }, + { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, + { provide: EntriesService, useClass: EntryStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DescriptorsComponent); diff --git a/src/app/container/dockerfile/dockerfile.component.spec.ts b/src/app/container/dockerfile/dockerfile.component.spec.ts index 2c0d4b3ff8..3f227ee756 100644 --- a/src/app/container/dockerfile/dockerfile.component.spec.ts +++ b/src/app/container/dockerfile/dockerfile.component.spec.ts @@ -15,7 +15,7 @@ */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ContainersService } from '../../shared/swagger'; import { ContainerService } from './../../shared/container.service'; import { FileService } from './../../shared/file.service'; @@ -26,17 +26,19 @@ describe('DockerfileComponent', () => { let component: DockerfileComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DockerfileComponent], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - { provide: FileService, useClass: FileStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: ContainersService, useClass: ContainersStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DockerfileComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + { provide: FileService, useClass: FileStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: ContainersService, useClass: ContainersStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DockerfileComponent); diff --git a/src/app/container/refresh-tool-organization/refresh-tool-organization.component.spec.ts b/src/app/container/refresh-tool-organization/refresh-tool-organization.component.spec.ts index a3a7a3e416..7fbca8089a 100644 --- a/src/app/container/refresh-tool-organization/refresh-tool-organization.component.spec.ts +++ b/src/app/container/refresh-tool-organization/refresh-tool-organization.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -38,19 +38,21 @@ describe('RefreshToolOrganizationComponent', () => { let component: RefreshToolOrganizationComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RefreshToolOrganizationComponent], - imports: [MatSnackBarModule, MatIconModule, MatButtonModule, MatTooltipModule], - providers: [ - { provide: UsersService, useClass: UsersStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - { provide: ContainersService, useClass: ContainersStubService }, - { provide: ProviderService, useClass: ProviderStubService }, - { provide: ExtendedDockstoreToolService, useClass: ExtendedDockstoreToolStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [RefreshToolOrganizationComponent], + imports: [MatSnackBarModule, MatIconModule, MatButtonModule, MatTooltipModule], + providers: [ + { provide: UsersService, useClass: UsersStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + { provide: ContainersService, useClass: ContainersStubService }, + { provide: ProviderService, useClass: ProviderStubService }, + { provide: ExtendedDockstoreToolService, useClass: ExtendedDockstoreToolStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(RefreshToolOrganizationComponent); diff --git a/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts b/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts index 707df82d99..de8a523ba0 100644 --- a/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts +++ b/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts @@ -1,5 +1,5 @@ import { HttpClientModule } from '@angular/common/http'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; @@ -30,40 +30,42 @@ describe('ToolFileEditorComponent', () => { let component: ToolFileEditorComponent; let fixture: ComponentFixture; class FileStubService {} - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - ToolFileEditorComponent, - CodeEditorListComponent, - CodeEditorComponent, - PublicFileDownloadPipe, - PrivateFileDownloadPipe, - PrivateFilePathPipe, - ], - imports: [ - MatButtonModule, - MatTabsModule, - MatToolbarModule, - MatIconModule, - MatSnackBarModule, - MatInputModule, - MatFormFieldModule, - MatSelectModule, - MatTooltipModule, - MatCardModule, - BrowserAnimationsModule, - ClipboardModule, - HttpClientModule, - ], - providers: [ - { provide: HostedService, useClass: HostedStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: FileService, useClass: FileStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + ToolFileEditorComponent, + CodeEditorListComponent, + CodeEditorComponent, + PublicFileDownloadPipe, + PrivateFileDownloadPipe, + PrivateFilePathPipe, + ], + imports: [ + MatButtonModule, + MatTabsModule, + MatToolbarModule, + MatIconModule, + MatSnackBarModule, + MatInputModule, + MatFormFieldModule, + MatSelectModule, + MatTooltipModule, + MatCardModule, + BrowserAnimationsModule, + ClipboardModule, + HttpClientModule, + ], + providers: [ + { provide: HostedService, useClass: HostedStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: FileService, useClass: FileStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ToolFileEditorComponent); diff --git a/src/app/container/version-modal/version-modal.component.spec.ts b/src/app/container/version-modal/version-modal.component.spec.ts index 8bf0037435..b5ae0b9ae8 100644 --- a/src/app/container/version-modal/version-modal.component.spec.ts +++ b/src/app/container/version-modal/version-modal.component.spec.ts @@ -1,5 +1,5 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { ClipboardModule } from 'ngx-clipboard'; @@ -27,22 +27,24 @@ describe('VersionModalComponent', () => { let component: VersionModalComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - schemas: [NO_ERRORS_SCHEMA], - declarations: [VersionModalComponent], - imports: [FormsModule, ClipboardModule, MatSnackBarModule, MatDialogModule], - providers: [ - { provide: ParamfilesService, useClass: ParamFilesStubService }, - { provide: VersionModalService, useClass: VersionModalStubService }, - { provide: ListContainersService, useClass: ListContainersService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: ContainersService, useClass: ContainersStubService }, - { provide: ContainertagsService, useClass: ContainertagsStubService }, - { provide: DateService, useClass: DateStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + schemas: [NO_ERRORS_SCHEMA], + declarations: [VersionModalComponent], + imports: [FormsModule, ClipboardModule, MatSnackBarModule, MatDialogModule], + providers: [ + { provide: ParamfilesService, useClass: ParamFilesStubService }, + { provide: VersionModalService, useClass: VersionModalStubService }, + { provide: ListContainersService, useClass: ListContainersService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: ContainersService, useClass: ContainersStubService }, + { provide: ContainertagsService, useClass: ContainertagsStubService }, + { provide: DateService, useClass: DateStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(VersionModalComponent); diff --git a/src/app/docs/docs.component.spec.ts b/src/app/docs/docs.component.spec.ts index 0e43966286..9c398e7883 100644 --- a/src/app/docs/docs.component.spec.ts +++ b/src/app/docs/docs.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { async, TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { HeaderModule } from './../shared/modules/header.module'; import { RouterLinkStubDirective, RouterOutletStubComponent } from './../test/router-stubs'; import { DocsComponent } from './docs.component'; @@ -25,12 +25,14 @@ import { DocsComponent } from './docs.component'; describe('DocsComponent', () => { // let component: DocsComponent; // let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DocsComponent, RouterLinkStubDirective, RouterOutletStubComponent], - imports: [HeaderModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DocsComponent, RouterLinkStubDirective, RouterOutletStubComponent], + imports: [HeaderModule], + }).compileComponents(); + }) + ); // beforeEach(() => { // fixture = TestBed.createComponent(DocsComponent); diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts index 2509c3d5f8..42d997b7d7 100644 --- a/src/app/footer/footer.component.spec.ts +++ b/src/app/footer/footer.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; import { RouterTestingModule } from '@angular/router/testing'; import { MetadataService } from '../metadata/metadata.service'; @@ -28,13 +28,15 @@ describe('FooterComponent', () => { let component: FooterComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FooterComponent, GitTagPipe], - imports: [RouterTestingModule, MatIconModule], - providers: [MetadataService, { provide: GA4GHService, useClass: GA4GHStubService }], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [FooterComponent, GitTagPipe], + imports: [RouterTestingModule, MatIconModule], + providers: [MetadataService, { provide: GA4GHService, useClass: GA4GHStubService }], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(FooterComponent); diff --git a/src/app/funding/funding.component.spec.ts b/src/app/funding/funding.component.spec.ts index e6eb069b44..47140c1222 100644 --- a/src/app/funding/funding.component.spec.ts +++ b/src/app/funding/funding.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FundingComponent } from './funding.component'; @@ -9,11 +7,13 @@ describe('FundingComponent', () => { let component: FundingComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FundingComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [FundingComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(FundingComponent); diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts index 897b7eaf54..8e2eb454a6 100644 --- a/src/app/header/header.component.spec.ts +++ b/src/app/header/header.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; @@ -24,13 +24,15 @@ describe('HeaderComponent', () => { let component: HeaderComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule], - schemas: [NO_ERRORS_SCHEMA], - declarations: [HeaderComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule], + schemas: [NO_ERRORS_SCHEMA], + declarations: [HeaderComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HeaderComponent); diff --git a/src/app/home-page/home-logged-in/home-logged-in.component.spec.ts b/src/app/home-page/home-logged-in/home-logged-in.component.spec.ts index 261946f962..1d9205b984 100644 --- a/src/app/home-page/home-logged-in/home-logged-in.component.spec.ts +++ b/src/app/home-page/home-logged-in/home-logged-in.component.spec.ts @@ -1,6 +1,5 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; @@ -12,14 +11,16 @@ describe('HomeLoggedInComponent', () => { let component: HomeLoggedInComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HomeLoggedInComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [RouterTestingModule, MatButtonModule, MatIconModule, MatDialogModule], - providers: [TwitterService], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [HomeLoggedInComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [RouterTestingModule, MatButtonModule, MatIconModule, MatDialogModule], + providers: [TwitterService], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HomeLoggedInComponent); diff --git a/src/app/home-page/home-logged-out/home.component.spec.ts b/src/app/home-page/home-logged-out/home.component.spec.ts index 2d5ffec72d..2a10177f3a 100644 --- a/src/app/home-page/home-logged-out/home.component.spec.ts +++ b/src/app/home-page/home-logged-out/home.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { DescriptorLanguageService } from 'app/shared/entry/descriptor-language.service'; import { CustomMaterialModule } from 'app/shared/modules/material.module'; @@ -26,14 +26,16 @@ describe('HomeComponent', () => { let component: HomeComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HomeComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [CustomMaterialModule, RouterTestingModule, HttpClientTestingModule], - providers: [TwitterService, DescriptorLanguageService], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [HomeComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [CustomMaterialModule, RouterTestingModule, HttpClientTestingModule], + providers: [TwitterService, DescriptorLanguageService], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HomeComponent); diff --git a/src/app/home-page/home-page.component.spec.ts b/src/app/home-page/home-page.component.spec.ts index b8196d956a..447f02153a 100644 --- a/src/app/home-page/home-page.component.spec.ts +++ b/src/app/home-page/home-page.component.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { HomePageComponent } from './home-page.component'; @@ -8,13 +8,15 @@ describe('HomePageComponent', () => { let component: HomePageComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HomePageComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [RouterTestingModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [HomePageComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [RouterTestingModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(HomePageComponent); diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts index fec2714d5e..67e2e8b4a8 100644 --- a/src/app/home-page/home-page.module.ts +++ b/src/app/home-page/home-page.module.ts @@ -49,7 +49,6 @@ import { RequestsComponent } from './widget/requests/requests.component'; GettingStartedComponent, EntryToDisplayNamePipe, ], - entryComponents: [], exports: [NgxJsonLdModule], }) export class HomePageModule {} diff --git a/src/app/home-page/widget/entries/entries.component.spec.ts b/src/app/home-page/widget/entries/entries.component.spec.ts index d17f14e090..071448e63a 100644 --- a/src/app/home-page/widget/entries/entries.component.spec.ts +++ b/src/app/home-page/widget/entries/entries.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; @@ -13,12 +13,14 @@ describe('EntriesComponent', () => { let component: EntriesComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [EntriesComponent, LoadingComponent], - imports: [RouterTestingModule, MatFormFieldModule, FormsModule, HttpClientTestingModule, MatTooltipModule, MatProgressBarModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [EntriesComponent, LoadingComponent], + imports: [RouterTestingModule, MatFormFieldModule, FormsModule, HttpClientTestingModule, MatTooltipModule, MatProgressBarModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(EntriesComponent); diff --git a/src/app/home-page/widget/filtered-list.ts b/src/app/home-page/widget/filtered-list.ts index 6611012783..395925f069 100644 --- a/src/app/home-page/widget/filtered-list.ts +++ b/src/app/home-page/widget/filtered-list.ts @@ -1,4 +1,4 @@ -import { OnInit } from '@angular/core'; +import { Directive, OnInit } from '@angular/core'; import { Base } from 'app/shared/base'; import { UserQuery } from 'app/shared/user/user.query'; import { Observable, Subject } from 'rxjs'; @@ -8,6 +8,8 @@ import { EntriesService, OrganizationUpdateTime, UsersService } from '../../shar /** * Base class for logged in homepage widgets that have a filter list */ +@Directive() +// tslint:disable-next-line: directive-class-suffix export abstract class FilteredList extends Base implements OnInit { userId$: Observable; public hasItems = false; diff --git a/src/app/home-page/widget/getting-started/getting-started.component.spec.ts b/src/app/home-page/widget/getting-started/getting-started.component.spec.ts index 855a7e10dc..562edfdbc8 100644 --- a/src/app/home-page/widget/getting-started/getting-started.component.spec.ts +++ b/src/app/home-page/widget/getting-started/getting-started.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; @@ -9,12 +9,14 @@ describe('GettingStartedComponent', () => { let component: GettingStartedComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [GettingStartedComponent, RouterLinkStubDirective], - imports: [MatIconModule, MatButtonModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [GettingStartedComponent, RouterLinkStubDirective], + imports: [MatIconModule, MatButtonModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(GettingStartedComponent); diff --git a/src/app/home-page/widget/news-updates/news-updates.component.spec.ts b/src/app/home-page/widget/news-updates/news-updates.component.spec.ts index e3c6f46980..5c7c034d12 100644 --- a/src/app/home-page/widget/news-updates/news-updates.component.spec.ts +++ b/src/app/home-page/widget/news-updates/news-updates.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MarkdownModule } from 'ngx-markdown'; @@ -8,12 +8,14 @@ describe('NewsUpdatesComponent', () => { let component: NewsUpdatesComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [NewsUpdatesComponent], - imports: [MarkdownModule, HttpClientTestingModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [NewsUpdatesComponent], + imports: [MarkdownModule, HttpClientTestingModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(NewsUpdatesComponent); diff --git a/src/app/home-page/widget/organizations/organizations.component.spec.ts b/src/app/home-page/widget/organizations/organizations.component.spec.ts index aa0c886b9b..2dfb5c28b1 100644 --- a/src/app/home-page/widget/organizations/organizations.component.spec.ts +++ b/src/app/home-page/widget/organizations/organizations.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; @@ -13,12 +13,14 @@ describe('OrganizationsComponent', () => { let component: OrganizationsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [OrganizationsComponent, LoadingComponent], - imports: [RouterTestingModule, MatFormFieldModule, FormsModule, HttpClientTestingModule, MatTooltipModule, MatProgressBarModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [OrganizationsComponent, LoadingComponent], + imports: [RouterTestingModule, MatFormFieldModule, FormsModule, HttpClientTestingModule, MatTooltipModule, MatProgressBarModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(OrganizationsComponent); diff --git a/src/app/home-page/widget/requests/requests.component.spec.ts b/src/app/home-page/widget/requests/requests.component.spec.ts index 316247c9e4..a349c11672 100644 --- a/src/app/home-page/widget/requests/requests.component.spec.ts +++ b/src/app/home-page/widget/requests/requests.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; @@ -11,13 +11,15 @@ describe('RequestsComponent', () => { let component: RequestsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RequestsComponent], - imports: [RouterTestingModule, HttpClientTestingModule, CustomMaterialModule], - providers: [{ provide: UsersService, useClass: UsersStubService }], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [RequestsComponent], + imports: [RouterTestingModule, HttpClientTestingModule, CustomMaterialModule], + providers: [{ provide: UsersService, useClass: UsersStubService }], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(RequestsComponent); diff --git a/src/app/interceptors/custom-header.interceptor.spec.ts b/src/app/interceptors/custom-header.interceptor.spec.ts index cd510a0558..c8270ee312 100644 --- a/src/app/interceptors/custom-header.interceptor.spec.ts +++ b/src/app/interceptors/custom-header.interceptor.spec.ts @@ -1,4 +1,4 @@ -import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http'; +import { HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { versions } from '../footer/versions'; diff --git a/src/app/login/login.component.spec.ts b/src/app/login/login.component.spec.ts index f243e6c505..9e1a962fc8 100644 --- a/src/app/login/login.component.spec.ts +++ b/src/app/login/login.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { RegisterService } from '../register/register.service'; @@ -28,19 +28,21 @@ describe('LoginComponent', () => { let component: LoginComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [LoginComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [RouterTestingModule], - providers: [ - { provide: TrackLoginService, useClass: TrackLoginStubService }, - { provide: UserService, useClass: UserStubService }, - { provide: LoginService, useClass: LoginStubService }, - { provide: RegisterService, useClass: LoginStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LoginComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [RouterTestingModule], + providers: [ + { provide: TrackLoginService, useClass: TrackLoginStubService }, + { provide: UserService, useClass: UserStubService }, + { provide: LoginService, useClass: LoginStubService }, + { provide: RegisterService, useClass: LoginStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LoginComponent); diff --git a/src/app/loginComponents/accounts/controls/controls.component.spec.ts b/src/app/loginComponents/accounts/controls/controls.component.spec.ts index f15bfda4f0..cb9de1794a 100644 --- a/src/app/loginComponents/accounts/controls/controls.component.spec.ts +++ b/src/app/loginComponents/accounts/controls/controls.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -14,17 +14,19 @@ describe('ControlsComponent', () => { let component: ControlsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ControlsComponent, ChangeUsernameComponent], - imports: [CustomMaterialModule, BrowserAnimationsModule, ReactiveFormsModule], - providers: [ - { provide: UserService, useClass: UserStubService }, - { provide: UsersService, useClass: UsersStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ControlsComponent, ChangeUsernameComponent], + imports: [CustomMaterialModule, BrowserAnimationsModule, ReactiveFormsModule], + providers: [ + { provide: UserService, useClass: UserStubService }, + { provide: UsersService, useClass: UsersStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ControlsComponent); diff --git a/src/app/loginComponents/accounts/controls/delete-account-dialog/delete-account-dialog.component.spec.ts b/src/app/loginComponents/accounts/controls/delete-account-dialog/delete-account-dialog.component.spec.ts index 2456ea606e..50f005d637 100644 --- a/src/app/loginComponents/accounts/controls/delete-account-dialog/delete-account-dialog.component.spec.ts +++ b/src/app/loginComponents/accounts/controls/delete-account-dialog/delete-account-dialog.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; @@ -13,23 +13,25 @@ describe('DeleteAccountDialogComponent', () => { let component: DeleteAccountDialogComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DeleteAccountDialogComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [CustomMaterialModule, ReactiveFormsModule], - providers: [ - { provide: LogoutService, useClass: LogoutStubService }, - { provide: UsersService, useClass: UsersStubService }, - { - provide: MatDialogRef, - useValue: { - close: (dialogResult: any) => {}, + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DeleteAccountDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [CustomMaterialModule, ReactiveFormsModule], + providers: [ + { provide: LogoutService, useClass: LogoutStubService }, + { provide: UsersService, useClass: UsersStubService }, + { + provide: MatDialogRef, + useValue: { + close: (dialogResult: any) => {}, + }, }, - }, - ], - }).compileComponents(); - })); + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DeleteAccountDialogComponent); diff --git a/src/app/loginComponents/accounts/internal/change-username/change-username.component.spec.ts b/src/app/loginComponents/accounts/internal/change-username/change-username.component.spec.ts index e0b3cc02ca..02cea8f739 100644 --- a/src/app/loginComponents/accounts/internal/change-username/change-username.component.spec.ts +++ b/src/app/loginComponents/accounts/internal/change-username/change-username.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; @@ -19,27 +19,29 @@ describe('ChangeUsernameComponent', () => { let component: ChangeUsernameComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ChangeUsernameComponent], - imports: [ - ReactiveFormsModule, - MatIconModule, - MatButtonModule, - MatTooltipModule, - MatProgressSpinnerModule, - MatInputModule, - MatFormFieldModule, - MatCardModule, - BrowserAnimationsModule, - ], - providers: [ - { provide: UserService, useClass: UserStubService }, - { provide: UsersService, useClass: UsersStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ChangeUsernameComponent], + imports: [ + ReactiveFormsModule, + MatIconModule, + MatButtonModule, + MatTooltipModule, + MatProgressSpinnerModule, + MatInputModule, + MatFormFieldModule, + MatCardModule, + BrowserAnimationsModule, + ], + providers: [ + { provide: UserService, useClass: UserStubService }, + { provide: UsersService, useClass: UsersStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ChangeUsernameComponent); diff --git a/src/app/loginComponents/auth/auth.component.spec.ts b/src/app/loginComponents/auth/auth.component.spec.ts index c740d1b895..b5ff2ea4bc 100644 --- a/src/app/loginComponents/auth/auth.component.spec.ts +++ b/src/app/loginComponents/auth/auth.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -11,16 +11,18 @@ describe('AuthComponent', () => { let component: AuthComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AuthComponent], - imports: [RouterTestingModule.withRoutes([{ path: '**', component: AuthComponent }]), MatSnackBarModule], - providers: [ - { provide: UserService, useClass: UserStubService }, - { provide: TokenService, useClass: TokenStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [AuthComponent], + imports: [RouterTestingModule.withRoutes([{ path: '**', component: AuthComponent }]), MatSnackBarModule], + providers: [ + { provide: UserService, useClass: UserStubService }, + { provide: TokenService, useClass: TokenStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(AuthComponent); diff --git a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.spec.ts b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.spec.ts index 2833a3f150..b6e5d7de70 100644 --- a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.spec.ts +++ b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { AuthService } from 'ng2-ui-auth'; import { ClipboardModule } from 'ngx-clipboard'; @@ -18,25 +18,27 @@ describe('DownloadCLIClientComponent', () => { let component: DownloadCLIClientComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DownloadCLIClientComponent, RouterLinkStubDirective, RouterOutletStubComponent], - imports: [ - ClipboardModule, - MarkdownModule.forRoot(), - MatIconModule, - MatButtonModule, - HttpClientTestingModule, - MatTabsModule, - NoopAnimationsModule, - ], - providers: [ - { provide: AuthService, useClass: AuthStubService }, - { provide: GA4GHService, useClass: GA4GHStubService }, - MetadataService, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DownloadCLIClientComponent, RouterLinkStubDirective, RouterOutletStubComponent], + imports: [ + ClipboardModule, + MarkdownModule.forRoot(), + MatIconModule, + MatButtonModule, + HttpClientTestingModule, + MatTabsModule, + NoopAnimationsModule, + ], + providers: [ + { provide: AuthService, useClass: AuthStubService }, + { provide: GA4GHService, useClass: GA4GHStubService }, + MetadataService, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DownloadCLIClientComponent); diff --git a/src/app/loginComponents/requests.module.ts b/src/app/loginComponents/requests.module.ts index 49d1bd3c83..2f5d201a6c 100644 --- a/src/app/loginComponents/requests.module.ts +++ b/src/app/loginComponents/requests.module.ts @@ -12,6 +12,5 @@ import { imports: [CommonModule, CustomMaterialModule, RouterModule, FlexLayoutModule], declarations: [RequestsComponent, OrganizationRequestConfirmDialogComponent, OrganizationInviteConfirmDialogComponent], exports: [RequestsComponent, OrganizationRequestConfirmDialogComponent, OrganizationInviteConfirmDialogComponent], - entryComponents: [OrganizationRequestConfirmDialogComponent, OrganizationInviteConfirmDialogComponent], }) export class RequestsModule {} diff --git a/src/app/loginComponents/requests/requests.component.ts b/src/app/loginComponents/requests/requests.component.ts index b6ed1d86e9..b0067ca738 100644 --- a/src/app/loginComponents/requests/requests.component.ts +++ b/src/app/loginComponents/requests/requests.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { ConfirmationDialogData } from '../../confirmation-dialog/confirmation-dialog.component'; diff --git a/src/app/logout/logout.component.spec.ts b/src/app/logout/logout.component.spec.ts index 197cbb6464..3d3d42f2a9 100644 --- a/src/app/logout/logout.component.spec.ts +++ b/src/app/logout/logout.component.spec.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { LogoutComponent } from './logout.component'; @@ -13,11 +13,13 @@ describe('LogoutComponent', () => { let component: LogoutComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [LogoutComponent, HeaderComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LogoutComponent, HeaderComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LogoutComponent); diff --git a/src/app/maintenance/maintenance.component.spec.ts b/src/app/maintenance/maintenance.component.spec.ts index 16a4a6bf98..6a2df51739 100644 --- a/src/app/maintenance/maintenance.component.spec.ts +++ b/src/app/maintenance/maintenance.component.spec.ts @@ -1,21 +1,21 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; -import { By } from '@angular/platform-browser'; import { MaintenanceComponent } from './maintenance.component'; describe('MaintenanceComponent', () => { let component: MaintenanceComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [MaintenanceComponent], - imports: [MatCardModule, MatIconModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [MaintenanceComponent], + imports: [MatCardModule, MatIconModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(MaintenanceComponent); diff --git a/src/app/mytools/mytools.module.ts b/src/app/mytools/mytools.module.ts index 8fdbee245c..9dbfb10133 100644 --- a/src/app/mytools/mytools.module.ts +++ b/src/app/mytools/mytools.module.ts @@ -46,6 +46,5 @@ import { SidebarAccordionComponent } from './sidebar-accordion/sidebar-accordion RefreshWizardModule, ], providers: [RegisterToolService, AccountsService, MytoolsService], - entryComponents: [RegisterToolComponent], }) export class MyToolsModule {} diff --git a/src/app/mytools/sidebar-accordion/sidebar-accordion.component.spec.ts b/src/app/mytools/sidebar-accordion/sidebar-accordion.component.spec.ts index e73b79dea5..7d7d8c50ef 100644 --- a/src/app/mytools/sidebar-accordion/sidebar-accordion.component.spec.ts +++ b/src/app/mytools/sidebar-accordion/sidebar-accordion.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; @@ -18,25 +18,27 @@ describe('SidebarAccordionComponent', () => { let component: SidebarAccordionComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SidebarAccordionComponent, RefreshToolOrganizationComponent, SelectTabPipe], - imports: [ - MatTabsModule, - MatToolbarModule, - MatIconModule, - MatButtonModule, - MatExpansionModule, - MatListModule, - MatTooltipModule, - RouterTestingModule, - ], - providers: [ - { provide: RegisterToolService, useClass: RegisterToolStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SidebarAccordionComponent, RefreshToolOrganizationComponent, SelectTabPipe], + imports: [ + MatTabsModule, + MatToolbarModule, + MatIconModule, + MatButtonModule, + MatExpansionModule, + MatListModule, + MatTooltipModule, + RouterTestingModule, + ], + providers: [ + { provide: RegisterToolService, useClass: RegisterToolStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SidebarAccordionComponent); diff --git a/src/app/myworkflows/my-workflow/my-workflow.component.spec.ts b/src/app/myworkflows/my-workflow/my-workflow.component.spec.ts index 9436f4e21d..2b2746d8d6 100644 --- a/src/app/myworkflows/my-workflow/my-workflow.component.spec.ts +++ b/src/app/myworkflows/my-workflow/my-workflow.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; @@ -54,35 +54,37 @@ describe('MyWorkflowsComponent', () => { let component: MyWorkflowComponent; let fixture: ComponentFixture; let registerWorkflowModalService: RegisterWorkflowModalService; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [MyWorkflowComponent, RouterLinkStubDirective, RouterOutletStubComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [RouterTestingModule, HttpClientTestingModule, BrowserAnimationsModule, CustomMaterialModule, MyEntriesModule], - providers: [ - UserQuery, - { provide: Configuration, useClass: ConfigurationStub }, - { provide: UsersService, useClass: UsersStubService }, - { provide: AuthService, useClass: AuthStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - { provide: RegisterWorkflowModalService, useClass: RegisterWorkflowModalStubService }, - MyWorkflowsService, - MyBioWorkflowsService, - MyServicesService, - TokenQuery, - { provide: AccountsService, useClass: AccountsStubService }, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - { provide: UrlResolverService, useClass: UrlResolverStubService }, - { - provide: MatDialogRef, - useValue: { - close: (dialogResult: any) => {}, + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [MyWorkflowComponent, RouterLinkStubDirective, RouterOutletStubComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [RouterTestingModule, HttpClientTestingModule, BrowserAnimationsModule, CustomMaterialModule, MyEntriesModule], + providers: [ + UserQuery, + { provide: Configuration, useClass: ConfigurationStub }, + { provide: UsersService, useClass: UsersStubService }, + { provide: AuthService, useClass: AuthStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + { provide: RegisterWorkflowModalService, useClass: RegisterWorkflowModalStubService }, + MyWorkflowsService, + MyBioWorkflowsService, + MyServicesService, + TokenQuery, + { provide: AccountsService, useClass: AccountsStubService }, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + { provide: UrlResolverService, useClass: UrlResolverStubService }, + { + provide: MatDialogRef, + useValue: { + close: (dialogResult: any) => {}, + }, }, - }, - ], - }).compileComponents(); - })); + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(MyWorkflowComponent); diff --git a/src/app/myworkflows/sidebar-accordion/github-apps-logs/github-apps-logs.module.ts b/src/app/myworkflows/sidebar-accordion/github-apps-logs/github-apps-logs.module.ts index 9700b8bc49..9f3204c648 100644 --- a/src/app/myworkflows/sidebar-accordion/github-apps-logs/github-apps-logs.module.ts +++ b/src/app/myworkflows/sidebar-accordion/github-apps-logs/github-apps-logs.module.ts @@ -25,6 +25,5 @@ import { GithubAppsLogsComponent } from './github-apps-logs.component'; @NgModule({ imports: [CustomMaterialModule, CommonModule, RefreshAlertModule, FlexLayoutModule, PipeModule], declarations: [GithubAppsLogsComponent], - entryComponents: [GithubAppsLogsComponent], }) export class GitHubAppsLogsModule {} diff --git a/src/app/myworkflows/sidebar-accordion/sidebar-accordion.component.spec.ts b/src/app/myworkflows/sidebar-accordion/sidebar-accordion.component.spec.ts index 8936fc5bc5..c7b81a019d 100644 --- a/src/app/myworkflows/sidebar-accordion/sidebar-accordion.component.spec.ts +++ b/src/app/myworkflows/sidebar-accordion/sidebar-accordion.component.spec.ts @@ -1,5 +1,5 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { CustomMaterialModule } from 'app/shared/modules/material.module'; @@ -16,29 +16,31 @@ describe('SidebarAccordionComponent', () => { let component: SidebarAccordionComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SidebarAccordionComponent, RefreshWorkflowOrganizationComponent, SelectTabPipe, GithubNameToIdPipe], - imports: [HttpClientTestingModule, CustomMaterialModule, RouterTestingModule], - providers: [ - { - provide: RegisterWorkflowModalService, - useClass: RegisterWorkflowModalStubService, - }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { - provide: MatDialogRef, - useValue: { - close: (dialogResult: any) => {}, + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SidebarAccordionComponent, RefreshWorkflowOrganizationComponent, SelectTabPipe, GithubNameToIdPipe], + imports: [HttpClientTestingModule, CustomMaterialModule, RouterTestingModule], + providers: [ + { + provide: RegisterWorkflowModalService, + useClass: RegisterWorkflowModalStubService, }, - }, - { - provide: RefreshService, - useClass: RefreshStubService, - }, - ], - }).compileComponents(); - })); + { provide: WorkflowService, useClass: WorkflowStubService }, + { + provide: MatDialogRef, + useValue: { + close: () => {}, + }, + }, + { + provide: RefreshService, + useClass: RefreshStubService, + }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SidebarAccordionComponent); diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts index 01b8a5c3af..b034644ae4 100644 --- a/src/app/navbar/navbar.component.spec.ts +++ b/src/app/navbar/navbar.component.spec.ts @@ -14,14 +14,13 @@ * limitations under the License. */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterTestingModule } from '@angular/router/testing'; - import { LogoutService } from '../shared/logout.service'; import { PageInfo } from '../shared/models/PageInfo'; import { PagenumberService } from '../shared/pagenumber.service'; @@ -33,18 +32,20 @@ describe('NavbarComponent', () => { let component: NavbarComponent; let fixture: ComponentFixture; let pagenumberService: PagenumberService; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [NavbarComponent], - imports: [RouterTestingModule, MatMenuModule, MatButtonModule, MatIconModule, MatDividerModule, MatToolbarModule], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - PagenumberService, - { provide: TrackLoginService, useClass: TrackLoginStubService }, - { provide: LogoutService, useClass: LogoutStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [NavbarComponent], + imports: [RouterTestingModule, MatMenuModule, MatButtonModule, MatIconModule, MatDividerModule, MatToolbarModule], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + PagenumberService, + { provide: TrackLoginService, useClass: TrackLoginStubService }, + { provide: LogoutService, useClass: LogoutStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(NavbarComponent); component = fixture.componentInstance; diff --git a/src/app/organizations/collection/add-entry.module.ts b/src/app/organizations/collection/add-entry.module.ts index 1862db71ea..76137efe2b 100644 --- a/src/app/organizations/collection/add-entry.module.ts +++ b/src/app/organizations/collection/add-entry.module.ts @@ -24,6 +24,5 @@ import { AddEntryComponent } from './add-entry/add-entry.component'; @NgModule({ imports: [CommonModule, CustomMaterialModule, CurrentCollectionsModule, FlexLayoutModule, RefreshAlertModule], declarations: [AddEntryComponent], - entryComponents: [AddEntryComponent], }) export class AddEntryModule {} diff --git a/src/app/organizations/collection/add-entry/add-entry.component.ts b/src/app/organizations/collection/add-entry/add-entry.component.ts index 255d21d946..2e5418a47a 100644 --- a/src/app/organizations/collection/add-entry/add-entry.component.ts +++ b/src/app/organizations/collection/add-entry/add-entry.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { Collection, OrganizationUser } from '../../../shared/swagger'; import { AddEntryQuery } from '../state/add-entry.query'; diff --git a/src/app/organizations/collection/collection.component.ts b/src/app/organizations/collection/collection.component.ts index 410eca29b6..2d56033747 100644 --- a/src/app/organizations/collection/collection.component.ts +++ b/src/app/organizations/collection/collection.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; +import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Observable } from 'rxjs'; import { TagEditorMode } from '../../shared/enum/tagEditorMode.enum'; import { Collection, Organization } from '../../shared/swagger'; diff --git a/src/app/organizations/collections.module.ts b/src/app/organizations/collections.module.ts index 13bc350906..ebc6adedbc 100644 --- a/src/app/organizations/collections.module.ts +++ b/src/app/organizations/collections.module.ts @@ -28,6 +28,5 @@ import { UpdateOrganizationDescriptionModule } from './organization/update-organ ], declarations: [CollectionsComponent, CollectionComponent, CollectionRemoveEntryDialogComponent], exports: [CollectionsComponent, CollectionComponent], - entryComponents: [CollectionRemoveEntryDialogComponent], }) export class CollectionsModule {} diff --git a/src/app/organizations/collections/create-collection.module.ts b/src/app/organizations/collections/create-collection.module.ts index b97eab9e61..6e01441ee3 100644 --- a/src/app/organizations/collections/create-collection.module.ts +++ b/src/app/organizations/collections/create-collection.module.ts @@ -10,6 +10,5 @@ import { CreateCollectionComponent } from './create-collection/create-collection @NgModule({ imports: [CommonModule, FlexLayoutModule, CustomMaterialModule, ReactiveFormsModule, RefreshAlertModule], declarations: [CreateCollectionComponent], - entryComponents: [CreateCollectionComponent], }) export class CreateCollectionModule {} diff --git a/src/app/organizations/organization/organization-stargazers/organization-stargazers.component.spec.ts b/src/app/organizations/organization/organization-stargazers/organization-stargazers.component.spec.ts index 08f3a0258e..5588eeb10a 100644 --- a/src/app/organizations/organization/organization-stargazers/organization-stargazers.component.spec.ts +++ b/src/app/organizations/organization/organization-stargazers/organization-stargazers.component.spec.ts @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; - import { StarOrganizationService } from '../../../shared/star-organization.service'; import { UserService } from '../../../shared/user/user.service'; import { OrganizationStarringStubService, StarOrganizationStubService, UserStubService } from '../../../test/service-stubs'; @@ -27,17 +26,19 @@ describe('OrganizationStargazersComponent', () => { let component: OrganizationStargazersComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [OrganizationStargazersComponent], - imports: [MatIconModule, MatCardModule], - providers: [ - { provide: UserService, useClass: UserStubService }, - { provide: OrganizationStarringService, useClass: OrganizationStarringStubService }, - { provide: StarOrganizationService, useClass: StarOrganizationStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [OrganizationStargazersComponent], + imports: [MatIconModule, MatCardModule], + providers: [ + { provide: UserService, useClass: UserStubService }, + { provide: OrganizationStarringService, useClass: OrganizationStarringStubService }, + { provide: StarOrganizationService, useClass: StarOrganizationStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(OrganizationStargazersComponent); diff --git a/src/app/organizations/organization/organization-starring/organization-starring.component.spec.ts b/src/app/organizations/organization/organization-starring/organization-starring.component.spec.ts index 608c7ba3c3..28b3586290 100644 --- a/src/app/organizations/organization/organization-starring/organization-starring.component.spec.ts +++ b/src/app/organizations/organization/organization-starring/organization-starring.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -38,20 +38,22 @@ describe('OrganizationStarringComponent', () => { let component: OrganizationStarringComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatSnackBarModule], - declarations: [OrganizationStarringComponent], - providers: [ - { provide: TrackLoginService, useClass: TrackLoginStubService }, - { provide: OrganizationStarringService, useClass: OrganizationStarringStubService }, - { provide: StarentryService, useClass: StarEntryStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: StarringService, useClass: StarringStubService }, - { provide: StarOrganizationService, useClass: StarOrganizationStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [MatIconModule, MatSnackBarModule], + declarations: [OrganizationStarringComponent], + providers: [ + { provide: TrackLoginService, useClass: TrackLoginStubService }, + { provide: OrganizationStarringService, useClass: OrganizationStarringStubService }, + { provide: StarentryService, useClass: StarEntryStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: StarringService, useClass: StarringStubService }, + { provide: StarOrganizationService, useClass: StarOrganizationStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(OrganizationStarringComponent); diff --git a/src/app/organizations/organization/update-organization-description.module.ts b/src/app/organizations/organization/update-organization-description.module.ts index e384d49288..dcd9f13c5d 100644 --- a/src/app/organizations/organization/update-organization-description.module.ts +++ b/src/app/organizations/organization/update-organization-description.module.ts @@ -26,7 +26,6 @@ import { UpdateOrganizationOrCollectionDescriptionComponent } from './update-org ], providers: [OrganizationStarringService, StarOrganizationService, OrgSchemaService], declarations: [UpdateOrganizationOrCollectionDescriptionComponent], - entryComponents: [UpdateOrganizationOrCollectionDescriptionComponent], exports: [NgxJsonLdModule], }) export class UpdateOrganizationDescriptionModule {} diff --git a/src/app/organizations/register-organization.module.ts b/src/app/organizations/register-organization.module.ts index 1cc5427f13..eee9701753 100644 --- a/src/app/organizations/register-organization.module.ts +++ b/src/app/organizations/register-organization.module.ts @@ -11,6 +11,5 @@ import { RegisterOrganizationComponent } from './registerOrganization/register-o imports: [CommonModule, FormsModule, CustomMaterialModule, ReactiveFormsModule, RefreshAlertModule], declarations: [RegisterOrganizationComponent], providers: [AlertService], - entryComponents: [RegisterOrganizationComponent], }) export class RegisterOrganizationModule {} diff --git a/src/app/organizations/upsert-organization-member.module.ts b/src/app/organizations/upsert-organization-member.module.ts index 89e63e2a03..6de2592f01 100644 --- a/src/app/organizations/upsert-organization-member.module.ts +++ b/src/app/organizations/upsert-organization-member.module.ts @@ -10,6 +10,5 @@ import { UpsertOrganizationMemberComponent } from './upsert-organization-member/ @NgModule({ imports: [CommonModule, FlexLayoutModule, CustomMaterialModule, ReactiveFormsModule, RefreshAlertModule], declarations: [UpsertOrganizationMemberComponent], - entryComponents: [UpsertOrganizationMemberComponent], }) export class UpsertOrganizationMemberModule {} diff --git a/src/app/search/basic-search/basic-search.component.spec.ts b/src/app/search/basic-search/basic-search.component.spec.ts index 6e5fac7c61..5b6911d9f6 100644 --- a/src/app/search/basic-search/basic-search.component.spec.ts +++ b/src/app/search/basic-search/basic-search.component.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; @@ -14,14 +14,16 @@ describe('BasicSearchComponent', () => { let component: BasicSearchComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - schemas: [NO_ERRORS_SCHEMA], - imports: [MatAutocompleteModule, RouterTestingModule, BrowserAnimationsModule, CustomMaterialModule], - declarations: [BasicSearchComponent], - providers: [ProviderService, { provide: SearchService, useClass: SearchStubService }], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + schemas: [NO_ERRORS_SCHEMA], + imports: [MatAutocompleteModule, RouterTestingModule, BrowserAnimationsModule, CustomMaterialModule], + declarations: [BasicSearchComponent], + providers: [ProviderService, { provide: SearchService, useClass: SearchStubService }], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(BasicSearchComponent); diff --git a/src/app/search/query-builder.service.spec.ts b/src/app/search/query-builder.service.spec.ts index eba6449b2e..0ec27cfe3b 100644 --- a/src/app/search/query-builder.service.spec.ts +++ b/src/app/search/query-builder.service.spec.ts @@ -17,7 +17,7 @@ import { SearchStubService } from './../test/service-stubs'; /* tslint:disable:no-unused-variable */ -import { async, inject, TestBed } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { QueryBuilderService } from './query-builder.service'; import { SearchService } from './state/search.service'; diff --git a/src/app/search/search-results/search-results.component.spec.ts b/src/app/search/search-results/search-results.component.spec.ts index cd5843c94b..5fc0b149a1 100644 --- a/src/app/search/search-results/search-results.component.spec.ts +++ b/src/app/search/search-results/search-results.component.spec.ts @@ -16,7 +16,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; /* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TagCloudModule } from 'angular-tag-cloud-module'; import { QueryBuilderStubService, SearchStubService } from './../../test/service-stubs'; @@ -30,17 +30,19 @@ describe('SearchResultsComponent', () => { let component: SearchResultsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchResultsComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [TagCloudModule, RouterTestingModule], - providers: [ - { provide: SearchService, useClass: SearchStubService }, - { provide: QueryBuilderService, useClass: QueryBuilderStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SearchResultsComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [TagCloudModule, RouterTestingModule], + providers: [ + { provide: SearchService, useClass: SearchStubService }, + { provide: QueryBuilderService, useClass: QueryBuilderStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SearchResultsComponent); diff --git a/src/app/search/search-tool-table/search-tool-table.component.spec.ts b/src/app/search/search-tool-table/search-tool-table.component.spec.ts index 72709bcf94..b5868965f2 100644 --- a/src/app/search/search-tool-table/search-tool-table.component.spec.ts +++ b/src/app/search/search-tool-table/search-tool-table.component.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; @@ -16,19 +16,21 @@ describe('SearchToolTableComponent', () => { let component: SearchToolTableComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchToolTableComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [CustomMaterialModule, BrowserAnimationsModule, RouterTestingModule], - providers: [ - { provide: DockstoreService, useClass: DockstoreStubService }, - DateService, - { provide: ListContainersService, useClass: ListContainersStubService }, - { provide: SearchService, useClass: SearchStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SearchToolTableComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [CustomMaterialModule, BrowserAnimationsModule, RouterTestingModule], + providers: [ + { provide: DockstoreService, useClass: DockstoreStubService }, + DateService, + { provide: ListContainersService, useClass: ListContainersStubService }, + { provide: SearchService, useClass: SearchStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SearchToolTableComponent); diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.spec.ts b/src/app/search/search-workflow-table/search-workflow-table.component.spec.ts index 6f1a91b91a..ab661adf02 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.spec.ts +++ b/src/app/search/search-workflow-table/search-workflow-table.component.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -16,18 +16,20 @@ describe('SearchWorkflowTableComponent', () => { let component: SearchWorkflowTableComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchWorkflowTableComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [CustomMaterialModule, BrowserAnimationsModule, RouterTestingModule], - providers: [ - { provide: DockstoreService, useClass: DockstoreStubService }, - DateService, - { provide: SearchService, useClass: SearchStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SearchWorkflowTableComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [CustomMaterialModule, BrowserAnimationsModule, RouterTestingModule], + providers: [ + { provide: DockstoreService, useClass: DockstoreStubService }, + DateService, + { provide: SearchService, useClass: SearchStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SearchWorkflowTableComponent); diff --git a/src/app/search/search.component.spec.ts b/src/app/search/search.component.spec.ts index 9d5b5aa92d..6291c40b74 100644 --- a/src/app/search/search.component.spec.ts +++ b/src/app/search/search.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Component } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { MdePopoverModule } from '@material-extended/mde'; @@ -53,18 +53,20 @@ describe('SearchComponent', () => { let searchQuery: jasmine.SpyObj; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SearchComponent, MapFriendlyValuesPipe, HeaderComponent, BasicSearchComponent, SearchResultsComponent], - imports: [CustomMaterialModule, ClipboardModule, FontAwesomeModule, RouterTestingModule, MdePopoverModule], - providers: [ - { provide: SearchService, useClass: SearchStubService }, - { provide: QueryBuilderService, useClass: QueryBuilderStubService }, - { provide: ProviderService, useClass: ProviderStubService }, - { provide: SearchQuery, useValue: jasmine.createSpyObj('SearchQuery', ['select', 'getValue', 'searchText']) }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SearchComponent, MapFriendlyValuesPipe, HeaderComponent, BasicSearchComponent, SearchResultsComponent], + imports: [CustomMaterialModule, ClipboardModule, FontAwesomeModule, RouterTestingModule, MdePopoverModule], + providers: [ + { provide: SearchService, useClass: SearchStubService }, + { provide: QueryBuilderService, useClass: QueryBuilderStubService }, + { provide: ProviderService, useClass: ProviderStubService }, + { provide: SearchQuery, useValue: jasmine.createSpyObj('SearchQuery', ['select', 'getValue', 'searchText']) }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SearchComponent); diff --git a/src/app/search/search.module.ts b/src/app/search/search.module.ts index 76dd1e48ad..bd2d4c203b 100644 --- a/src/app/search/search.module.ts +++ b/src/app/search/search.module.ts @@ -67,6 +67,5 @@ import { SearchService } from './state/search.service'; ], providers: [SearchService, QueryBuilderService], exports: [SearchComponent], - entryComponents: [AdvancedSearchComponent], }) export class SearchModule {} diff --git a/src/app/select/select.component.spec.ts b/src/app/select/select.component.spec.ts index dfbe1003b8..499f4c79c9 100644 --- a/src/app/select/select.component.spec.ts +++ b/src/app/select/select.component.spec.ts @@ -15,7 +15,7 @@ */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { SelectComponent } from './select.component'; @@ -23,12 +23,14 @@ describe('SelectComponent', () => { let component: SelectComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SelectComponent], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SelectComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SelectComponent); diff --git a/src/app/shared-workflow-services/shared-workflow-services.module.ts b/src/app/shared-workflow-services/shared-workflow-services.module.ts index bd04d3af51..1aaf5e078d 100644 --- a/src/app/shared-workflow-services/shared-workflow-services.module.ts +++ b/src/app/shared-workflow-services/shared-workflow-services.module.ts @@ -48,6 +48,5 @@ const IMPORTS = [ imports: IMPORTS, providers: [MyWorkflowsService, MyBioWorkflowsService, MyServicesService], exports: DECLARATIONS.concat(IMPORTS), - entryComponents: [RegisterWorkflowModalComponent], }) export class SharedWorkflowServicesModule {} diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts index 5469a88da7..da308ba4e9 100644 --- a/src/app/shared/alert/alert.component.spec.ts +++ b/src/app/shared/alert/alert.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; @@ -10,12 +10,14 @@ describe('RefreshAlertComponent', () => { let component: AlertComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatProgressBarModule, MatSnackBarModule, MatIconModule, MatCardModule], - declarations: [AlertComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [MatProgressBarModule, MatSnackBarModule, MatIconModule, MatCardModule], + declarations: [AlertComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(AlertComponent); diff --git a/src/app/shared/available-logs.module.ts b/src/app/shared/available-logs.module.ts index 1a15621352..81900304c7 100644 --- a/src/app/shared/available-logs.module.ts +++ b/src/app/shared/available-logs.module.ts @@ -27,6 +27,5 @@ import { CustomMaterialModule } from './modules/material.module'; imports: [CommonModule, CustomMaterialModule, FlexLayoutModule, RefreshAlertModule], declarations: [AvailableLogsComponent, VerifiedDisplayComponent, ToolTesterLogPipe, RemoveExtensionPipe], exports: [VerifiedDisplayComponent], - entryComponents: [AvailableLogsComponent], }) export class AvailableLogsModule {} diff --git a/src/app/shared/base.ts b/src/app/shared/base.ts index 8e7af2921d..f897798589 100644 --- a/src/app/shared/base.ts +++ b/src/app/shared/base.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OnDestroy } from '@angular/core'; +import { Directive, OnDestroy } from '@angular/core'; import { Subject } from 'rxjs'; /** @@ -26,6 +26,8 @@ import { Subject } from 'rxjs'; * @class Base * @implements {OnDestroy} */ +@Directive() +// tslint:disable-next-line: directive-class-suffix export abstract class Base implements OnDestroy { protected ngUnsubscribe: Subject<{}> = new Subject(); diff --git a/src/app/shared/code-editor-list/code-editor-list.component.spec.ts b/src/app/shared/code-editor-list/code-editor-list.component.spec.ts index 4800eb61f4..38093f2be8 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.spec.ts +++ b/src/app/shared/code-editor-list/code-editor-list.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; @@ -22,26 +22,28 @@ describe('CodeEditorListComponent', () => { let component: CodeEditorListComponent; let fixture: ComponentFixture; class FileStubService {} - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [CodeEditorListComponent, CodeEditorComponent, PublicFileDownloadPipe, PrivateFileDownloadPipe, PrivateFilePathPipe], - imports: [ - MatButtonModule, - MatTabsModule, - MatToolbarModule, - MatIconModule, - MatInputModule, - MatFormFieldModule, - MatTooltipModule, - MatCardModule, - ClipboardModule, - ], - providers: [ - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: FileService, useClass: FileStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CodeEditorListComponent, CodeEditorComponent, PublicFileDownloadPipe, PrivateFileDownloadPipe, PrivateFilePathPipe], + imports: [ + MatButtonModule, + MatTabsModule, + MatToolbarModule, + MatIconModule, + MatInputModule, + MatFormFieldModule, + MatTooltipModule, + MatCardModule, + ClipboardModule, + ], + providers: [ + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: FileService, useClass: FileStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(CodeEditorListComponent); diff --git a/src/app/shared/code-editor/code-editor.component.spec.ts b/src/app/shared/code-editor/code-editor.component.spec.ts index 3f2a05f043..1a336e2e2b 100644 --- a/src/app/shared/code-editor/code-editor.component.spec.ts +++ b/src/app/shared/code-editor/code-editor.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CodeEditorComponent } from './code-editor.component'; @@ -6,11 +6,13 @@ describe('CodeEditorComponent', () => { let component: CodeEditorComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [CodeEditorComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CodeEditorComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(CodeEditorComponent); diff --git a/src/app/shared/entry/commit-url.pipe.spec.ts b/src/app/shared/entry/commit-url.pipe.spec.ts index e5eba96719..f28f7f617b 100644 --- a/src/app/shared/entry/commit-url.pipe.spec.ts +++ b/src/app/shared/entry/commit-url.pipe.spec.ts @@ -1,6 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { async, TestBed } from '@angular/core/testing'; import { CommitUrlPipe } from './commit-url.pipe'; describe('Pipe: CommitUrle', () => { diff --git a/src/app/shared/entry/entry.module.ts b/src/app/shared/entry/entry.module.ts index f70ce18b6b..5d5842dd26 100644 --- a/src/app/shared/entry/entry.module.ts +++ b/src/app/shared/entry/entry.module.ts @@ -91,7 +91,6 @@ import { VersionProviderUrlPipe } from './versionProviderUrl.pipe'; RouterModule, ReactiveFormsModule, ], - entryComponents: [RegisterCheckerWorkflowComponent], providers: [BioschemaService, EntryActionsService], }) export class EntryModule {} diff --git a/src/app/shared/entry/info-tab-checker-workflow-path/info-tab-checker-workflow-path.component.spec.ts b/src/app/shared/entry/info-tab-checker-workflow-path/info-tab-checker-workflow-path.component.spec.ts index aa5a90c159..e5762d4114 100644 --- a/src/app/shared/entry/info-tab-checker-workflow-path/info-tab-checker-workflow-path.component.spec.ts +++ b/src/app/shared/entry/info-tab-checker-workflow-path/info-tab-checker-workflow-path.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; @@ -28,17 +28,19 @@ describe('InfoTabCheckerWorkflowPathComponent', () => { let component: InfoTabCheckerWorkflowPathComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, RouterTestingModule, MatDialogModule, CustomMaterialModule], - providers: [ - { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, - { provide: RegisterCheckerWorkflowService, useClass: RegisterCheckerWorkflowStubService }, - ], - declarations: [InfoTabCheckerWorkflowPathComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [FormsModule, RouterTestingModule, MatDialogModule, CustomMaterialModule], + providers: [ + { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, + { provide: RegisterCheckerWorkflowService, useClass: RegisterCheckerWorkflowStubService }, + ], + declarations: [InfoTabCheckerWorkflowPathComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(InfoTabCheckerWorkflowPathComponent); diff --git a/src/app/shared/entry/launch-checker-workflow/launch-checker-workflow.component.spec.ts b/src/app/shared/entry/launch-checker-workflow/launch-checker-workflow.component.spec.ts index 8b0f5010bd..75c1035217 100644 --- a/src/app/shared/entry/launch-checker-workflow/launch-checker-workflow.component.spec.ts +++ b/src/app/shared/entry/launch-checker-workflow/launch-checker-workflow.component.spec.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; import { CheckerWorkflowService } from '../../state/checker-workflow.service'; @@ -23,13 +23,15 @@ describe('LaunchCheckerWorkflowComponent', () => { let component: LaunchCheckerWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [LaunchCheckerWorkflowComponent], - providers: [{ provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }], - imports: [MatCardModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LaunchCheckerWorkflowComponent], + providers: [{ provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }], + imports: [MatCardModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LaunchCheckerWorkflowComponent); diff --git a/src/app/shared/entry/register-checker-workflow/register-checker-workflow.component.spec.ts b/src/app/shared/entry/register-checker-workflow/register-checker-workflow.component.spec.ts index 4523f0d1ea..fb6a186845 100644 --- a/src/app/shared/entry/register-checker-workflow/register-checker-workflow.component.spec.ts +++ b/src/app/shared/entry/register-checker-workflow/register-checker-workflow.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { MatDialogModule } from '@angular/material/dialog'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -31,19 +31,21 @@ describe('RegisterCheckerWorkflowComponent', () => { let component: RegisterCheckerWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RegisterCheckerWorkflowComponent], - schemas: [NO_ERRORS_SCHEMA], - imports: [FormsModule, MatSnackBarModule, MatDialogModule, BrowserAnimationsModule, CustomMaterialModule], - providers: [ - { provide: RegisterCheckerWorkflowService, useClass: RegisterCheckerWorkflowStubService }, - { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, - DescriptorTypeCompatService, - { provide: DescriptorLanguageService, useClass: DescriptorLanguageStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [RegisterCheckerWorkflowComponent], + schemas: [NO_ERRORS_SCHEMA], + imports: [FormsModule, MatSnackBarModule, MatDialogModule, BrowserAnimationsModule, CustomMaterialModule], + providers: [ + { provide: RegisterCheckerWorkflowService, useClass: RegisterCheckerWorkflowStubService }, + { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, + DescriptorTypeCompatService, + { provide: DescriptorLanguageService, useClass: DescriptorLanguageStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(RegisterCheckerWorkflowComponent); diff --git a/src/app/shared/entry/verified-by/verified-by.component.spec.ts b/src/app/shared/entry/verified-by/verified-by.component.spec.ts index 2b985eed8d..287abe9746 100644 --- a/src/app/shared/entry/verified-by/verified-by.component.spec.ts +++ b/src/app/shared/entry/verified-by/verified-by.component.spec.ts @@ -1,5 +1,4 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CustomMaterialModule } from '../../modules/material.module'; import { VerifiedByComponent } from './verified-by.component'; @@ -7,12 +6,14 @@ describe('VerifiedByComponent', () => { let component: VerifiedByComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [CustomMaterialModule], - declarations: [VerifiedByComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CustomMaterialModule], + declarations: [VerifiedByComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(VerifiedByComponent); diff --git a/src/app/shared/entry/verified-display/verified-display.component.spec.ts b/src/app/shared/entry/verified-display/verified-display.component.spec.ts index 1d06470686..81c4f23fef 100644 --- a/src/app/shared/entry/verified-display/verified-display.component.spec.ts +++ b/src/app/shared/entry/verified-display/verified-display.component.spec.ts @@ -1,5 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { versionVerifiedPlatform } from '../../../test/mocked-objects'; @@ -10,12 +10,14 @@ describe('VerifiedDisplayComponent', () => { let component: VerifiedDisplayComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [VerifiedDisplayComponent], - imports: [CustomMaterialModule, BrowserAnimationsModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [VerifiedDisplayComponent], + imports: [CustomMaterialModule, BrowserAnimationsModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(VerifiedDisplayComponent); diff --git a/src/app/shared/entry/versionProviderUrl.pipe.spec.ts b/src/app/shared/entry/versionProviderUrl.pipe.spec.ts index cc2ba72d79..8a8cd451f7 100644 --- a/src/app/shared/entry/versionProviderUrl.pipe.spec.ts +++ b/src/app/shared/entry/versionProviderUrl.pipe.spec.ts @@ -1,6 +1,3 @@ -/* tslint:disable:no-unused-variable */ - -import { async, TestBed } from '@angular/core/testing'; import { VersionProviderUrlPipe } from './versionProviderUrl.pipe'; describe('Pipe: VersionProviderUrle', () => { diff --git a/src/app/shared/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts index f27058a811..a02ab4b431 100644 --- a/src/app/shared/loading/loading.component.spec.ts +++ b/src/app/shared/loading/loading.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { LoadingComponent } from './loading.component'; @@ -10,12 +8,14 @@ describe('LoadingComponent', () => { let component: LoadingComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatProgressBarModule], - declarations: [LoadingComponent], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [MatProgressBarModule], + declarations: [LoadingComponent], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LoadingComponent); diff --git a/src/app/shared/markdown-wrapper/markdown-wrapper.component.spec.ts b/src/app/shared/markdown-wrapper/markdown-wrapper.component.spec.ts index 1f98413e5c..e63982f469 100644 --- a/src/app/shared/markdown-wrapper/markdown-wrapper.component.spec.ts +++ b/src/app/shared/markdown-wrapper/markdown-wrapper.component.spec.ts @@ -1,5 +1,5 @@ import { SecurityContext } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MarkdownModule, MarkdownService, SECURITY_CONTEXT } from 'ngx-markdown'; import { MarkdownWrapperComponent } from './markdown-wrapper.component'; @@ -7,13 +7,15 @@ describe('MarkdownWrapperComponent', () => { let wrapperComponent: MarkdownWrapperComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MarkdownModule], - declarations: [MarkdownWrapperComponent], - providers: [MarkdownService, { provide: SECURITY_CONTEXT, useValue: SecurityContext.HTML }], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [MarkdownModule], + declarations: [MarkdownWrapperComponent], + providers: [MarkdownService, { provide: SECURITY_CONTEXT, useValue: SecurityContext.HTML }], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(MarkdownWrapperComponent); @@ -21,58 +23,73 @@ describe('MarkdownWrapperComponent', () => { wrapperComponent = fixture.debugElement.componentInstance; }); - it('should create the app', async(() => { - expect(wrapperComponent).toBeDefined(); - })); + it( + 'should create the app', + waitForAsync(() => { + expect(wrapperComponent).toBeDefined(); + }) + ); - it('should contain h1', async(() => { - wrapperComponent.data = '# Header1'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('Header1'); - })); + it( + 'should contain h1', + waitForAsync(() => { + wrapperComponent.data = '# Header1'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('Header1'); + }) + ); - it('should contain h2', async(() => { - wrapperComponent.data = '## Header2'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('Header2'); - })); + it( + 'should contain h2', + waitForAsync(() => { + wrapperComponent.data = '## Header2'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('Header2'); + }) + ); - it('should have correctly sanitized spans', async(() => { - // first should contain just a link and no class - wrapperComponent.data = 'Fake Button!'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('Fake Button!'); - expect(fixture.nativeElement.innerHTML).not.toContain('class'); + it( + 'should have correctly sanitized spans', + waitForAsync(() => { + // first should contain just a link and no class + wrapperComponent.data = 'Fake Button!'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('Fake Button!'); + expect(fixture.nativeElement.innerHTML).not.toContain('class'); - // second span should have an href but no classes - wrapperComponent.data = - 'has href but no styling'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('has href but no styling'); - expect(fixture.nativeElement.innerHTML).toContain('has href but no styling'); - expect(fixture.nativeElement.innerHTML).not.toContain('class'); + // second span should have an href but no classes + wrapperComponent.data = + 'has href but no styling'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('has href but no styling'); + expect(fixture.nativeElement.innerHTML).toContain('has href but no styling'); + expect(fixture.nativeElement.innerHTML).not.toContain('class'); - // third span should have no href and no styling - wrapperComponent.data = - 'no href and no styling'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('no href and no styling'); - expect(fixture.nativeElement.innerHTML).not.toContain('href='); - expect(fixture.nativeElement.innerHTML).not.toContain('class'); - })); + // third span should have no href and no styling + wrapperComponent.data = + 'no href and no styling'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('no href and no styling'); + expect(fixture.nativeElement.innerHTML).not.toContain('href='); + expect(fixture.nativeElement.innerHTML).not.toContain('class'); + }) + ); - it('should not sanitize text ', async(() => { - wrapperComponent.data = - '`Safe!`'; - wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) - fixture.detectChanges(); - expect(fixture.nativeElement.innerHTML).toContain('class="mat-focus-indicator mat-flat-button mat-button-base mat-primary'); - expect(fixture.nativeElement.innerHTML).toContain('href="javascript:window.alert(\'mashing\')"'); - expect(fixture.nativeElement.innerHTML).toContain('Safe!'); - })); + it( + 'should not sanitize text ', + waitForAsync(() => { + wrapperComponent.data = + '`Safe!`'; + wrapperComponent.ngOnChanges(); // has to be called manually in unit tests (TestBed doesn't by default) + fixture.detectChanges(); + expect(fixture.nativeElement.innerHTML).toContain('class="mat-focus-indicator mat-flat-button mat-button-base mat-primary'); + expect(fixture.nativeElement.innerHTML).toContain('href="javascript:window.alert(\'mashing\')"'); + expect(fixture.nativeElement.innerHTML).toContain('Safe!'); + }) + ); }); diff --git a/src/app/shared/modules/container.module.ts b/src/app/shared/modules/container.module.ts index 2c935aceda..de81b2efef 100644 --- a/src/app/shared/modules/container.module.ts +++ b/src/app/shared/modules/container.module.ts @@ -104,6 +104,5 @@ import { SelectModule } from './select.module'; InfoTabService, ], exports: [ContainerComponent, CustomMaterialModule, EntryModule, ToolActionsComponent], - entryComponents: [ModalComponent, VersionModalComponent, AddTagComponent], }) export class ContainerModule {} diff --git a/src/app/shared/modules/markdown-wrapper.module.ts b/src/app/shared/modules/markdown-wrapper.module.ts index c07c2deaae..4d6fdcb47e 100644 --- a/src/app/shared/modules/markdown-wrapper.module.ts +++ b/src/app/shared/modules/markdown-wrapper.module.ts @@ -23,6 +23,5 @@ import { MarkdownWrapperComponent } from '../markdown-wrapper/markdown-wrapper.c imports: [CommonModule, MarkdownModule], providers: [], exports: [MarkdownWrapperComponent], - entryComponents: [], }) export class MarkdownWrapperModule {} diff --git a/src/app/shared/modules/workflow.module.ts b/src/app/shared/modules/workflow.module.ts index 949c784ed2..e066ad2c31 100644 --- a/src/app/shared/modules/workflow.module.ts +++ b/src/app/shared/modules/workflow.module.ts @@ -108,6 +108,5 @@ import { MarkdownWrapperModule } from './markdown-wrapper.module'; VersionModalService, ], exports: [WorkflowComponent, CustomMaterialModule, EntryModule, HeaderModule, CommonModule, WorkflowActionsComponent], - entryComponents: [VersionModalComponent], }) export class WorkflowModule {} diff --git a/src/app/shared/selectors/entry-file-selector.ts b/src/app/shared/selectors/entry-file-selector.ts index 0270ca59cc..4167612d72 100644 --- a/src/app/shared/selectors/entry-file-selector.ts +++ b/src/app/shared/selectors/entry-file-selector.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OnDestroy } from '@angular/core'; +import { Directive, OnDestroy } from '@angular/core'; import { SafeUrl } from '@angular/platform-browser'; import { Observable, Subject } from 'rxjs'; import { finalize, takeUntil } from 'rxjs/operators'; @@ -30,6 +30,8 @@ import { FileWrapper, Tag, ToolDescriptor, ToolFile, WorkflowVersion } from '../ /** * Abstract class to be implemented by components that have select boxes for a given entry and version */ +@Directive() +// tslint:disable-next-line: directive-class-suffix export abstract class EntryFileSelector implements OnDestroy { _selectedVersion: any; id: number; diff --git a/src/app/sitemap/sitemap.component.spec.ts b/src/app/sitemap/sitemap.component.spec.ts index a1cb23af12..1b6c97fd3b 100644 --- a/src/app/sitemap/sitemap.component.spec.ts +++ b/src/app/sitemap/sitemap.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SitemapComponent } from './sitemap.component'; @@ -6,12 +6,14 @@ describe('SitemapComponent', () => { let component: SitemapComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SitemapComponent], - imports: [RouterTestingModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SitemapComponent], + imports: [RouterTestingModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SitemapComponent); diff --git a/src/app/source-file-tabs/source-file-tabs.component.spec.ts b/src/app/source-file-tabs/source-file-tabs.component.spec.ts index 27b12476c7..56f2cc3504 100644 --- a/src/app/source-file-tabs/source-file-tabs.component.spec.ts +++ b/src/app/source-file-tabs/source-file-tabs.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; @@ -12,17 +12,19 @@ describe('SourceFileTabsComponent', () => { let component: SourceFileTabsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SourceFileTabsComponent, MapFriendlyValuesPipe], - imports: [HttpClientTestingModule], - providers: [ - { provide: SourceFileTabsService, useClass: SourceFileTabsStubService }, - { provide: FileService, useClass: FileStubService }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SourceFileTabsComponent, MapFriendlyValuesPipe], + imports: [HttpClientTestingModule], + providers: [ + { provide: SourceFileTabsService, useClass: SourceFileTabsStubService }, + { provide: FileService, useClass: FileStubService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SourceFileTabsComponent); diff --git a/src/app/sponsors/sponsors.component.spec.ts b/src/app/sponsors/sponsors.component.spec.ts index d9fc21ebdb..0d8585d36d 100644 --- a/src/app/sponsors/sponsors.component.spec.ts +++ b/src/app/sponsors/sponsors.component.spec.ts @@ -15,7 +15,7 @@ */ import { Location } from '@angular/common'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SponsorsComponent } from './sponsors.component'; @@ -23,13 +23,15 @@ describe('SponsorsComponent', () => { let component: SponsorsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [SponsorsComponent], - providers: [Location], - imports: [RouterTestingModule], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SponsorsComponent], + providers: [Location], + imports: [RouterTestingModule], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(SponsorsComponent); diff --git a/src/app/stargazers/stargazers.component.spec.ts b/src/app/stargazers/stargazers.component.spec.ts index a408e6a30d..2007f582d9 100644 --- a/src/app/stargazers/stargazers.component.spec.ts +++ b/src/app/stargazers/stargazers.component.spec.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; @@ -27,17 +27,19 @@ describe('StargazersComponent', () => { let component: StargazersComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [StargazersComponent], - imports: [MatIconModule, MatCardModule], - providers: [ - { provide: UserService, useClass: UserStubService }, - { provide: StarringService, useClass: StarringStubService }, - { provide: StarentryService, useClass: StarEntryStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [StargazersComponent], + imports: [MatIconModule, MatCardModule], + providers: [ + { provide: UserService, useClass: UserStubService }, + { provide: StarringService, useClass: StarringStubService }, + { provide: StarentryService, useClass: StarEntryStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(StargazersComponent); diff --git a/src/app/starredentries/starredentries.component.spec.ts b/src/app/starredentries/starredentries.component.spec.ts index e6800713ac..fc499ac53c 100644 --- a/src/app/starredentries/starredentries.component.spec.ts +++ b/src/app/starredentries/starredentries.component.spec.ts @@ -1,5 +1,5 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ImageProviderService } from '../shared/image-provider.service'; import { ProviderService } from './../shared/provider.service'; @@ -13,19 +13,21 @@ describe('StarredEntriesComponent', () => { let component: StarredEntriesComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [StarredEntriesComponent], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - { provide: StarringService, useClass: StarringStubService }, - { provide: ImageProviderService, useClass: ImageProviderStubService }, - ProviderService, - { provide: StarentryService, useClass: StarEntryStubService }, - { provide: UsersService, useClass: UsersStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [StarredEntriesComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + { provide: StarringService, useClass: StarringStubService }, + { provide: ImageProviderService, useClass: ImageProviderStubService }, + ProviderService, + { provide: StarentryService, useClass: StarEntryStubService }, + { provide: UsersService, useClass: UsersStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(StarredEntriesComponent); diff --git a/src/app/starring/starring.component.spec.ts b/src/app/starring/starring.component.spec.ts index 212897fa07..834844bed8 100644 --- a/src/app/starring/starring.component.spec.ts +++ b/src/app/starring/starring.component.spec.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -35,19 +35,21 @@ describe('StarringComponent', () => { let component: StarringComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [StarringComponent], - imports: [MatIconModule, MatSnackBarModule], - providers: [ - { provide: StarringService, useClass: StarringStubService }, - { provide: TrackLoginService, useClass: TrackLoginStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: StarentryService, useClass: StarEntryStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [StarringComponent], + imports: [MatIconModule, MatSnackBarModule], + providers: [ + { provide: StarringService, useClass: StarringStubService }, + { provide: TrackLoginService, useClass: TrackLoginStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: StarentryService, useClass: StarEntryStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(StarringComponent); diff --git a/src/app/workflow/dag/cwl-viewer/cwl-viewer.component.spec.ts b/src/app/workflow/dag/cwl-viewer/cwl-viewer.component.spec.ts index 09ee263ea0..694f164b51 100644 --- a/src/app/workflow/dag/cwl-viewer/cwl-viewer.component.spec.ts +++ b/src/app/workflow/dag/cwl-viewer/cwl-viewer.component.spec.ts @@ -1,6 +1,6 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { DateService } from '../../../shared/date.service'; import { DockstoreService } from '../../../shared/dockstore.service'; @@ -13,14 +13,16 @@ describe('cwl-viewerComponent', () => { let component: CwlViewerComponent; let fixture: ComponentFixture; let workflowService: WorkflowService; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [CwlViewerComponent], - imports: [HttpClientTestingModule, FormsModule], - schemas: [NO_ERRORS_SCHEMA], - providers: [DockstoreService, DateService, ProviderService, WorkflowService], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CwlViewerComponent], + imports: [HttpClientTestingModule, FormsModule], + schemas: [NO_ERRORS_SCHEMA], + providers: [DockstoreService, DateService, ProviderService, WorkflowService], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(CwlViewerComponent); diff --git a/src/app/workflow/dag/dag.component.spec.ts b/src/app/workflow/dag/dag.component.spec.ts index 7cd3ad85a2..6f9529e69a 100644 --- a/src/app/workflow/dag/dag.component.spec.ts +++ b/src/app/workflow/dag/dag.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { WorkflowService } from '../../shared/state/workflow.service'; import { WorkflowsService } from '../../shared/swagger/api/workflows.service'; @@ -29,19 +29,21 @@ describe('DagComponent', () => { let component: DagComponent; let fixture: ComponentFixture; let dagQuery: DagQuery; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DagComponent, CwlViewerComponent], - imports: [HttpClientTestingModule, FormsModule], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - DagStore, - DagQuery, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DagComponent, CwlViewerComponent], + imports: [HttpClientTestingModule, FormsModule], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + DagStore, + DagQuery, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DagComponent); diff --git a/src/app/workflow/dag/wdl-viewer/wdl-viewer.component.spec.ts b/src/app/workflow/dag/wdl-viewer/wdl-viewer.component.spec.ts index c0ee4393be..6a80521f3b 100644 --- a/src/app/workflow/dag/wdl-viewer/wdl-viewer.component.spec.ts +++ b/src/app/workflow/dag/wdl-viewer/wdl-viewer.component.spec.ts @@ -26,7 +26,7 @@ // let component: WdlViewerComponent; // let fixture: ComponentFixture; // -// beforeEach(async(() => { +// beforeEach(waitForAsync(() => { // TestBed.configureTestingModule({ // declarations: [WdlViewerComponent], // schemas: [CUSTOM_ELEMENTS_SCHEMA], diff --git a/src/app/workflow/descriptors/descriptors.component.spec.ts b/src/app/workflow/descriptors/descriptors.component.spec.ts index e0b312a349..e810b7848e 100644 --- a/src/app/workflow/descriptors/descriptors.component.spec.ts +++ b/src/app/workflow/descriptors/descriptors.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientModule } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { DescriptorService } from '../../shared/descriptor.service'; @@ -29,19 +29,21 @@ describe('DescriptorsWorkflowComponent', () => { let component: DescriptorsWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [DescriptorsWorkflowComponent], - imports: [HttpClientModule, MatSnackBarModule], - providers: [ - { provide: DescriptorService, useClass: DescriptorsStubService }, - { provide: FileService, useClass: FileStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DescriptorsWorkflowComponent], + imports: [HttpClientModule, MatSnackBarModule], + providers: [ + { provide: DescriptorService, useClass: DescriptorsStubService }, + { provide: FileService, useClass: FileStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(DescriptorsWorkflowComponent); diff --git a/src/app/workflow/files/files.component.spec.ts b/src/app/workflow/files/files.component.spec.ts index 69515fa28d..539f09eba2 100644 --- a/src/app/workflow/files/files.component.spec.ts +++ b/src/app/workflow/files/files.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ParamfilesService } from '../../container/paramfiles/paramfiles.service'; import { GA4GHV20Service } from '../../shared/openapi'; @@ -25,16 +25,18 @@ describe('FilesWorkflowComponent', () => { let component: FilesWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FilesWorkflowComponent], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - { provide: ParamfilesService, useClass: ParamFilesStubService }, - { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [FilesWorkflowComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + { provide: ParamfilesService, useClass: ParamFilesStubService }, + { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(FilesWorkflowComponent); diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts b/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts index 11ac2797ae..3285f4e695 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts +++ b/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientModule } from '@angular/common/http'; import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; @@ -17,14 +17,16 @@ describe('LaunchThirdPartyComponent', () => { let component: LaunchThirdPartyComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [LaunchThirdPartyComponent], - imports: [CustomMaterialModule, HttpClientModule], - providers: [GA4GHFilesService, GA4GHV20Service, GA4GHFilesStore, { provide: WorkflowsService, useClass: WorkflowsStubService }], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LaunchThirdPartyComponent], + imports: [CustomMaterialModule, HttpClientModule], + providers: [GA4GHFilesService, GA4GHV20Service, GA4GHFilesStore, { provide: WorkflowsService, useClass: WorkflowsStubService }], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { TestBed.inject(WorkflowsService); diff --git a/src/app/workflow/launch/launch.component.spec.ts b/src/app/workflow/launch/launch.component.spec.ts index 653a282701..7edac410e6 100644 --- a/src/app/workflow/launch/launch.component.spec.ts +++ b/src/app/workflow/launch/launch.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ContainerService } from '../../shared/container.service'; import { DescriptorService } from '../../shared/descriptor.service'; @@ -35,20 +35,22 @@ describe('LaunchWorkflowComponent', () => { let component: LaunchWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [LaunchWorkflowComponent], - schemas: [NO_ERRORS_SCHEMA], - providers: [ - WorkflowLaunchService, - { provide: ContainerService, useClass: ContainerStubService }, - { provide: DescriptorService, useClass: DescriptorsStubService }, - { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [LaunchWorkflowComponent], + schemas: [NO_ERRORS_SCHEMA], + providers: [ + WorkflowLaunchService, + { provide: ContainerService, useClass: ContainerStubService }, + { provide: DescriptorService, useClass: DescriptorsStubService }, + { provide: CheckerWorkflowService, useClass: CheckerWorkflowStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(LaunchWorkflowComponent); diff --git a/src/app/workflow/paramfiles/paramfiles.component.spec.ts b/src/app/workflow/paramfiles/paramfiles.component.spec.ts index 874f3e37c4..73f4e5948b 100644 --- a/src/app/workflow/paramfiles/paramfiles.component.spec.ts +++ b/src/app/workflow/paramfiles/paramfiles.component.spec.ts @@ -15,7 +15,7 @@ */ import { HttpClientModule } from '@angular/common/http'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ParamfilesService } from '../../container/paramfiles/paramfiles.service'; @@ -29,19 +29,21 @@ describe('ParamfilesWorkflowComponent', () => { let component: ParamfilesWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ParamfilesWorkflowComponent], - imports: [HttpClientModule, MatSnackBarModule], - providers: [ - { provide: ParamfilesService, useClass: ParamFilesStubService }, - { provide: FileService, useClass: FileStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, - ], - schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ParamfilesWorkflowComponent], + imports: [HttpClientModule, MatSnackBarModule], + providers: [ + { provide: ParamfilesService, useClass: ParamFilesStubService }, + { provide: FileService, useClass: FileStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: GA4GHV20Service, useClass: GA4GHV20StubService }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ParamfilesWorkflowComponent); diff --git a/src/app/workflow/permissions/permissions.component.spec.ts b/src/app/workflow/permissions/permissions.component.spec.ts index 664d77feb1..699b5f3f66 100644 --- a/src/app/workflow/permissions/permissions.component.spec.ts +++ b/src/app/workflow/permissions/permissions.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RefreshService } from '../../shared/refresh.service'; import { TokenService } from '../../shared/state/token.service'; @@ -11,17 +11,19 @@ describe('PermissionsComponent', () => { let component: PermissionsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [PermissionsComponent], - imports: [CustomMaterialModule], - providers: [ - { provide: WorkflowsService, useClass: WorkflowsStubService }, - { provide: TokenService, useClass: TokenStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [PermissionsComponent], + imports: [CustomMaterialModule], + providers: [ + { provide: WorkflowsService, useClass: WorkflowsStubService }, + { provide: TokenService, useClass: TokenStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(PermissionsComponent); diff --git a/src/app/workflow/refresh-workflow-organization/refresh-workflow-organization.component.spec.ts b/src/app/workflow/refresh-workflow-organization/refresh-workflow-organization.component.spec.ts index 233dc895a0..2852be1a4d 100644 --- a/src/app/workflow/refresh-workflow-organization/refresh-workflow-organization.component.spec.ts +++ b/src/app/workflow/refresh-workflow-organization/refresh-workflow-organization.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -41,20 +41,22 @@ describe('RefreshWorkflowOrganizationComponent', () => { let component: RefreshWorkflowOrganizationComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RefreshWorkflowOrganizationComponent], - imports: [MatToolbarModule, MatIconModule, MatButtonModule, MatTooltipModule, MatSnackBarModule, HttpClientTestingModule], - providers: [ - { provide: UsersService, useClass: UsersStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - { provide: ExtendedDockstoreToolService, useClass: ExtendedDockstoreToolStubService }, - { provide: DateService, useClass: DateStubService }, - { provide: ProviderService, useClass: ProviderStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [RefreshWorkflowOrganizationComponent], + imports: [MatToolbarModule, MatIconModule, MatButtonModule, MatTooltipModule, MatSnackBarModule, HttpClientTestingModule], + providers: [ + { provide: UsersService, useClass: UsersStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + { provide: ExtendedDockstoreToolService, useClass: ExtendedDockstoreToolStubService }, + { provide: DateService, useClass: DateStubService }, + { provide: ProviderService, useClass: ProviderStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(RefreshWorkflowOrganizationComponent); diff --git a/src/app/workflow/tool-tab/tool-tab.component.spec.ts b/src/app/workflow/tool-tab/tool-tab.component.spec.ts index c59bf2583a..1a2eec6bb4 100644 --- a/src/app/workflow/tool-tab/tool-tab.component.spec.ts +++ b/src/app/workflow/tool-tab/tool-tab.component.spec.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { RefreshAlertModule } from '../../shared/alert/alert.module'; import { CustomMaterialModule } from '../../shared/modules/material.module'; @@ -26,16 +26,18 @@ describe('ToolTabComponent', () => { let component: ToolTabComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ToolTabComponent], - imports: [FormsModule, CustomMaterialModule, RefreshAlertModule], - providers: [ - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ToolTabComponent], + imports: [FormsModule, CustomMaterialModule, RefreshAlertModule], + providers: [ + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ToolTabComponent); diff --git a/src/app/workflow/versions/versions.component.spec.ts b/src/app/workflow/versions/versions.component.spec.ts index c24375921d..0d02d82d36 100644 --- a/src/app/workflow/versions/versions.component.spec.ts +++ b/src/app/workflow/versions/versions.component.spec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Component, Input } from '@angular/core'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -67,30 +67,32 @@ class MockVersionModalComponent { describe('VersionsWorkflowComponent', () => { let component: VersionsWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [CustomMaterialModule, FormsModule, FontAwesomeModule, BrowserAnimationsModule], - declarations: [ - VersionsWorkflowComponent, - OrderBy, - CommitUrlPipe, - VerifiedPlatformsPipe, - MockViewWorkflowComponent, - MockVersionModalComponent, - ], - providers: [ - DockstoreService, - { provide: DateService, useClass: DateStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - AlertQuery, - ProviderService, - WorkflowQuery, - { provide: ImageProviderService, useClass: ImageProviderStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CustomMaterialModule, FormsModule, FontAwesomeModule, BrowserAnimationsModule], + declarations: [ + VersionsWorkflowComponent, + OrderBy, + CommitUrlPipe, + VerifiedPlatformsPipe, + MockViewWorkflowComponent, + MockVersionModalComponent, + ], + providers: [ + DockstoreService, + { provide: DateService, useClass: DateStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + AlertQuery, + ProviderService, + WorkflowQuery, + { provide: ImageProviderService, useClass: ImageProviderStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(VersionsWorkflowComponent); diff --git a/src/app/workflow/view/view.component.spec.ts b/src/app/workflow/view/view.component.spec.ts index 425d14749f..d38b580aa5 100644 --- a/src/app/workflow/view/view.component.spec.ts +++ b/src/app/workflow/view/view.component.spec.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { AccountsService } from 'app/loginComponents/accounts/external/accounts.service'; import { CustomMaterialModule } from 'app/shared/modules/material.module'; import { RefreshService } from 'app/shared/refresh.service'; @@ -39,22 +39,24 @@ describe('ViewWorkflowComponent', () => { let component: ViewWorkflowComponent; let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [CustomMaterialModule], - declarations: [ViewWorkflowComponent], - providers: [ - { provide: ViewService }, - { provide: AccountsService, useClass: AccountsStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: VersionModalService, useClass: VersionModalStubService }, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - { provide: DateService, useClass: DateStubService }, - { provide: HostedService, useClass: HostedStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CustomMaterialModule], + declarations: [ViewWorkflowComponent], + providers: [ + { provide: ViewService }, + { provide: AccountsService, useClass: AccountsStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: VersionModalService, useClass: VersionModalStubService }, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + { provide: DateService, useClass: DateStubService }, + { provide: HostedService, useClass: HostedStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(ViewWorkflowComponent); diff --git a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts index 3d9ded500b..975524f4da 100644 --- a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts +++ b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts @@ -1,5 +1,5 @@ import { HttpClientModule } from '@angular/common/http'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -28,39 +28,41 @@ describe('WorkflowFileEditorComponent', () => { let component: WorkflowFileEditorComponent; let fixture: ComponentFixture; class FileStubService {} - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - WorkflowFileEditorComponent, - CodeEditorListComponent, - CodeEditorComponent, - PublicFileDownloadPipe, - PrivateFileDownloadPipe, - PrivateFilePathPipe, - ], - imports: [ - MatButtonModule, - MatTabsModule, - MatToolbarModule, - MatIconModule, - MatInputModule, - MatFormFieldModule, - MatTooltipModule, - ClipboardModule, - MatSnackBarModule, - MatCardModule, - BrowserAnimationsModule, - HttpClientModule, - ], - providers: [ - { provide: HostedService, useClass: HostedStubService }, - { provide: WorkflowService, useClass: WorkflowStubService }, - { provide: WorkflowsService, useClass: WorkflowsStubService }, - { provide: RefreshService, useClass: RefreshStubService }, - { provide: FileService, useClass: FileStubService }, - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + WorkflowFileEditorComponent, + CodeEditorListComponent, + CodeEditorComponent, + PublicFileDownloadPipe, + PrivateFileDownloadPipe, + PrivateFilePathPipe, + ], + imports: [ + MatButtonModule, + MatTabsModule, + MatToolbarModule, + MatIconModule, + MatInputModule, + MatFormFieldModule, + MatTooltipModule, + ClipboardModule, + MatSnackBarModule, + MatCardModule, + BrowserAnimationsModule, + HttpClientModule, + ], + providers: [ + { provide: HostedService, useClass: HostedStubService }, + { provide: WorkflowService, useClass: WorkflowStubService }, + { provide: WorkflowsService, useClass: WorkflowsStubService }, + { provide: RefreshService, useClass: RefreshStubService }, + { provide: FileService, useClass: FileStubService }, + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(WorkflowFileEditorComponent); diff --git a/tsconfig.json b/tsconfig.json index 54804b04fa..514f905759 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,14 +2,14 @@ "compileOnSave": false, "compilerOptions": { "downlevelIteration": true, - "module": "esnext", + "module": "es2020", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, - "target": "es5", + "target": "es2018", "typeRoots": [ "node_modules/@types" ], diff --git a/tslint.json b/tslint.json index fbc33d8f7e..8441262f98 100644 --- a/tslint.json +++ b/tslint.json @@ -4,19 +4,13 @@ "tslint-config-prettier" ], "rulesDirectory": [ - "node_modules/codelyzer", - "node_modules/rxjs-tslint" + "node_modules/codelyzer" ], "rules": { "ordered-imports": true, "arrow-return-shorthand": true, "callable-types": true, "class-name": true, - "no-unused-variable": true, - "rxjs-proper-imports": true, - "rxjs-no-static-observable-methods": true, - "rxjs-pipeable-operators-only": true, - "rxjs-collapse-imports": true, "comment-format": [ true, "check-space" From ba2624079743974447513dd95f28dd380cb459f0 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Tue, 22 Dec 2020 11:29:31 -0500 Subject: [PATCH 011/119] Set user to be initially undefined (#880) --- src/app/home-page/home-page.component.html | 2 +- src/app/shared/user/user.store.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index e40de2a28d..8d90f4decc 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/shared/user/user.store.ts b/src/app/shared/user/user.store.ts index 52b5c14f77..cff2799265 100644 --- a/src/app/shared/user/user.store.ts +++ b/src/app/shared/user/user.store.ts @@ -9,7 +9,7 @@ export interface UserState { export function createInitialState(): UserState { return { - user: null, + user: undefined, extendedUserData: null, }; } From ec8ef9efce43f6cc8365e8bed5770a6235d93df4 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Mon, 4 Jan 2021 13:13:09 -0500 Subject: [PATCH 012/119] Limit memory usage (#1125) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5429b3b16c..5b7522fe6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -224,7 +224,7 @@ jobs: command: bash -i -c 'npm config set dockstore-ui2:webservice_version develop' - run: name: Build - command: bash -i -c 'npm run build' + command: NODE_OPTIONS="--max-old-space-size=1610" bash -i -c 'npm run build.prod' workflows: version: 2 From 49a8eddbcb3e4ef2aeb348a9df8a331549ecd41d Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Mon, 4 Jan 2021 14:10:19 -0500 Subject: [PATCH 013/119] Feature/seab 2108/bodybuilder update (#1126) * npm i bodybuilder@latest * Remove elasticsearch-browser * Use Docktore endpoint --- package-lock.json | 11 +-- package.json | 3 +- src/app/search/elastic-search-client.ts | 25 ------ .../search-results.component.spec.ts | 8 +- .../search-results.component.ts | 26 +++--- src/app/search/search.component.spec.ts | 4 +- src/app/search/search.component.ts | 84 ++++++++----------- src/app/search/state/search.service.ts | 31 ++++--- src/app/test/service-stubs.ts | 8 +- 9 files changed, 84 insertions(+), 116 deletions(-) delete mode 100644 src/app/search/elastic-search-client.ts diff --git a/package-lock.json b/package-lock.json index 5491d2bde8..e069899659 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6172,9 +6172,9 @@ } }, "bodybuilder": { - "version": "2.2.17", - "resolved": "https://registry.npmjs.org/bodybuilder/-/bodybuilder-2.2.17.tgz", - "integrity": "sha512-k6em1H73zJS7LtCdcYB/88U8OIV0Z7eDh6SWBn3r7kZ/tw+hI58cK+6w6mnpCvGUcMrIDd0skf+z2bgLkx/Uug==", + "version": "2.2.25", + "resolved": "https://registry.npmjs.org/bodybuilder/-/bodybuilder-2.2.25.tgz", + "integrity": "sha512-sxnSA/lv/JapTBYChp8uTfMrlkuHMv6lxK1Z2VcTaNsmIqwguKTqVbpSF21rP5KNp8LN8sG8ABtMd3ixalgKaA==", "requires": { "lodash": "^4.17.11" } @@ -8780,11 +8780,6 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "elasticsearch-browser": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/elasticsearch-browser/-/elasticsearch-browser-15.0.0.tgz", - "integrity": "sha1-EtjJtrljpuLte6qU+RJX849S0Lw=" - }, "electron-to-chromium": { "version": "1.3.263", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.263.tgz", diff --git a/package.json b/package.json index fed23b3ae4..b896e821bc 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@ngx-lite/json-ld": "^0.6.2", "ace-builds": "^1.4.6", "angular-tag-cloud-module": "^5.2.0", - "bodybuilder": "^2.2.17", + "bodybuilder": "^2.2.25", "bootstrap": "^3.4.1", "bootstrap-social": "^5.1.1", "core-js": "^3.2.1", @@ -59,7 +59,6 @@ "cytoscape-dagre": "^2.2.2", "cytoscape-popper": "^1.0.4", "dompurify": "^2.2.0", - "elasticsearch-browser": "^15.0.0", "font-awesome": "^4.7.0", "jquery": "^3.5.1", "material-design-icons-iconfont": "^6.1.0", diff --git a/src/app/search/elastic-search-client.ts b/src/app/search/elastic-search-client.ts deleted file mode 100644 index e3b1d0869b..0000000000 --- a/src/app/search/elastic-search-client.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2017 OICR - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { Client } from 'elasticsearch-browser'; - -import { ga4ghExtendedPath } from './../shared/constants'; -import { Dockstore } from './../shared/dockstore.model'; - -export const ELASTIC_SEARCH_CLIENT = new Client({ - host: Dockstore.API_URI + ga4ghExtendedPath, - apiVersion: '5.6', - log: 'warning', -}); diff --git a/src/app/search/search-results/search-results.component.spec.ts b/src/app/search/search-results/search-results.component.spec.ts index 5fc0b149a1..cc2bb6f275 100644 --- a/src/app/search/search-results/search-results.component.spec.ts +++ b/src/app/search/search-results/search-results.component.spec.ts @@ -15,14 +15,13 @@ */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TagCloudModule } from 'angular-tag-cloud-module'; -import { QueryBuilderStubService, SearchStubService } from './../../test/service-stubs'; +import { ExtendedGA4GHStubService, QueryBuilderStubService, SearchStubService } from './../../test/service-stubs'; import { QueryBuilderService } from './../query-builder.service'; import { RouterTestingModule } from '@angular/router/testing'; +import { ExtendedGA4GHService } from 'app/shared/openapi'; import { SearchService } from '../state/search.service'; import { SearchResultsComponent } from './search-results.component'; @@ -39,6 +38,7 @@ describe('SearchResultsComponent', () => { providers: [ { provide: SearchService, useClass: SearchStubService }, { provide: QueryBuilderService, useClass: QueryBuilderStubService }, + { provide: ExtendedGA4GHService, useClass: ExtendedGA4GHStubService }, ], }).compileComponents(); }) diff --git a/src/app/search/search-results/search-results.component.ts b/src/app/search/search-results/search-results.component.ts index efc300f708..de9b760725 100644 --- a/src/app/search/search-results/search-results.component.ts +++ b/src/app/search/search-results/search-results.component.ts @@ -15,10 +15,10 @@ */ import { Component, OnInit } from '@angular/core'; import { CloudData, CloudOptions } from 'angular-tag-cloud-module'; +import { ExtendedGA4GHService } from 'app/shared/openapi'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Base } from '../../shared/base'; -import { ELASTIC_SEARCH_CLIENT } from '../elastic-search-client'; import { QueryBuilderService } from '../query-builder.service'; import { SearchQuery } from '../state/search.query'; import { SearchService } from '../state/search.service'; @@ -43,7 +43,12 @@ export class SearchResultsComponent extends Base implements OnInit { overflow: false, }; - constructor(private searchService: SearchService, private queryBuilderService: QueryBuilderService, private searchQuery: SearchQuery) { + constructor( + private searchService: SearchService, + private queryBuilderService: QueryBuilderService, + private searchQuery: SearchQuery, + private extendedGA4GHService: ExtendedGA4GHService + ) { super(); this.activeToolTab$ = this.searchQuery.activeToolTab$; this.noWorkflowHits$ = this.searchQuery.noWorkflowHits$; @@ -71,13 +76,9 @@ export class SearchResultsComponent extends Base implements OnInit { this.searchService.setShowTagCloud(type); } - createToolTagCloud(toolQuery, type) { - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: toolQuery, - }) - .then((hits) => { + createToolTagCloud(toolQuery: string, type) { + this.extendedGA4GHService.toolsIndexSearch(toolQuery).subscribe( + (hits: any) => { let weight = 10; let count = 0; if (hits && hits.aggregations && hits.aggregations.tagcloud) { @@ -107,8 +108,11 @@ export class SearchResultsComponent extends Base implements OnInit { count--; }); } - }) - .catch((error) => console.log(error)); + }, + (error) => { + console.log(error); + } + ); } // Tells the search service to tell the search filters to save its data diff --git a/src/app/search/search.component.spec.ts b/src/app/search/search.component.spec.ts index 6291c40b74..11a66c0152 100644 --- a/src/app/search/search.component.spec.ts +++ b/src/app/search/search.component.spec.ts @@ -18,11 +18,12 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { MdePopoverModule } from '@material-extended/mde'; +import { ExtendedGA4GHService } from 'app/shared/openapi'; import { ClipboardModule } from 'ngx-clipboard'; import { of } from 'rxjs'; import { CustomMaterialModule } from '../shared/modules/material.module'; import { ProviderService } from '../shared/provider.service'; -import { ProviderStubService, QueryBuilderStubService, SearchStubService } from './../test/service-stubs'; +import { ExtendedGA4GHStubService, ProviderStubService, QueryBuilderStubService, SearchStubService } from './../test/service-stubs'; import { MapFriendlyValuesPipe } from './map-friendly-values.pipe'; import { QueryBuilderService } from './query-builder.service'; import { SearchComponent } from './search.component'; @@ -62,6 +63,7 @@ describe('SearchComponent', () => { { provide: SearchService, useClass: SearchStubService }, { provide: QueryBuilderService, useClass: QueryBuilderStubService }, { provide: ProviderService, useClass: ProviderStubService }, + { provide: ExtendedGA4GHService, useClass: ExtendedGA4GHStubService }, { provide: SearchQuery, useValue: jasmine.createSpyObj('SearchQuery', ['select', 'getValue', 'searchText']) }, ], }).compileComponents(); diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts index d1568fae92..71f37a4cce 100644 --- a/src/app/search/search.component.ts +++ b/src/app/search/search.component.ts @@ -17,6 +17,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { MatAccordion } from '@angular/material/expansion'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { faSortAlphaDown, faSortAlphaUp, faSortNumericDown, faSortNumericUp } from '@fortawesome/free-solid-svg-icons'; +import { ExtendedGA4GHService } from 'app/shared/openapi'; import { SearchResponse } from 'elasticsearch'; import { forkJoin, Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators'; @@ -25,7 +26,6 @@ import { AdvancedSearchObject, initialAdvancedSearchObject } from '../shared/mod import { CategorySort } from '../shared/models/CategorySort'; import { SubBucket } from '../shared/models/SubBucket'; import { AdvancedSearchQuery } from './advancedsearch/state/advanced-search.query'; -import { ELASTIC_SEARCH_CLIENT } from './elastic-search-client'; import { QueryBuilderService } from './query-builder.service'; import { SearchQuery } from './state/search.query'; import { Hit, SearchService } from './state/search.service'; @@ -123,7 +123,8 @@ export class SearchComponent implements OnInit, OnDestroy { public searchService: SearchService, private searchQuery: SearchQuery, private advancedSearchQuery: AdvancedSearchQuery, - private activatedRoute: ActivatedRoute + private activatedRoute: ActivatedRoute, + private extendedGA4GHService: ExtendedGA4GHService ) { this.shortUrl$ = this.searchQuery.shortUrl$; this.filterKeys$ = this.searchQuery.filterKeys$; @@ -389,16 +390,15 @@ export class SearchComponent implements OnInit, OnDestroy { } updateSideBar(value: string) { - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: value, - }) - .then((hits) => { + this.extendedGA4GHService.toolsIndexSearch(value).subscribe( + (hits: any) => { this.setupAllBuckets(hits); this.setupOrderBuckets(); - }) - .catch((error) => console.log(error)); + }, + (error) => { + console.log(error); + } + ); } /** @@ -408,12 +408,8 @@ export class SearchComponent implements OnInit, OnDestroy { * @memberof SearchComponent */ updateResultsTable(value: string) { - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: value, - }) - .then((hits) => { + this.extendedGA4GHService.toolsIndexSearch(value).subscribe( + (hits: any) => { this.hits = hits.hits.hits; const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); const searchText = this.searchQuery.getValue().searchText; @@ -424,8 +420,9 @@ export class SearchComponent implements OnInit, OnDestroy { if (this.searchTerm && this.hits.length === 0) { this.searchService.suggestSearchTerm(searchText); } - }) - .catch((error) => console.log(error)); + }, + (error) => console.log(error) + ); } /** @@ -438,18 +435,9 @@ export class SearchComponent implements OnInit, OnDestroy { * @memberof SearchComponent */ updateResultsTableSeparately(toolsQuery: string, workflowsQuery: string) { - const tools = ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: toolsQuery, - }).catch((error) => console.log(error)); - const workflows = ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: workflowsQuery, - }).catch((error) => console.log(error)); - - forkJoin([tools, workflows]).subscribe((results: Array) => { + const toolsObservable: Observable = this.extendedGA4GHService.toolsIndexSearch(toolsQuery); + const workflowsObservable: Observable = this.extendedGA4GHService.toolsIndexSearch(workflowsQuery); + forkJoin([toolsObservable, workflowsObservable]).subscribe((results: Array) => { const toolHits = results[0].hits.hits; const workflowHits = results[1].hits.hits; this.hits = toolHits.concat(workflowHits); @@ -481,29 +469,29 @@ export class SearchComponent implements OnInit, OnDestroy { onKey(searchText: string) { /*TODO: FOR DEMO USE, make this better later...*/ const pattern = searchText + '.*'; - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: { - size: 0, - aggs: { - autocomplete: { - terms: { - field: 'description', - size: 4, - order: { - _count: 'desc', - }, - include: pattern, + const body = { + size: 0, + aggs: { + autocomplete: { + terms: { + field: 'description', + size: 4, + order: { + _count: 'desc', }, + include: pattern, }, }, }, - }) - .then((hits) => { + }; + this.extendedGA4GHService.toolsIndexSearch(JSON.stringify(body)).subscribe( + (hits) => { this.searchService.setAutoCompleteTerms(hits); - }) - .catch((error) => console.log(error)); + }, + (error) => { + console.log(error); + } + ); this.searchTerm = true; if (!searchText || 0 === searchText.length) { this.searchTerm = false; diff --git a/src/app/search/state/search.service.ts b/src/app/search/state/search.service.ts index 96ff93d0db..d2d0dde8d4 100644 --- a/src/app/search/state/search.service.ts +++ b/src/app/search/state/search.service.ts @@ -24,9 +24,9 @@ import { BehaviorSubject } from 'rxjs'; import { Dockstore } from '../../shared/dockstore.model'; import { ImageProviderService } from '../../shared/image-provider.service'; import { SubBucket } from '../../shared/models/SubBucket'; +import { ExtendedGA4GHService } from '../../shared/openapi/api/extendedGA4GH.service'; import { ProviderService } from '../../shared/provider.service'; import { DockstoreTool, Workflow } from '../../shared/swagger'; -import { ELASTIC_SEARCH_CLIENT } from '../elastic-search-client'; import { SearchQuery } from './search.query'; import { SearchStore } from './search.store'; @@ -75,7 +75,8 @@ export class SearchService { private searchQuery: SearchQuery, private providerService: ProviderService, private router: Router, - private imageProviderService: ImageProviderService + private imageProviderService: ImageProviderService, + private extendedGA4GHService: ExtendedGA4GHService ) {} /** @@ -235,29 +236,27 @@ export class SearchService { } suggestSearchTerm(searchText: string) { - ELASTIC_SEARCH_CLIENT.search({ - index: 'tools', - type: 'entry', - body: { - suggest: { - do_you_mean: { - text: searchText, - term: { - field: 'description', - }, + const body = { + suggest: { + do_you_mean: { + prefix: searchText, + term: { + field: 'description', }, }, }, - }) - .then((hits) => { + }; + this.extendedGA4GHService.toolsIndexSearch(JSON.stringify(body)).subscribe( + (hits) => { const suggestions: Array = hits['suggest']['do_you_mean'][0].options; if (suggestions.length > 0) { this.setSuggestTerm(suggestions[0].text); } else { this.setSuggestTerm(''); } - }) - .catch((error) => console.log(error)); + }, + (error) => console.log(error) + ); } setSuggestTerm(suggestTerm: string) { diff --git a/src/app/test/service-stubs.ts b/src/app/test/service-stubs.ts index ab1af5906b..40bfbe1b77 100644 --- a/src/app/test/service-stubs.ts +++ b/src/app/test/service-stubs.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { EntryType } from 'app/shared/enum/entry-type'; -import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; +import { BehaviorSubject, EMPTY, Observable, of as observableOf } from 'rxjs'; import { SearchFields } from '../search/state/search.service'; import { TagEditorMode } from '../shared/enum/tagEditorMode.enum'; import { Dockstore } from './../shared/dockstore.model'; @@ -133,6 +133,12 @@ export class GA4GHStubService { } } +export class ExtendedGA4GHStubService { + toolsIndexSearch(): Observable { + return EMPTY; + } +} + export class GA4GHV20StubService {} export class SearchStubService { From c267fd52e183d105c5cf3250166a6d8409cc594d Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Thu, 7 Jan 2021 14:02:55 -0500 Subject: [PATCH 014/119] Update README.md (#1128) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c8fc07e55..23a2cf7342 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/dockstore/dockstore-ui2.svg?branch=develop)](https://travis-ci.org/dockstore/dockstore-ui2) [![codecov](https://codecov.io/gh/dockstore/dockstore-ui2/branch/develop/graph/badge.svg)](https://codecov.io/gh/dockstore/dockstore-ui2) -Please file issues for this repository and Web site at [the ga4gh/dockstore repository](https://github.com/ga4gh/dockstore/issues)! +Please file issues for this repository and Web site at [the dockstore/dockstore repository](https://github.com/dockstore/dockstore/issues)! Table of Contents ================= From df3f26eb7bb771600841d7e16cf813552375b18d Mon Sep 17 00:00:00 2001 From: Gregory F J Hogue Date: Thu, 14 Jan 2021 13:47:42 -0500 Subject: [PATCH 015/119] Have sample code when creating new descriptor files for hosted tool/workflow (#1129) * initialize hosted CWL/WDL/NF descriptors with sample code * try fixing TS lint issue * only select-all for sample code * add http to test * use sample code from our docs; different CWL code for Tool/Workflow * proper entityType type; fix non-editing cursor pos; event should catch initial state * try adding small delay for sample code to load * use HttpClientTestingModule for test * nextflow in comment * change "helloworld" names --- cypress/integration/group1/hostedWorkflows.ts | 1 + .../code-editor-list.component.html | 7 ++- .../code-editor/code-editor.component.spec.ts | 2 + .../code-editor/code-editor.component.ts | 47 +++++++++++++--- src/assets/text/nextflow.config | 15 +++++ src/assets/text/sample-tool.cwl | 54 ++++++++++++++++++ src/assets/text/sample-workflow.cwl | 56 +++++++++++++++++++ src/assets/text/sample.nf | 16 ++++++ src/assets/text/sample.wdl | 35 ++++++++++++ 9 files changed, 225 insertions(+), 8 deletions(-) create mode 100644 src/assets/text/nextflow.config create mode 100644 src/assets/text/sample-tool.cwl create mode 100644 src/assets/text/sample-workflow.cwl create mode 100644 src/assets/text/sample.nf create mode 100644 src/assets/text/sample.wdl diff --git a/cypress/integration/group1/hostedWorkflows.ts b/cypress/integration/group1/hostedWorkflows.ts index 6e78fe0d60..2a52db423e 100644 --- a/cypress/integration/group1/hostedWorkflows.ts +++ b/cypress/integration/group1/hostedWorkflows.ts @@ -59,6 +59,7 @@ describe('Dockstore hosted workflows', () => { goToTab('Files'); cy.get('#editFilesButton').click(); cy.contains('Add File').click(); + cy.wait(100); cy.window().then(function (window: any) { cy.document().then((doc) => { const editors = doc.getElementsByClassName('ace_editor'); diff --git a/src/app/shared/code-editor-list/code-editor-list.component.html b/src/app/shared/code-editor-list/code-editor-list.component.html index b556c187ee..4825d66aa4 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.html +++ b/src/app/shared/code-editor-list/code-editor-list.component.html @@ -71,7 +71,12 @@ - +
diff --git a/src/app/container/dockerfile/dockerfile.component.html b/src/app/container/dockerfile/dockerfile.component.html index 1a1d6e8b27..66a7828759 100644 --- a/src/app/container/dockerfile/dockerfile.component.html +++ b/src/app/container/dockerfile/dockerfile.component.html @@ -44,7 +44,7 @@ > save_alt - diff --git a/src/app/container/info-tab/info-tab.component.html b/src/app/container/info-tab/info-tab.component.html index f9bb3ad4e8..e4b80eb36e 100644 --- a/src/app/container/info-tab/info-tab.component.html +++ b/src/app/container/info-tab/info-tab.component.html @@ -51,7 +51,7 @@ {{ tool?.tool_path }} - @@ -60,7 +60,7 @@ {{ tool?.tool_path }} - diff --git a/src/app/container/paramfiles/paramfiles.component.html b/src/app/container/paramfiles/paramfiles.component.html index 9a47d83eb9..5859c573bd 100644 --- a/src/app/container/paramfiles/paramfiles.component.html +++ b/src/app/container/paramfiles/paramfiles.component.html @@ -82,7 +82,7 @@ save_alt - diff --git a/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts b/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts index de8a523ba0..8049d816c0 100644 --- a/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts +++ b/src/app/container/tool-file-editor/tool-file-editor.component.spec.ts @@ -1,6 +1,7 @@ import { HttpClientModule } from '@angular/common/http'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ClipboardModule } from '@angular/cdk/clipboard'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -12,7 +13,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ClipboardModule } from 'ngx-clipboard'; + import { WorkflowService } from '../../shared/state/workflow.service'; import { CodeEditorListComponent } from './../../shared/code-editor-list/code-editor-list.component'; import { CodeEditorComponent } from './../../shared/code-editor/code-editor.component'; diff --git a/src/app/container/version-modal/version-modal.component.html b/src/app/container/version-modal/version-modal.component.html index 11d3617609..eb96fa0fe8 100644 --- a/src/app/container/version-modal/version-modal.component.html +++ b/src/app/container/version-modal/version-modal.component.html @@ -393,7 +393,7 @@

{{ TagEditorMode[mode] }} Version Tag

disabled /> - diff --git a/src/app/container/version-modal/version-modal.component.spec.ts b/src/app/container/version-modal/version-modal.component.spec.ts index b5ae0b9ae8..0795aeb3e8 100644 --- a/src/app/container/version-modal/version-modal.component.spec.ts +++ b/src/app/container/version-modal/version-modal.component.spec.ts @@ -1,7 +1,7 @@ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { ClipboardModule } from 'ngx-clipboard'; import { MatDialogModule } from '@angular/material/dialog'; import { MatSnackBarModule } from '@angular/material/snack-bar'; diff --git a/src/app/entry/entry-file-tab/entry-file-tab.component.html b/src/app/entry/entry-file-tab/entry-file-tab.component.html index a1f7658b70..ba82cb89a4 100644 --- a/src/app/entry/entry-file-tab/entry-file-tab.component.html +++ b/src/app/entry/entry-file-tab/entry-file-tab.component.html @@ -48,7 +48,7 @@ save_alt - diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 30e892e690..006e792a48 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -85,7 +85,7 @@
    • diff --git a/src/app/loginComponents/accounts/external/accounts.component.html b/src/app/loginComponents/accounts/external/accounts.component.html index eb2fc69a34..352e64185c 100644 --- a/src/app/loginComponents/accounts/external/accounts.component.html +++ b/src/app/loginComponents/accounts/external/accounts.component.html @@ -35,8 +35,7 @@

    Dockstore Account

    diff --git a/src/app/shared/code-editor-list/code-editor-list.component.spec.ts b/src/app/shared/code-editor-list/code-editor-list.component.spec.ts index 38093f2be8..7041e068fc 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.spec.ts +++ b/src/app/shared/code-editor-list/code-editor-list.component.spec.ts @@ -1,5 +1,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ClipboardModule } from '@angular/cdk/clipboard'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -8,7 +9,7 @@ import { MatInputModule } from '@angular/material/input'; import { MatTabsModule } from '@angular/material/tabs'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { ClipboardModule } from 'ngx-clipboard'; + import { WorkflowService } from '../state/workflow.service'; import { PrivateFileDownloadPipe } from './../../shared/entry/private-file-download.pipe'; import { PrivateFilePathPipe } from './../../shared/entry/private-file-path.pipe'; diff --git a/src/app/shared/entry/entry.module.ts b/src/app/shared/entry/entry.module.ts index 5d5842dd26..598a764829 100644 --- a/src/app/shared/entry/entry.module.ts +++ b/src/app/shared/entry/entry.module.ts @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { NgxJsonLdModule } from '@ngx-lite/json-ld'; -import { ClipboardModule } from 'ngx-clipboard'; + import { ShareButtonsModule } from 'ngx-sharebuttons/buttons'; import { ShareIconsModule } from 'ngx-sharebuttons/icons'; import { RefreshAlertModule } from '../alert/alert.module'; diff --git a/src/app/shared/modules/container.module.ts b/src/app/shared/modules/container.module.ts index de81b2efef..b2e5543137 100644 --- a/src/app/shared/modules/container.module.ts +++ b/src/app/shared/modules/container.module.ts @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule } from '@angular/forms'; -import { ClipboardModule } from 'ngx-clipboard'; + import { MarkdownModule } from 'ngx-markdown'; import { ContainerComponent } from '../../container/container.component'; import { DescriptorsComponent } from '../../container/descriptors/descriptors.component'; diff --git a/src/app/shared/modules/list-containers.module.ts b/src/app/shared/modules/list-containers.module.ts index 0415552647..fd13cf9fad 100644 --- a/src/app/shared/modules/list-containers.module.ts +++ b/src/app/shared/modules/list-containers.module.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { ClipboardModule } from 'ngx-clipboard'; + import { ListContainersComponent } from '../../containers/list/list.component'; import { ListContainersService } from '../../containers/list/list.service'; import { PublishedToolsDataSource } from '../../containers/list/published-tools.datasource'; diff --git a/src/app/shared/modules/workflow.module.ts b/src/app/shared/modules/workflow.module.ts index e066ad2c31..8819953dfa 100644 --- a/src/app/shared/modules/workflow.module.ts +++ b/src/app/shared/modules/workflow.module.ts @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule } from '@angular/forms'; import { EntryFileTabComponent } from 'app/entry/entry-file-tab/entry-file-tab.component'; -import { ClipboardModule } from 'ngx-clipboard'; + import { MarkdownModule } from 'ngx-markdown'; import { ParamfilesService } from '../../container/paramfiles/paramfiles.service'; import { CurrentCollectionsModule } from '../../entry/current-collections.module'; diff --git a/src/app/source-file-tabs/source-file-tabs.component.html b/src/app/source-file-tabs/source-file-tabs.component.html index 46a4028d84..5dc535bf84 100644 --- a/src/app/source-file-tabs/source-file-tabs.component.html +++ b/src/app/source-file-tabs/source-file-tabs.component.html @@ -41,7 +41,7 @@ > save_alt - diff --git a/src/app/workflow/descriptors/descriptors.component.html b/src/app/workflow/descriptors/descriptors.component.html index fa73db3d66..d9abfc3973 100644 --- a/src/app/workflow/descriptors/descriptors.component.html +++ b/src/app/workflow/descriptors/descriptors.component.html @@ -56,7 +56,7 @@ save_alt - diff --git a/src/app/workflow/info-tab/info-tab.component.html b/src/app/workflow/info-tab/info-tab.component.html index bceba16977..aff61cf010 100644 --- a/src/app/workflow/info-tab/info-tab.component.html +++ b/src/app/workflow/info-tab/info-tab.component.html @@ -54,7 +54,7 @@
  • TRS: #{{ entryType$ | async }}/{{ workflow?.full_workflow_path }} -
    • diff --git a/src/app/workflow/paramfiles/paramfiles.component.html b/src/app/workflow/paramfiles/paramfiles.component.html index 007bbbd3a9..0b2a84fa68 100644 --- a/src/app/workflow/paramfiles/paramfiles.component.html +++ b/src/app/workflow/paramfiles/paramfiles.component.html @@ -64,7 +64,7 @@ save_alt - diff --git a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts index 975524f4da..2bf7bdbe75 100644 --- a/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts +++ b/src/app/workflow/workflow-file-editor/workflow-file-editor.component.spec.ts @@ -1,3 +1,4 @@ +import { ClipboardModule } from '@angular/cdk/clipboard'; import { HttpClientModule } from '@angular/common/http'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatButtonModule } from '@angular/material/button'; @@ -10,7 +11,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ClipboardModule } from 'ngx-clipboard'; + import { WorkflowService } from '../../shared/state/workflow.service'; import { CodeEditorListComponent } from './../../shared/code-editor-list/code-editor-list.component'; import { CodeEditorComponent } from './../../shared/code-editor/code-editor.component'; From 13b3c457e2f7da238e4149b4e36701e03ce85ea4 Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 28 Jan 2021 13:52:19 -0500 Subject: [PATCH 019/119] language labels display styling (#1138) * language labels display styling * typo fixed * cypress added wait 5 seconds * Update checkerWorkflowFromTools.ts * cy.wait(250) --- cypress/integration/group1/checkerWorkflowFromTools.ts | 2 ++ .../search-tool-table/search-tool-table.component.html | 2 +- .../search-workflow-table.component.html | 2 +- src/styles.scss | 7 +++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cypress/integration/group1/checkerWorkflowFromTools.ts b/cypress/integration/group1/checkerWorkflowFromTools.ts index 87aba7e404..4791e7330a 100644 --- a/cypress/integration/group1/checkerWorkflowFromTools.ts +++ b/cypress/integration/group1/checkerWorkflowFromTools.ts @@ -99,6 +99,7 @@ describe('Checker workflow test from my-tools', () => { // cy.url().should('eq','/my-tools/quay.io/A2/b3') cy.get('#publishToolButton').should('be.visible').should('contain', 'Unpublish').click(); cy.get('#publishToolButton').should('be.visible').should('contain', 'Publish'); + cy.wait(250); cy.get('#viewCheckerWorkflowButton').should('be.visible').click(); // In the checker workflow right now @@ -112,6 +113,7 @@ describe('Checker workflow test from my-tools', () => { cy.url().should('eq', Cypress.config().baseUrl + '/my-tools/quay.io/A2/b3'); cy.get('#publishToolButton').should('be.visible').should('contain', 'Publish').click(); cy.get('#publishToolButton').should('be.visible').should('contain', 'Unpublish'); + cy.wait(250); cy.get('#viewCheckerWorkflowButton').should('be.visible').click(); // in the checker workflow right now diff --git a/src/app/search/search-tool-table/search-tool-table.component.html b/src/app/search/search-tool-table/search-tool-table.component.html index 55bc02fcb7..6a3f4e8ce0 100644 --- a/src/app/search/search-tool-table/search-tool-table.component.html +++ b/src/app/search/search-tool-table/search-tool-table.component.html @@ -51,7 +51,7 @@ Format - +
    {{ language ? (language.toString() | uppercase) : '' }} diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.html b/src/app/search/search-workflow-table/search-workflow-table.component.html index d944a475e9..0959247d3f 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.html +++ b/src/app/search/search-workflow-table/search-workflow-table.component.html @@ -42,7 +42,7 @@ Project Links - + diff --git a/src/styles.scss b/src/styles.scss index 7bcd7efdb1..1abd2b481a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1273,6 +1273,7 @@ mat-tab-group.no-pagination { // Styling from design mockups // These badges are not clickable, thus different from Material Design Chips .nonclick-badge { + display: inline-flex; border-radius: 8px; background-color: #dfe0e2; padding: 5px 8px; @@ -1280,3 +1281,9 @@ mat-tab-group.no-pagination { font-size: 1.3rem; font-weight: 500; } + +@media only screen and (max-width: 1200px) { + .align-languages { + flex-direction: column; + } +} From 5bf0eefa2117b1c781b3ea0c4ea9bdeea7d98e67 Mon Sep 17 00:00:00 2001 From: Gregory F J Hogue Date: Thu, 28 Jan 2021 14:06:56 -0500 Subject: [PATCH 020/119] Fix sample descriptor code URLs for CDN path substitution (#1139) --- src/app/shared/code-editor/code-editor.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/shared/code-editor/code-editor.component.ts b/src/app/shared/code-editor/code-editor.component.ts index 0d4b5649a2..76daf9b0e0 100644 --- a/src/app/shared/code-editor/code-editor.component.ts +++ b/src/app/shared/code-editor/code-editor.component.ts @@ -80,16 +80,16 @@ export class CodeEditorComponent implements AfterViewInit { if (!this.editorContent) { if (this.mode === 'cwl') { if (this.entryType === 'tool') { - sampleCodeUrl = 'assets/text/sample-tool.cwl'; + sampleCodeUrl = '../assets/text/sample-tool.cwl'; } else if (this.entryType === 'workflow') { - sampleCodeUrl = 'assets/text/sample-workflow.cwl'; + sampleCodeUrl = '../assets/text/sample-workflow.cwl'; } } else if (this.mode === 'wdl') { - sampleCodeUrl = 'assets/text/sample.wdl'; + sampleCodeUrl = '../assets/text/sample.wdl'; } else if (this.mode === 'nfl') { - sampleCodeUrl = 'assets/text/sample.nf'; + sampleCodeUrl = '../assets/text/sample.nf'; } else if (this.editorFilepath === '/nextflow.config') { - sampleCodeUrl = 'assets/text/nextflow.config'; + sampleCodeUrl = '../assets/text/nextflow.config'; } } if (sampleCodeUrl) { From 45bac73d1f0f17a7ab039aa98cc1f9ca4bbcbd1d Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 28 Jan 2021 17:53:14 -0500 Subject: [PATCH 021/119] Feature/3942/private tool status bar text (#1134) * Fixed private tool "Request Access" status bar text. Used observable to pass data from containter.component.ts to email.service.ts Added one more parameter to two functions in email.service.ts * Async pipe for displaying and passing registry name(imgProvider) string And also made some private functions static * Cleaned up some code * Cleaned up some functions' parameters * spec file modification * Update getRequestEmailBody * Update email.service.spec.ts * getRequestEmailBody return statement contains only one string --- src/app/container/container.component.html | 2 +- src/app/container/container.component.ts | 10 ++- src/app/container/email.service.spec.ts | 2 +- src/app/container/email.service.ts | 80 +++++++++++----------- 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/src/app/container/container.component.html b/src/app/container/container.component.html index 34402d661e..9ab0ce3887 100644 --- a/src/app/container/container.component.html +++ b/src/app/container/container.component.html @@ -80,7 +80,7 @@

    >

    - Request Access + Request Access
    Contact Author diff --git a/src/app/container/container.component.ts b/src/app/container/container.component.ts index 51d469d7b9..26729f6ab4 100644 --- a/src/app/container/container.component.ts +++ b/src/app/container/container.component.ts @@ -21,7 +21,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { AlertService } from 'app/shared/alert/state/alert.service'; import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; +import { map, takeUntil } from 'rxjs/operators'; import { ListContainersService } from '../containers/list/list.service'; import { AlertQuery } from '../shared/alert/state/alert.query'; import { BioschemaService, BioschemaTool } from '../shared/bioschema.service'; @@ -59,7 +59,7 @@ export class ContainerComponent extends Entry implements AfterViewInit { containerEditData: any; thisisValid = true; ModeEnum = DockstoreTool.ModeEnum; - public requestAccessHREF: string; + public requestAccessHREF$: Observable; public contactAuthorHREF: string; public missingWarning: boolean; public tool: DockstoreTool; @@ -197,8 +197,12 @@ export class ContainerComponent extends Entry implements AfterViewInit { if (tool) { this.tool = tool; this.initTool(); + this.requestAccessHREF$ = this.extendedTool$.pipe( + map((extendedTool) => { + return this.emailService.composeRequestAccessEmail(extendedTool); + }) + ); this.contactAuthorHREF = this.emailService.composeContactAuthorEmail(this.tool); - this.requestAccessHREF = this.emailService.composeRequestAccessEmail(this.tool); this.sortedVersions = this.getSortedTags(this.tool.workflowVersions, this.defaultVersion); this.updateVerifiedPlatforms(this.tool.id); } diff --git a/src/app/container/email.service.spec.ts b/src/app/container/email.service.spec.ts index d9acb9f62d..593d5b2c2b 100644 --- a/src/app/container/email.service.spec.ts +++ b/src/app/container/email.service.spec.ts @@ -29,7 +29,7 @@ describe('Service: Email', () => { 'mailto:fake@maintainer.email.ca' + '?subject=Dockstore%20Request%20for%20Access%20to%20registry.hub.docker.com/postgres/postgres' + '&body=I%20would%20like%20to%20request%20access%20to%20your%20Docker%20image%20registry.hub.docker.com/postgres/postgres.%20' + - 'My%20user%20name%20on%20Docker%20Hub%20is%20%3Cusername%3E' + 'My%20username%20on%20Docker%20Hub%20is%20%3Cinput%20username%20here%3E' ); })); diff --git a/src/app/container/email.service.ts b/src/app/container/email.service.ts index bdfa0de2a7..2275db31cd 100644 --- a/src/app/container/email.service.ts +++ b/src/app/container/email.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { DockstoreTool } from '../shared/swagger/model/dockstoreTool'; import { DockstoreService } from './../shared/dockstore.service'; import { ExtendedDockstoreTool } from './../shared/models/ExtendedDockstoreTool'; @@ -11,47 +12,15 @@ export class EmailService { * @param subject The subject of the email * @param body The body of the the email */ - private composeEmail(email: string, subject: string, body: string): string { + private static composeEmail(email: string, subject: string, body: string): string { return `mailto:${email}?subject=${subject}&body=${body}`; } - /** - * Composes the href for the Request Access email - * @param tool The tool to request access for - */ - public composeRequestAccessEmail(tool: ExtendedDockstoreTool): string { - const email = this.getRequestEmailMailTo(tool.tool_maintainer_email, tool.email); - const subject = this.getRequestEmailSubject(tool.tool_path); - const body = this.getRequestEmailBody(tool.tool_path, tool.imgProvider); - return this.composeEmail(email, subject, body); - } - - /** - * Composes the href for the Contact Author email - * @param tool The tool to contact author for - */ - public composeContactAuthorEmail(tool: ExtendedDockstoreTool): string { - const email = this.getInquiryEmailMailTo(tool.email); - const subject = this.getInquiryEmailSubject(tool.tool_path); - const body = this.getInquiryEmailBody(); - return this.composeEmail(email, subject, body); - } - - // Request Access button methods - /** - * This gets the mailto address when the Request Access button is clicked - * @param maintainerEmail The maintainer email - * @param email The tool author's email address - */ - private getRequestEmailMailTo(maintainerEmail: string, email: string): string { - return this.dockstoreService.getRequestAccessEmail(maintainerEmail, email); - } - /** * This gets the email subject when the Request Access button is clicked * @param path The path of the tool whose access is being requested */ - private getRequestEmailSubject(path: string): string { + private static getRequestEmailSubject(path: string): string { return encodeURI(`Dockstore Request for Access to ${path}`); } @@ -60,8 +29,9 @@ export class EmailService { * @param path The path of the tool whose access is being requested * @param toolRegistry The tool registry (Quay.io, GitLab, etc) of the tool whose access is being requested */ - private getRequestEmailBody(path: string, toolRegistry: string): string { - return encodeURI(`I would like to request access to your Docker image ${path}. ` + `My user name on ${toolRegistry} is `); + private static getRequestEmailBody(path: string, toolRegistry: string): string { + const imgProvider: string = toolRegistry ? toolRegistry : 'undefined'; + return encodeURI(`I would like to request access to your Docker image ${path}. My username on ${imgProvider} is `); } // Contact Author button methods @@ -70,7 +40,7 @@ export class EmailService { * This method is mostly redundant, but keeping it to mirror the Request Access button methods and in case modifications are needed * @param email The tool author's email address */ - private getInquiryEmailMailTo(email: string): string { + private static getInquiryEmailMailTo(email: string): string { return email; } @@ -78,7 +48,7 @@ export class EmailService { * This gets the email subject when the Contact Author button is clicked * @param path The path of the tool whose access is being requested */ - private getInquiryEmailSubject(path: string): string { + private static getInquiryEmailSubject(path: string): string { return encodeURI(`Dockstore ${path} inquiry`); } @@ -86,7 +56,39 @@ export class EmailService { * This gets the email body when the Contact Author button is clicked * This method is mostly redundant, but keeping it to mirror the Request Access button methods and in case modifications are needed */ - private getInquiryEmailBody(): string { + private static getInquiryEmailBody(): string { return ''; } + + /** + * Composes the href for the Request Access email + * @param tool The tool to request access for + */ + public composeRequestAccessEmail(tool: ExtendedDockstoreTool): string { + const email = this.getRequestEmailMailTo(tool.tool_maintainer_email, tool.email); + const subject = EmailService.getRequestEmailSubject(tool.tool_path); + const body = EmailService.getRequestEmailBody(tool.tool_path, tool.imgProvider); + return EmailService.composeEmail(email, subject, body); + } + + /** + * Composes the href for the Contact Author email + * @param tool The tool to contact author for + */ + public composeContactAuthorEmail(tool: DockstoreTool): string { + const email = EmailService.getInquiryEmailMailTo(tool.email); + const subject = EmailService.getInquiryEmailSubject(tool.tool_path); + const body = EmailService.getInquiryEmailBody(); + return EmailService.composeEmail(email, subject, body); + } + + // Request Access button methods + /** + * This gets the mailto address when the Request Access button is clicked + * @param maintainerEmail The maintainer email + * @param email The tool author's email address + */ + private getRequestEmailMailTo(maintainerEmail: string, email: string): string { + return this.dockstoreService.getRequestAccessEmail(maintainerEmail, email); + } } From ae571a1fb5cc3c7b176db2771d4f1e3e72711ef1 Mon Sep 17 00:00:00 2001 From: StefanijaO Date: Sat, 30 Jan 2021 00:30:58 +0100 Subject: [PATCH 022/119] Add Cavatica button for CWL workflows (#1140) * Add Cavatica button for CWL workflows * Update launch-third-party.component.html Add missing bracket for img Co-authored-by: stefanijaorbovic Co-authored-by: Charles Overbeck --- src/app/shared/dockstore.model.ts | 1 + .../launch-third-party.component.html | 12 ++++++++++++ .../launch-third-party.component.ts | 4 ++++ src/assets/images/thirdparty/cavatica.png | Bin 0 -> 5062 bytes 4 files changed, 17 insertions(+) create mode 100644 src/assets/images/thirdparty/cavatica.png diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index c8dfed7773..5e52b59d48 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -36,6 +36,7 @@ export class Dockstore { static ANVIL_IMPORT_URL = 'https://anvil.terra.bio/#import-tool/dockstore'; static BD_CATALYST_SEVEN_BRIDGES_IMPORT_URL = 'https://sb.biodatacatalyst.nhlbi.nih.gov/integration/trs/import'; static BD_CATALYST_TERRA_IMPORT_URL = 'https://terra.biodatacatalyst.nhlbi.nih.gov/#import-tool/dockstore'; + static CAVATICA_IMPORT_URL = 'https://cavatica.sbgenomics.com/integration/trs/import'; static GITHUB_CLIENT_ID = 'will be filled in by configuration.service'; static GITHUB_AUTH_URL = 'https://github.com/login/oauth/authorize'; diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index 40f9262a83..4453086842 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -95,6 +95,18 @@

    Launch with

    >NHLBI BioData Catalyst
    +

    diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.ts b/src/app/workflow/launch-third-party/launch-third-party.component.ts index dfbbe3ef0a..84fac0b5e4 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.ts +++ b/src/app/workflow/launch-third-party/launch-third-party.component.ts @@ -179,6 +179,10 @@ export class LaunchThirdPartyComponent extends Base implements OnChanges, OnInit map(([hasContent, hasFileImports]) => !hasContent || (hasFileImports && !this.isGitHubWorkflow())) ); + cavaticaTooltip$: Observable = combineLatest([this.hasContent$, this.hasHttpImports$]).pipe( + map(([hasContent, hasHttpImports]) => this.sevenBridgesTooltip(hasContent, hasHttpImports, 'Cavatica')) + ); + constructor( private workflowsService: WorkflowsService, private descriptorTypeCompatService: DescriptorTypeCompatService, diff --git a/src/assets/images/thirdparty/cavatica.png b/src/assets/images/thirdparty/cavatica.png new file mode 100644 index 0000000000000000000000000000000000000000..be0a9be945e292d0e3bc30c97e7edc93e11845b3 GIT binary patch literal 5062 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 literal 0 HcmV?d00001 From ed17a4ab7e4c777912662e7321af8c09b05aabe4 Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Wed, 3 Feb 2021 15:19:31 -0800 Subject: [PATCH 023/119] Hotfix/2.7.3 (#1147) * Add Cavatica button for CWL workflows (#1140) (#1141) * Add Cavatica button for CWL workflows * Update launch-third-party.component.html Add missing bracket for img Co-authored-by: stefanijaorbovic Co-authored-by: Charles Overbeck (cherry picked from commit ae571a1fb5cc3c7b176db2771d4f1e3e72711ef1) Co-authored-by: StefanijaO * merge branch hotfix/2.7.2 * Add Cavatica button for CWL workflows * Update launch-third-party.component.html Add missing bracket for img Co-authored-by: stefanijaorbovic Co-authored-by: Charles Overbeck (cherry picked from commit ae571a1fb5cc3c7b176db2771d4f1e3e72711ef1) Co-authored-by: StefanijaO Co-authored-by: Charles Overbeck Co-authored-by: StefanijaO * fix license checker script (#1144) * fix license checker script/circleci test. Now circleci will run create its own license file and compare it to the checked in one. If they don't match, and the test fails. Devs will need to run "npm run license" to update the license file and have test passing. Co-authored-by: Charles Overbeck Co-authored-by: StefanijaO --- .circleci/config.yml | 34 +- THIRD-PARTY-LICENSES.csv | 779 ++++++++++++++----------- package.json | 3 +- scripts/detect-package-json-changes.sh | 11 +- 4 files changed, 467 insertions(+), 360 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b7522fe6f..0a61e3a79a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,7 +60,7 @@ jobs: fail_only: true failure_message: Nightly auth tests failed! webhook: $SLACK_WEBHOOK - lint_unit_test_coverage: + lint_license_unit_test_coverage: working_directory: ~/repo docker: - image: circleci/buildpack-deps:18.04-browsers @@ -103,6 +103,11 @@ jobs: - run: name: Lint command: bash -i -c 'npm run lint' + - run: + name: License Test + command: | + bash -i -c 'npm run circle-ci-license-test-file' + bash scripts/detect-package-json-changes.sh - run: name: Build command: NODE_OPTIONS="--max-old-space-size=1610" bash -i -c 'npm run build.prod' @@ -119,16 +124,6 @@ jobs: root: . paths: - . - licenses_test: - working_directory: ~/repo - docker: - - image: circleci/buildpack-deps:18.04-browsers - auth: - username: dockstoretestuser - password: $DOCKERHUB_PASSWORD - steps: - - checkout - - run: bash scripts/detect-package-json-changes.sh integration_test_1: executor: integration_test_exec working_directory: ~/repo @@ -231,13 +226,7 @@ workflows: everything: jobs: # # Add the tags filter to all jobs so they will run before upload_to_s3 - - lint_unit_test_coverage: - filters: - tags: - only: /.*/ - context: - - dockerhub - - licenses_test: + - lint_license_unit_test_coverage: filters: tags: only: /.*/ @@ -248,8 +237,7 @@ workflows: tags: only: /.*/ requires: - - lint_unit_test_coverage - - licenses_test + - lint_license_unit_test_coverage context: - dockerhub - integration_test_2: @@ -257,8 +245,7 @@ workflows: tags: only: /.*/ requires: - - lint_unit_test_coverage - - licenses_test + - lint_license_unit_test_coverage context: - dockerhub - integration_test_3: @@ -266,8 +253,7 @@ workflows: tags: only: /.*/ requires: - - lint_unit_test_coverage - - licenses_test + - lint_license_unit_test_coverage context: - dockerhub # Upload builds for tags and branches to s3. diff --git a/THIRD-PARTY-LICENSES.csv b/THIRD-PARTY-LICENSES.csv index bff58825ec..d5cfad7032 100644 --- a/THIRD-PARTY-LICENSES.csv +++ b/THIRD-PARTY-LICENSES.csv @@ -1,101 +1,103 @@ "module name","license","repository" -"@angular-devkit/architect@0.803.25","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-angular@0.803.25","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-optimizer@0.803.25","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-webpack@0.803.25","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/architect@0.901.9","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-angular@0.901.9","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-optimizer@0.901.9","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-webpack@0.901.9","MIT","https://github.com/angular/angular-cli" "@angular-devkit/core@7.3.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/core@8.3.25","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/core@9.1.9","MIT","https://github.com/angular/angular-cli" "@angular-devkit/schematics@7.3.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/schematics@8.3.25","MIT","https://github.com/angular/angular-cli" -"@angular/animations@8.2.8","MIT","https://github.com/angular/angular" -"@angular/cdk@8.1.1","MIT","https://github.com/angular/components" -"@angular/cli@8.3.25","MIT","https://github.com/angular/angular-cli" -"@angular/common@8.2.8","MIT","https://github.com/angular/angular" -"@angular/compiler-cli@8.2.8","MIT","https://github.com/angular/angular" -"@angular/compiler@8.2.8","MIT","https://github.com/angular/angular" -"@angular/core@8.2.8","MIT","https://github.com/angular/angular" -"@angular/flex-layout@8.0.0-beta.27","MIT","https://github.com/angular/flex-layout" -"@angular/forms@8.2.8","MIT","https://github.com/angular/angular" -"@angular/language-service@8.2.8","MIT","https://github.com/angular/angular" -"@angular/material@8.1.1","MIT","https://github.com/angular/components" -"@angular/platform-browser-dynamic@8.2.8","MIT","https://github.com/angular/angular" -"@angular/platform-browser@8.2.8","MIT","https://github.com/angular/angular" -"@angular/platform-server@8.2.8","MIT","https://github.com/angular/angular" -"@angular/router@8.2.8","MIT","https://github.com/angular/angular" +"@angular-devkit/schematics@9.1.9","MIT","https://github.com/angular/angular-cli" +"@angular/animations@9.1.11","MIT","https://github.com/angular/angular" +"@angular/cdk@9.2.4","MIT","https://github.com/angular/components" +"@angular/cli@9.1.9","MIT","https://github.com/angular/angular-cli" +"@angular/common@9.1.11","MIT","https://github.com/angular/angular" +"@angular/compiler-cli@9.1.11","MIT","https://github.com/angular/angular" +"@angular/compiler@9.1.11","MIT","https://github.com/angular/angular" +"@angular/core@9.1.11","MIT","https://github.com/angular/angular" +"@angular/flex-layout@9.0.0-beta.31","MIT","https://github.com/angular/flex-layout" +"@angular/forms@9.1.11","MIT","https://github.com/angular/angular" +"@angular/language-service@9.1.11","MIT","https://github.com/angular/angular" +"@angular/material@9.2.4","MIT","https://github.com/angular/components" +"@angular/platform-browser-dynamic@9.1.11","MIT","https://github.com/angular/angular" +"@angular/platform-browser@9.1.11","MIT","https://github.com/angular/angular" +"@angular/platform-server@9.1.11","MIT","https://github.com/angular/angular" +"@angular/router@9.1.11","MIT","https://github.com/angular/angular" "@babel/code-frame@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-code-frame" +"@babel/code-frame@7.10.3","MIT","https://github.com/babel/babel" "@babel/code-frame@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-code-frame" -"@babel/code-frame@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-code-frame" -"@babel/compat-data@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-compat-data" +"@babel/compat-data@7.10.3","MIT","https://github.com/babel/babel" +"@babel/core@7.10.3","MIT","https://github.com/babel/babel" "@babel/core@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" -"@babel/core@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" -"@babel/core@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" +"@babel/core@7.9.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" +"@babel/generator@7.10.3","MIT","https://github.com/babel/babel" "@babel/generator@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" "@babel/generator@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" -"@babel/generator@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" +"@babel/generator@7.9.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" "@babel/helper-annotate-as-pure@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-annotate-as-pure" -"@babel/helper-annotate-as-pure@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-annotate-as-pure" +"@babel/helper-annotate-as-pure@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-builder-binary-assignment-operator-visitor@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-builder-binary-assignment-operator-visitor" -"@babel/helper-builder-binary-assignment-operator-visitor@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-builder-binary-assignment-operator-visitor" +"@babel/helper-builder-binary-assignment-operator-visitor@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-call-delegate@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate" -"@babel/helper-call-delegate@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate" -"@babel/helper-compilation-targets@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-compilation-targets" -"@babel/helper-create-regexp-features-plugin@7.8.6","MIT","https://github.com/babel/babel" +"@babel/helper-compilation-targets@7.10.2","MIT","https://github.com/babel/babel" +"@babel/helper-create-regexp-features-plugin@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-define-map@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-define-map@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-define-map" -"@babel/helper-define-map@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-define-map" "@babel/helper-explode-assignable-expression@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-explode-assignable-expression" -"@babel/helper-explode-assignable-expression@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-explode-assignable-expression" +"@babel/helper-explode-assignable-expression@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-function-name@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-function-name" -"@babel/helper-function-name@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-function-name" +"@babel/helper-function-name@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-get-function-arity@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity" -"@babel/helper-get-function-arity@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity" +"@babel/helper-get-function-arity@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-hoist-variables@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-hoist-variables@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-hoist-variables" -"@babel/helper-hoist-variables@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-hoist-variables" +"@babel/helper-member-expression-to-functions@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-member-expression-to-functions@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-member-expression-to-functions" -"@babel/helper-member-expression-to-functions@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-member-expression-to-functions" "@babel/helper-module-imports@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-imports" -"@babel/helper-module-imports@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-imports" +"@babel/helper-module-imports@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-module-transforms@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-module-transforms@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-transforms" "@babel/helper-module-transforms@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-transforms" -"@babel/helper-module-transforms@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-transforms" "@babel/helper-optimise-call-expression@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-optimise-call-expression" -"@babel/helper-optimise-call-expression@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-optimise-call-expression" +"@babel/helper-optimise-call-expression@7.10.3","MIT","https://github.com/babel/babel" "@babel/helper-plugin-utils@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-plugin-utils" -"@babel/helper-plugin-utils@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-plugin-utils" +"@babel/helper-plugin-utils@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-regex@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-regex@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-regex" "@babel/helper-regex@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-regex" -"@babel/helper-regex@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-regex" "@babel/helper-remap-async-to-generator@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-remap-async-to-generator" -"@babel/helper-remap-async-to-generator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-remap-async-to-generator" +"@babel/helper-remap-async-to-generator@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-replace-supers@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-replace-supers@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-replace-supers" -"@babel/helper-replace-supers@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-replace-supers" "@babel/helper-simple-access@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-simple-access" -"@babel/helper-simple-access@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-simple-access" +"@babel/helper-simple-access@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-split-export-declaration@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-split-export-declaration@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration" "@babel/helper-split-export-declaration@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration" -"@babel/helper-split-export-declaration@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration" +"@babel/helper-validator-identifier@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-wrap-function@7.10.1","MIT","https://github.com/babel/babel" "@babel/helper-wrap-function@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-wrap-function" -"@babel/helper-wrap-function@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-wrap-function" +"@babel/helpers@7.10.1","MIT","https://github.com/babel/babel" "@babel/helpers@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-helpers" -"@babel/helpers@7.8.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helpers" "@babel/highlight@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-highlight" -"@babel/highlight@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-highlight" +"@babel/highlight@7.10.3","MIT","https://github.com/babel/babel" +"@babel/parser@7.10.3","MIT","https://github.com/babel/babel" "@babel/parser@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-parser" "@babel/parser@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-parser" -"@babel/parser@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-parser" +"@babel/plugin-proposal-async-generator-functions@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-async-generator-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-async-generator-functions" -"@babel/plugin-proposal-async-generator-functions@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-async-generator-functions" +"@babel/plugin-proposal-dynamic-import@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-dynamic-import@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-dynamic-import" -"@babel/plugin-proposal-dynamic-import@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-dynamic-import" +"@babel/plugin-proposal-json-strings@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-json-strings@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-json-strings" -"@babel/plugin-proposal-json-strings@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-json-strings" -"@babel/plugin-proposal-nullish-coalescing-operator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-nullish-coalescing-operator" +"@babel/plugin-proposal-nullish-coalescing-operator@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-numeric-separator@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-object-rest-spread@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-object-rest-spread@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-object-rest-spread" -"@babel/plugin-proposal-object-rest-spread@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-object-rest-spread" +"@babel/plugin-proposal-optional-catch-binding@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-optional-catch-binding@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-catch-binding" -"@babel/plugin-proposal-optional-catch-binding@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-catch-binding" -"@babel/plugin-proposal-optional-chaining@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-chaining" +"@babel/plugin-proposal-optional-chaining@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-unicode-property-regex@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-unicode-property-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-unicode-property-regex" -"@babel/plugin-proposal-unicode-property-regex@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-unicode-property-regex" "@babel/plugin-syntax-async-generators@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators" "@babel/plugin-syntax-async-generators@7.8.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators" "@babel/plugin-syntax-dynamic-import@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-dynamic-import" @@ -103,110 +105,114 @@ "@babel/plugin-syntax-json-strings@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings" "@babel/plugin-syntax-json-strings@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings" "@babel/plugin-syntax-nullish-coalescing-operator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator" +"@babel/plugin-syntax-numeric-separator@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-syntax-object-rest-spread@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread" "@babel/plugin-syntax-object-rest-spread@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread" "@babel/plugin-syntax-optional-catch-binding@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding" "@babel/plugin-syntax-optional-catch-binding@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding" "@babel/plugin-syntax-optional-chaining@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining" -"@babel/plugin-syntax-top-level-await@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-top-level-await" +"@babel/plugin-syntax-top-level-await@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-arrow-functions@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-arrow-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-arrow-functions" -"@babel/plugin-transform-arrow-functions@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-arrow-functions" +"@babel/plugin-transform-async-to-generator@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-async-to-generator@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-to-generator" -"@babel/plugin-transform-async-to-generator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-to-generator" +"@babel/plugin-transform-block-scoped-functions@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-block-scoped-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoped-functions" -"@babel/plugin-transform-block-scoped-functions@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoped-functions" +"@babel/plugin-transform-block-scoping@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-block-scoping@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoping" -"@babel/plugin-transform-block-scoping@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoping" +"@babel/plugin-transform-classes@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-classes@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-classes" -"@babel/plugin-transform-classes@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-classes" +"@babel/plugin-transform-computed-properties@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-computed-properties@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-computed-properties" -"@babel/plugin-transform-computed-properties@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-computed-properties" +"@babel/plugin-transform-destructuring@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-destructuring@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-destructuring" -"@babel/plugin-transform-destructuring@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-destructuring" +"@babel/plugin-transform-dotall-regex@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-dotall-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-dotall-regex" -"@babel/plugin-transform-dotall-regex@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-dotall-regex" +"@babel/plugin-transform-duplicate-keys@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-duplicate-keys@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-duplicate-keys" -"@babel/plugin-transform-duplicate-keys@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-duplicate-keys" +"@babel/plugin-transform-exponentiation-operator@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-exponentiation-operator@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-exponentiation-operator" -"@babel/plugin-transform-exponentiation-operator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-exponentiation-operator" +"@babel/plugin-transform-for-of@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-for-of@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-for-of" -"@babel/plugin-transform-for-of@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-for-of" +"@babel/plugin-transform-function-name@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-function-name@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-function-name" -"@babel/plugin-transform-function-name@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-function-name" +"@babel/plugin-transform-literals@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-literals" -"@babel/plugin-transform-literals@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-literals" +"@babel/plugin-transform-member-expression-literals@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-member-expression-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-member-expression-literals" -"@babel/plugin-transform-member-expression-literals@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-member-expression-literals" +"@babel/plugin-transform-modules-amd@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-amd@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-amd" -"@babel/plugin-transform-modules-amd@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-amd" +"@babel/plugin-transform-modules-commonjs@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-commonjs@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-commonjs" -"@babel/plugin-transform-modules-commonjs@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-commonjs" +"@babel/plugin-transform-modules-systemjs@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-systemjs@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-systemjs" -"@babel/plugin-transform-modules-systemjs@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-systemjs" +"@babel/plugin-transform-modules-umd@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-umd@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-umd" -"@babel/plugin-transform-modules-umd@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-umd" +"@babel/plugin-transform-named-capturing-groups-regex@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-named-capturing-groups-regex@7.6.2","MIT","https://github.com/babel/babel" -"@babel/plugin-transform-named-capturing-groups-regex@7.8.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-new-target@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-new-target@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-new-target" -"@babel/plugin-transform-new-target@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-new-target" +"@babel/plugin-transform-object-super@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-object-super@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-super" -"@babel/plugin-transform-object-super@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-super" +"@babel/plugin-transform-parameters@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-parameters@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-parameters" -"@babel/plugin-transform-parameters@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-parameters" +"@babel/plugin-transform-property-literals@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-property-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-property-literals" -"@babel/plugin-transform-property-literals@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-property-literals" +"@babel/plugin-transform-regenerator@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-regenerator@7.4.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-regenerator" -"@babel/plugin-transform-regenerator@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-regenerator" +"@babel/plugin-transform-reserved-words@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-reserved-words@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-reserved-words" -"@babel/plugin-transform-reserved-words@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-reserved-words" +"@babel/plugin-transform-shorthand-properties@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-shorthand-properties@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-shorthand-properties" -"@babel/plugin-transform-shorthand-properties@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-shorthand-properties" +"@babel/plugin-transform-spread@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-spread@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-spread" -"@babel/plugin-transform-spread@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-spread" +"@babel/plugin-transform-sticky-regex@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-sticky-regex@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-sticky-regex" -"@babel/plugin-transform-sticky-regex@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-sticky-regex" +"@babel/plugin-transform-template-literals@7.10.3","MIT","https://github.com/babel/babel" "@babel/plugin-transform-template-literals@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-template-literals" -"@babel/plugin-transform-template-literals@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-template-literals" +"@babel/plugin-transform-typeof-symbol@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-typeof-symbol@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-typeof-symbol" -"@babel/plugin-transform-typeof-symbol@7.8.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-typeof-symbol" +"@babel/plugin-transform-unicode-regex@7.10.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-unicode-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-unicode-regex" -"@babel/plugin-transform-unicode-regex@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-unicode-regex" "@babel/preset-env@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-preset-env" -"@babel/preset-env@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-preset-env" -"@babel/runtime@7.8.7","MIT","https://github.com/babel/babel" +"@babel/preset-env@7.9.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-preset-env" +"@babel/preset-modules@0.1.3","MIT","" +"@babel/runtime@7.10.3","MIT","https://github.com/babel/babel" +"@babel/template@7.10.3","MIT","https://github.com/babel/babel" "@babel/template@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" "@babel/template@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" "@babel/template@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" +"@babel/traverse@7.10.3","MIT","https://github.com/babel/babel" "@babel/traverse@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-traverse" "@babel/traverse@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-traverse" -"@babel/traverse@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-traverse" +"@babel/types@7.10.3","MIT","https://github.com/babel/babel" "@babel/types@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-types" "@babel/types@7.6.1","MIT","https://github.com/babel/babel/tree/master/packages/babel-types" -"@babel/types@7.8.7","MIT","https://github.com/babel/babel/tree/master/packages/babel-types" "@cypress/listr-verbose-renderer@0.4.1","MIT","https://github.com/SamVerschueren/listr-verbose-renderer" +"@cypress/request@2.88.5","Apache-2.0","https://github.com/cypress-io/request" "@cypress/webpack-preprocessor@4.1.0","MIT","https://github.com/cypress-io/cypress-webpack-preprocessor" "@cypress/xvfb@1.2.4","MIT","https://github.com/cypress-io/xvfb" "@datorama/akita-ng-forms-manager@3.1.0","Apache*","https://github.com/NetanelBasal/akita-ng-forms-manager" "@datorama/akita-ngdevtools@3.0.2","Apache*","" "@datorama/akita@4.10.8","Apache*","https://github.com/datorama/akita" -"@fortawesome/angular-fontawesome@0.5.0","MIT","https://github.com/FortAwesome/angular-fontawesome" -"@fortawesome/fontawesome-common-types@0.2.25","MIT","https://github.com/FortAwesome/Font-Awesome" -"@fortawesome/fontawesome-svg-core@1.2.25","MIT","https://github.com/FortAwesome/Font-Awesome" -"@fortawesome/free-brands-svg-icons@5.11.2","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" -"@fortawesome/free-solid-svg-icons@5.11.2","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" +"@fortawesome/angular-fontawesome@0.6.1","MIT","https://github.com/FortAwesome/angular-fontawesome" +"@fortawesome/fontawesome-common-types@0.2.29","MIT","https://github.com/FortAwesome/Font-Awesome" +"@fortawesome/fontawesome-svg-core@1.2.29","MIT","https://github.com/FortAwesome/Font-Awesome" +"@fortawesome/free-brands-svg-icons@5.13.1","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" +"@fortawesome/free-solid-svg-icons@5.13.1","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" "@istanbuljs/schema@0.1.2","MIT","https://github.com/istanbuljs/schema" -"@ngtools/webpack@8.3.25","MIT","https://github.com/angular/angular-cli" +"@jsdevtools/coverage-istanbul-loader@3.0.3","MIT","https://github.com/JS-DevTools/coverage-istanbul-loader" +"@material-extended/mde@2.3.1","MIT","https://github.com/material-extended/popover" +"@ngtools/webpack@9.1.9","MIT","https://github.com/angular/angular-cli" "@ngx-lite/json-ld@0.6.2","MIT","https://github.com/coryrylan/ngx-json-ld" -"@ngx-share/button@7.1.4","MIT","https://github.com/murhafsousli/ngx-sharebuttons" -"@ngx-share/buttons@7.1.4","MIT","https://github.com/murhafsousli/ngx-sharebuttons" -"@ngx-share/core@7.1.4","MIT","https://github.com/murhafsousli/ngx-sharebuttons" "@nodelib/fs.scandir@2.1.2","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir" "@nodelib/fs.stat@2.0.2","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat" "@nodelib/fs.walk@1.2.3","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk" +"@npmcli/move-file@1.0.1","MIT","https://github.com/npm/move-file" "@phenomnomnominal/tsquery@3.0.0","MIT","https://github.com/phenomnomnominal/tsquery" "@samverschueren/stream-to-observable@0.3.0","MIT","https://github.com/SamVerschueren/stream-to-observable" -"@schematics/angular@8.3.25","MIT","https://github.com/angular/angular-cli" -"@schematics/update@0.803.25","MIT","https://github.com/angular/angular-cli" +"@schematics/angular@9.1.9","MIT","https://github.com/angular/angular-cli" +"@schematics/update@0.901.9","MIT","https://github.com/angular/angular-cli" "@types/color-name@1.1.1","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/cytoscape@3.8.2","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/elastic.js@1.2.8","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" @@ -216,13 +222,16 @@ "@types/jasmine@3.4.0","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/jasminewd2@2.0.6","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/jquery@3.3.31","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" -"@types/marked@0.6.5","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/json-schema@7.0.5","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/marked@0.7.4","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/minimatch@3.0.3","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" -"@types/node@10.14.19","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/node@12.12.47","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/normalize-package-data@2.4.0","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" +"@types/q@1.5.4","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/sinonjs__fake-timers@6.0.1","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/sizzle@2.3.2","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/source-list-map@0.1.2","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" -"@types/webpack-sources@0.1.6","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/webpack-sources@0.1.8","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@webassemblyjs/ast@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" "@webassemblyjs/floating-point-hex-parser@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" "@webassemblyjs/helper-api-error@1.8.5","MIT","" @@ -256,12 +265,13 @@ "agentkeepalive@3.5.2","MIT","https://github.com/node-modules/agentkeepalive" "aggregate-error@3.0.0","MIT","https://github.com/sindresorhus/aggregate-error" "ajv-errors@1.0.1","MIT","https://github.com/epoberezkin/ajv-errors" -"ajv-keywords@3.4.1","MIT","https://github.com/epoberezkin/ajv-keywords" +"ajv-keywords@3.5.0","MIT","https://github.com/epoberezkin/ajv-keywords" "ajv@5.5.2","MIT","https://github.com/epoberezkin/ajv" -"ajv@6.10.2","MIT","https://github.com/epoberezkin/ajv" "ajv@6.12.0","MIT","https://github.com/epoberezkin/ajv" +"ajv@6.12.2","MIT","https://github.com/epoberezkin/ajv" +"ajv@6.12.4","MIT","https://github.com/ajv-validator/ajv" "ajv@6.9.1","MIT","https://github.com/epoberezkin/ajv" -"amdefine@1.0.1","BSD-3-Clause OR MIT","https://github.com/jrburke/amdefine" +"alphanum-sort@1.0.2","MIT","https://github.com/TrySound/alphanum-sort" "angular-tag-cloud-module@3.8.1","MIT*","" "ansi-colors@3.2.4","MIT","https://github.com/doowb/ansi-colors" "ansi-colors@4.1.1","MIT","https://github.com/doowb/ansi-colors" @@ -279,10 +289,11 @@ "any-observable@0.3.0","MIT","https://github.com/sindresorhus/any-observable" "anymatch@2.0.0","ISC","https://github.com/micromatch/anymatch" "anymatch@3.1.0","ISC","https://github.com/micromatch/anymatch" +"anymatch@3.1.1","ISC","https://github.com/micromatch/anymatch" "app-root-path@2.2.1","MIT","https://github.com/inxilpro/node-app-root-path" "append-transform@1.0.0","MIT","https://github.com/istanbuljs/append-transform" "aproba@1.2.0","ISC","https://github.com/iarna/aproba" -"arch@2.1.1","MIT","https://github.com/feross/arch" +"arch@2.1.2","MIT","https://github.com/feross/arch" "are-we-there-yet@1.1.5","ISC","https://github.com/iarna/are-we-there-yet" "arg@4.1.1","MIT","https://github.com/zeit/arg" "argparse@1.0.10","MIT","https://github.com/nodeca/argparse" @@ -310,18 +321,22 @@ "async@2.6.3","MIT","https://github.com/caolan/async" "async@3.2.0","MIT","https://github.com/caolan/async" "asynckit@0.4.0","MIT","https://github.com/alexindigo/asynckit" +"at-least-node@1.0.0","ISC","https://github.com/RyanZim/at-least-node" "atob@2.1.1","(MIT OR Apache-2.0)","git://git.coolaj86.com/coolaj86/atob.js" -"autoprefixer@9.6.1","MIT","https://github.com/postcss/autoprefixer" +"autoprefixer@9.7.4","MIT","https://github.com/postcss/autoprefixer" "aws-sign2@0.7.0","Apache-2.0","https://github.com/mikeal/aws-sign" +"aws4@1.10.1","MIT","https://github.com/mhart/aws4" "aws4@1.8.0","MIT","https://github.com/mhart/aws4" "axobject-query@2.0.2","Apache-2.0","https://github.com/A11yance/axobject-query" "babel-loader@8.0.6","MIT","https://github.com/babel/babel-loader" +"babel-loader@8.1.0","MIT","https://github.com/babel/babel-loader" "babel-plugin-dynamic-import-node@2.3.0","MIT","https://github.com/airbnb/babel-plugin-dynamic-import-node" +"babel-plugin-dynamic-import-node@2.3.3","MIT","https://github.com/airbnb/babel-plugin-dynamic-import-node" "backo2@1.0.2","MIT","https://github.com/mokesmokes/backo" "balanced-match@1.0.0","MIT","https://github.com/juliangruber/balanced-match" "base64-arraybuffer@0.1.5","MIT","https://github.com/niklasvh/base64-arraybuffer" "base64-js@1.3.1","MIT","https://github.com/beatgammit/base64-js" -"base64id@1.0.0","MIT","https://github.com/faeldt/base64id" +"base64id@2.0.0","MIT","https://github.com/faeldt/base64id" "base@0.11.2","MIT","https://github.com/node-base/base" "batch@0.6.1","MIT","https://github.com/visionmedia/batch" "bcrypt-pbkdf@1.0.2","BSD-3-Clause","https://github.com/joyent/node-bcrypt-pbkdf" @@ -330,18 +345,21 @@ "big.js@5.2.2","MIT","https://github.com/MikeMcl/big.js" "binary-extensions@1.11.0","MIT","https://github.com/sindresorhus/binary-extensions" "binary-extensions@2.0.0","MIT","https://github.com/sindresorhus/binary-extensions" +"binary-extensions@2.1.0","MIT","https://github.com/sindresorhus/binary-extensions" +"bindings@1.5.0","MIT","https://github.com/TooTallNate/node-bindings" +"blob-util@2.0.2","Apache-2.0","https://github.com/nolanlawson/blob-util" "blob@0.0.5","MIT","https://github.com/webmodules/blob" "bluebird@3.5.0","MIT","https://github.com/petkaantonov/bluebird" "bluebird@3.5.1","MIT","https://github.com/petkaantonov/bluebird" -"bluebird@3.5.5","MIT","https://github.com/petkaantonov/bluebird" "bluebird@3.7.2","MIT","https://github.com/petkaantonov/bluebird" -"bn.js@4.11.8","MIT","https://github.com/indutny/bn.js" +"bn.js@4.11.9","MIT","https://github.com/indutny/bn.js" +"bn.js@5.1.2","MIT","https://github.com/indutny/bn.js" "body-parser@1.19.0","MIT","https://github.com/expressjs/body-parser" "bodybuilder@2.2.17","MIT","https://github.com/danpaz/bodybuilder" "bonjour@3.5.0","MIT","https://github.com/watson/bonjour" +"boolbase@1.0.0","ISC","https://github.com/fb55/boolbase" "bootstrap-social@5.1.1","MIT","https://github.com/lipis/bootstrap-social" "bootstrap@3.4.1","MIT","https://github.com/twbs/bootstrap" -"brace-expansion@1.1.11","MIT","https://github.com/juliangruber/brace-expansion" "brace-expansion@1.1.8","MIT","https://github.com/juliangruber/brace-expansion" "braces@2.3.2","MIT","https://github.com/micromatch/braces" "braces@3.0.2","MIT","https://github.com/micromatch/braces" @@ -350,15 +368,11 @@ "browserify-cipher@1.0.1","MIT","https://github.com/crypto-browserify/browserify-cipher" "browserify-des@1.0.2","MIT","https://github.com/crypto-browserify/browserify-des" "browserify-rsa@4.0.1","MIT","https://github.com/crypto-browserify/browserify-rsa" -"browserify-sign@4.0.4","ISC","https://github.com/crypto-browserify/browserify-sign" +"browserify-sign@4.2.0","ISC","https://github.com/crypto-browserify/browserify-sign" "browserify-zlib@0.2.0","MIT","https://github.com/devongovett/browserify-zlib" +"browserslist@4.12.0","MIT","https://github.com/browserslist/browserslist" "browserslist@4.7.0","MIT","https://github.com/browserslist/browserslist" -"browserslist@4.8.6","MIT","https://github.com/browserslist/browserslist" -"browserslist@4.9.1","MIT","https://github.com/browserslist/browserslist" -"buffer-alloc-unsafe@1.1.0","MIT","https://github.com/LinusU/buffer-alloc-unsafe" -"buffer-alloc@1.2.0","MIT","https://github.com/LinusU/buffer-alloc" "buffer-crc32@0.2.13","MIT","https://github.com/brianloveswords/buffer-crc32" -"buffer-fill@1.0.0","MIT","https://github.com/LinusU/buffer-fill" "buffer-from@1.0.0","MIT","https://github.com/LinusU/buffer-from" "buffer-indexof@1.1.1","MIT","https://github.com/soldair/node-buffer-indexof" "buffer-xor@1.0.3","MIT","https://github.com/crypto-browserify/buffer-xor" @@ -368,8 +382,9 @@ "builtins@1.0.3","MIT","https://github.com/juliangruber/builtins" "bytes@3.0.0","MIT","https://github.com/visionmedia/bytes.js" "bytes@3.1.0","MIT","https://github.com/visionmedia/bytes.js" -"cacache@12.0.2","ISC","https://github.com/npm/cacache" -"cacache@12.0.3","ISC","https://github.com/npm/cacache" +"cacache@12.0.4","ISC","https://github.com/npm/cacache" +"cacache@15.0.0","ISC","https://github.com/npm/cacache" +"cacache@15.0.4","ISC","https://github.com/npm/cacache" "cache-base@1.0.1","MIT","https://github.com/jonschlinkert/cache-base" "cachedir@2.3.0","MIT","https://github.com/LinusU/node-cachedir" "caller-callsite@2.0.0","MIT","https://github.com/sindresorhus/caller-callsite" @@ -377,57 +392,69 @@ "callsite@1.0.0","MIT*","" "callsites@2.0.0","MIT","https://github.com/sindresorhus/callsites" "camelcase@5.3.1","MIT","https://github.com/sindresorhus/camelcase" +"caniuse-api@3.0.0","MIT","https://github.com/nyalab/caniuse-api" "caniuse-lite@1.0.30000989","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" -"caniuse-lite@1.0.30001024","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" -"caniuse-lite@1.0.30001032","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" +"caniuse-lite@1.0.30001087","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" "canonical-path@1.0.0","MIT","https://github.com/petebacondarwin/node-canonical-path" "caseless@0.12.0","Apache-2.0","https://github.com/mikeal/caseless" "chalk@1.1.3","MIT","https://github.com/chalk/chalk" "chalk@2.3.0","MIT","https://github.com/chalk/chalk" "chalk@2.4.2","MIT","https://github.com/chalk/chalk" "chalk@3.0.0","MIT","https://github.com/chalk/chalk" +"chalk@4.1.0","MIT","https://github.com/chalk/chalk" "chardet@0.7.0","MIT","https://github.com/runk/node-chardet" "check-more-types@2.24.0","MIT","https://github.com/kensho/check-more-types" "chokidar@2.0.4","MIT","https://github.com/paulmillr/chokidar" "chokidar@2.1.8","MIT","https://github.com/paulmillr/chokidar" "chokidar@3.1.1","MIT","https://github.com/paulmillr/chokidar" -"chownr@1.1.1","ISC","https://github.com/isaacs/chownr" -"chownr@1.1.3","ISC","https://github.com/isaacs/chownr" +"chokidar@3.4.0","MIT","https://github.com/paulmillr/chokidar" +"chokidar@3.4.2","MIT","https://github.com/paulmillr/chokidar" +"chownr@1.1.4","ISC","https://github.com/isaacs/chownr" +"chownr@2.0.0","ISC","https://github.com/isaacs/chownr" "chrome-trace-event@1.0.2","MIT","github.com:samccone/chrome-trace-event" "ci-info@2.0.0","MIT","https://github.com/watson/ci-info" "cipher-base@1.0.4","MIT","https://github.com/crypto-browserify/cipher-base" "circular-dependency-plugin@5.2.0","ISC","https://github.com/aackerman/circular-dependency-plugin" "class-utils@0.3.6","MIT","https://github.com/jonschlinkert/class-utils" -"clean-css@4.2.1","MIT","https://github.com/jakubpawlowicz/clean-css" "clean-stack@2.2.0","MIT","https://github.com/sindresorhus/clean-stack" "cli-cursor@1.0.2","MIT","https://github.com/sindresorhus/cli-cursor" "cli-cursor@2.1.0","MIT","https://github.com/sindresorhus/cli-cursor" "cli-cursor@3.1.0","MIT","https://github.com/sindresorhus/cli-cursor" +"cli-spinners@2.3.0","MIT","https://github.com/sindresorhus/cli-spinners" +"cli-table3@0.6.0","MIT","https://github.com/cli-table/cli-table3" "cli-truncate@0.2.1","MIT","https://github.com/sindresorhus/cli-truncate" -"cli-width@2.2.0","ISC","https://github.com/knownasilya/cli-width" -"clipboard@2.0.4","MIT","https://github.com/zenorocha/clipboard.js" -"cliui@4.1.0","ISC","https://github.com/yargs/cliui" +"cli-width@2.2.1","ISC","https://github.com/knownasilya/cli-width" +"clipboard@2.0.6","MIT","https://github.com/zenorocha/clipboard.js" +"cliui@5.0.0","ISC","https://github.com/yargs/cliui" +"cliui@6.0.0","ISC","https://github.com/yargs/cliui" "clone-deep@4.0.1","MIT","https://github.com/jonschlinkert/clone-deep" +"clone@1.0.4","MIT","https://github.com/pvorb/node-clone" "clone@2.1.2","MIT","https://github.com/pvorb/node-clone" "co@4.6.0","MIT","https://github.com/tj/co" +"coa@2.0.2","MIT","https://github.com/veged/coa" "code-point-at@1.1.0","MIT","https://github.com/sindresorhus/code-point-at" -"codelyzer@5.1.1","MIT","https://github.com/mgechev/codelyzer" +"codelyzer@5.2.2","MIT","https://github.com/mgechev/codelyzer" "collection-visit@1.0.0","MIT","https://github.com/jonschlinkert/collection-visit" "color-convert@1.9.1","MIT","https://github.com/Qix-/color-convert" "color-convert@2.0.1","MIT","https://github.com/Qix-/color-convert" "color-name@1.1.3","MIT","https://github.com/dfcreative/color-name" "color-name@1.1.4","MIT","https://github.com/colorjs/color-name" +"color-string@1.5.3","MIT","https://github.com/Qix-/color-string" +"color@3.1.2","MIT","https://github.com/Qix-/color" "colors@1.1.2","MIT","https://github.com/Marak/colors.js" +"colors@1.4.0","MIT","https://github.com/Marak/colors.js" "combined-stream@1.0.7","MIT","https://github.com/felixge/node-combined-stream" +"combined-stream@1.0.8","MIT","https://github.com/felixge/node-combined-stream" "commander@2.12.2","MIT","https://github.com/tj/commander.js" "commander@2.20.0","MIT","https://github.com/tj/commander.js" "commander@2.20.3","MIT","https://github.com/tj/commander.js" -"commander@4.1.0","MIT","https://github.com/tj/commander.js" +"commander@4.1.1","MIT","https://github.com/tj/commander.js" "common-tags@1.8.0","MIT","https://github.com/declandewet/common-tags" "commondir@1.0.1","MIT","https://github.com/substack/node-commondir" "compare-versions@3.5.1","MIT","https://github.com/omichelsen/compare-versions" "component-bind@1.0.0","MIT*","https://github.com/component/bind" "component-emitter@1.2.1","MIT","https://github.com/component/emitter" +"component-emitter@1.3.0","MIT","https://github.com/component/emitter" "component-inherit@0.0.3","MIT*","https://github.com/component/inherit" "compressible@2.0.18","MIT","https://github.com/jshttp/compressible" "compression@1.7.4","MIT","https://github.com/expressjs/compression" @@ -447,48 +474,65 @@ "cookie@0.4.0","MIT","https://github.com/jshttp/cookie" "copy-concurrently@1.0.5","ISC","https://github.com/npm/copy-concurrently" "copy-descriptor@0.1.1","MIT","https://github.com/jonschlinkert/copy-descriptor" -"copy-webpack-plugin@5.1.1","MIT","https://github.com/webpack-contrib/copy-webpack-plugin" +"copy-webpack-plugin@6.0.2","MIT","https://github.com/webpack-contrib/copy-webpack-plugin" "core-js-compat@3.2.1","MIT","https://github.com/zloirock/core-js" -"core-js-compat@3.6.4","MIT","https://github.com/zloirock/core-js" +"core-js-compat@3.6.5","MIT","https://github.com/zloirock/core-js" "core-js@3.2.1","MIT","https://github.com/zloirock/core-js" "core-js@3.6.4","MIT","https://github.com/zloirock/core-js" "core-util-is@1.0.2","MIT","https://github.com/isaacs/core-util-is" "cosmiconfig@5.2.1","MIT","https://github.com/davidtheclark/cosmiconfig" -"coverage-istanbul-loader@2.0.3","MIT","https://github.com/JS-DevTools/coverage-istanbul-loader" "create-ecdh@4.0.3","MIT","https://github.com/crypto-browserify/createECDH" "create-hash@1.2.0","MIT","https://github.com/crypto-browserify/createHash" "create-hmac@1.1.7","MIT","https://github.com/crypto-browserify/createHmac" "cross-spawn@6.0.5","MIT","https://github.com/moxystudio/node-cross-spawn" -"cross-spawn@7.0.1","MIT","https://github.com/moxystudio/node-cross-spawn" +"cross-spawn@7.0.3","MIT","https://github.com/moxystudio/node-cross-spawn" "crypto-browserify@3.12.0","MIT","https://github.com/crypto-browserify/crypto-browserify" -"css-parse@1.7.0","MIT","https://github.com/visionmedia/css-parse" -"css-selector-tokenizer@0.7.1","MIT","https://github.com/css-modules/css-selector-tokenizer" +"css-color-names@0.0.4","MIT","https://github.com/bahamas10/css-color-names" +"css-declaration-sorter@4.0.1","MIT","https://github.com/Siilwyn/css-declaration-sorter" +"css-loader@3.5.1","MIT","https://github.com/webpack-contrib/css-loader" +"css-parse@2.0.0","MIT","https://github.com/reworkcss/css-parse" +"css-select-base-adapter@0.1.1","MIT","https://github.com/nrkn/css-select-base-adapter" +"css-select@2.1.0","BSD-2-Clause","https://github.com/fb55/css-select" +"css-selector-tokenizer@0.7.2","MIT","https://github.com/css-modules/css-selector-tokenizer" +"css-tree@1.0.0-alpha.37","MIT","https://github.com/csstree/csstree" +"css-tree@1.0.0-alpha.39","MIT","https://github.com/csstree/csstree" +"css-what@3.3.0","BSD-2-Clause","https://github.com/fb55/css-what" +"css@2.2.4","MIT","https://github.com/reworkcss/css" "cssauron@1.4.0","MIT","https://github.com/chrisdickinson/cssauron" -"cssesc@0.1.0","MIT","https://github.com/mathiasbynens/cssesc" +"cssesc@3.0.0","MIT","https://github.com/mathiasbynens/cssesc" +"cssnano-preset-default@4.0.7","MIT","https://github.com/cssnano/cssnano" +"cssnano-util-get-arguments@4.0.0","MIT","https://github.com/cssnano/cssnano" +"cssnano-util-get-match@4.0.0","MIT","https://github.com/cssnano/cssnano" +"cssnano-util-raw-cache@4.0.1","MIT","https://github.com/cssnano/cssnano" +"cssnano-util-same-parent@4.0.1","MIT","https://github.com/cssnano/cssnano" +"cssnano@4.1.10","MIT","https://github.com/cssnano/cssnano" +"csso@4.0.3","MIT","https://github.com/css/csso" "custom-event@1.0.1","MIT","https://github.com/webmodules/custom-event" "cyclist@1.0.1","MIT","https://github.com/mafintosh/cyclist" -"cypress@4.0.1","MIT","https://github.com/cypress-io/cypress" +"cypress@5.0.0","MIT","https://github.com/cypress-io/cypress" "cytoscape-dagre@2.2.2","MIT","https://github.com/cytoscape/cytoscape.js-dagre" "cytoscape-popper@1.0.4","MIT","https://github.com/cytoscape/cytoscape.js-popper" "cytoscape@3.10.1","MIT","https://github.com/cytoscape/cytoscape.js" "dagre@0.8.4","MIT","https://github.com/dagrejs/dagre" -"damerau-levenshtein@1.0.5","BSD-2-Clause","https://github.com/tad-lispy/node-damerau-levenshtein" +"damerau-levenshtein@1.0.6","BSD-2-Clause","https://github.com/tad-lispy/node-damerau-levenshtein" "dashdash@1.14.1","MIT","https://github.com/trentm/node-dashdash" "date-fns@1.30.1","MIT","https://github.com/date-fns/date-fns" "date-format@2.1.0","MIT","https://github.com/nomiddlename/date-format" +"date-format@3.0.0","MIT","https://github.com/nomiddlename/date-format" "debug@2.6.9","MIT","https://github.com/visionmedia/debug" "debug@3.1.0","MIT","https://github.com/visionmedia/debug" "debug@3.2.6","MIT","https://github.com/visionmedia/debug" "debug@4.1.1","MIT","https://github.com/visionmedia/debug" +"debug@4.2.0","MIT","https://github.com/visionmedia/debug" "debuglog@1.0.1","MIT","https://github.com/sam-github/node-debuglog" "decamelize@1.2.0","MIT","https://github.com/sindresorhus/decamelize" "decamelize@2.0.0","MIT","https://github.com/sindresorhus/decamelize" "decode-uri-component@0.2.0","MIT","https://github.com/SamVerschueren/decode-uri-component" "dedent@0.7.0","MIT","https://github.com/dmnd/dedent" "deep-equal@1.1.1","MIT","https://github.com/substack/node-deep-equal" -"deep-extend@0.6.0","MIT","https://github.com/unclechu/node-deep-extend" "default-gateway@4.2.0","BSD-2-Clause","https://github.com/silverwind/default-gateway" "default-require-extensions@2.0.0","MIT","https://github.com/avajs/default-require-extensions" +"defaults@1.0.3","MIT","https://github.com/tmpvar/defaults" "define-properties@1.1.3","MIT","https://github.com/ljharb/define-properties" "define-property@0.2.5","MIT","https://github.com/jonschlinkert/define-property" "define-property@1.0.0","MIT","https://github.com/jonschlinkert/define-property" @@ -502,44 +546,51 @@ "dependency-graph@0.7.2","MIT","https://github.com/jriecken/dependency-graph" "des.js@1.0.1","MIT","https://github.com/indutny/des.js" "destroy@1.0.4","MIT","https://github.com/stream-utils/destroy" -"detect-libc@1.0.3","Apache-2.0","https://github.com/lovell/detect-libc" "detect-node@2.0.4","ISC","https://github.com/iliakan/detect-node" "dezalgo@1.0.3","ISC","https://github.com/npm/dezalgo" "di@0.0.1","MIT","https://github.com/vojtajina/node-di" "diff@4.0.1","BSD-3-Clause","https://github.com/kpdecker/jsdiff" "diffie-hellman@5.0.3","MIT","https://github.com/crypto-browserify/diffie-hellman" -"dir-glob@2.2.2","MIT","https://github.com/kevva/dir-glob" "dir-glob@3.0.1","MIT","https://github.com/kevva/dir-glob" "dns-equal@1.0.0","MIT","https://github.com/watson/dns-equal" "dns-packet@1.3.1","MIT","https://github.com/mafintosh/dns-packet" "dns-txt@2.0.2","MIT","https://github.com/watson/dns-txt" "dom-serialize@2.2.1","MIT","https://github.com/webmodules/dom-serialize" +"dom-serializer@0.2.2","MIT","https://github.com/cheeriojs/dom-renderer" "domain-browser@1.2.0","MIT","https://github.com/bevry/domain-browser" -"domino@2.1.3","BSD-2-Clause","https://github.com/fgnass/domino" +"domelementtype@1.3.1","BSD-2-Clause","https://github.com/fb55/domelementtype" +"domelementtype@2.0.1","BSD-2-Clause","https://github.com/fb55/domelementtype" +"domino@2.1.5","BSD-2-Clause","https://github.com/fgnass/domino" +"dompurify@2.2.0","MPL-2.0 OR Apache-2.0","https://github.com/cure53/DOMPurify" +"domutils@1.7.0","BSD-2-Clause","https://github.com/FB55/domutils" +"dot-prop@5.2.0","MIT","https://github.com/sindresorhus/dot-prop" "duplexify@3.7.1","MIT","https://github.com/mafintosh/duplexify" "ecc-jsbn@0.1.2","MIT","https://github.com/quartzjer/ecc-jsbn" "ee-first@1.1.1","MIT","https://github.com/jonathanong/ee-first" "elasticsearch-browser@15.0.0","Apache-2.0","https://github.com/elasticsearch/bower-elasticsearch-js" "electron-to-chromium@1.3.263","ISC","https://github.com/kilian/electron-to-chromium" -"electron-to-chromium@1.3.368","ISC","https://github.com/kilian/electron-to-chromium" +"electron-to-chromium@1.3.481","ISC","https://github.com/kilian/electron-to-chromium" "elegant-spinner@1.0.1","MIT","https://github.com/sindresorhus/elegant-spinner" -"elliptic@6.5.2","MIT","https://github.com/indutny/elliptic" +"elliptic@6.5.3","MIT","https://github.com/indutny/elliptic" "emoji-regex@7.0.3","MIT","https://github.com/mathiasbynens/emoji-regex" "emoji-regex@8.0.0","MIT","https://github.com/mathiasbynens/emoji-regex" +"emoji-toolkit@5.5.1","(MIT)","https://github.com/joypixels/emoji-toolkit" "emojis-list@2.1.0","MIT","https://github.com/kikobeats/emojis-list" "emojis-list@3.0.0","MIT","https://github.com/kikobeats/emojis-list" "encodeurl@1.0.2","MIT","https://github.com/pillarjs/encodeurl" "encoding@0.1.12","MIT","https://github.com/andris9/encoding" "end-of-stream@1.4.1","MIT","https://github.com/mafintosh/end-of-stream" -"engine.io-client@3.2.1","MIT","https://github.com/socketio/engine.io-client" -"engine.io-parser@2.1.3","MIT","https://github.com/socketio/engine.io-parser" -"engine.io@3.2.1","MIT","https://github.com/socketio/engine.io" +"engine.io-client@3.4.3","MIT","https://github.com/socketio/engine.io-client" +"engine.io-parser@2.2.0","MIT","https://github.com/socketio/engine.io-parser" +"engine.io@3.4.2","MIT","https://github.com/socketio/engine.io" "enhanced-resolve@4.1.0","MIT","https://github.com/webpack/enhanced-resolve" +"enhanced-resolve@4.1.1","MIT","https://github.com/webpack/enhanced-resolve" "ent@2.2.0","MIT","https://github.com/substack/node-ent" +"entities@2.0.3","BSD-2-Clause","https://github.com/fb55/entities" "err-code@1.1.2","MIT","https://github.com/IndigoUnited/js-err-code" "errno@0.1.7","MIT","https://github.com/rvagg/node-errno" "error-ex@1.3.1","MIT","https://github.com/qix-/node-error-ex" -"es-abstract@1.17.4","MIT","https://github.com/ljharb/es-abstract" +"es-abstract@1.17.6","MIT","https://github.com/ljharb/es-abstract" "es-to-primitive@1.2.1","MIT","https://github.com/ljharb/es-to-primitive" "es6-promise@4.2.8","MIT","https://github.com/stefanpenner/es6-promise" "es6-promisify@5.0.0","MIT","https://github.com/digitaldesignlabs/es6-promisify" @@ -552,14 +603,14 @@ "estraverse@4.3.0","BSD-2-Clause","https://github.com/estools/estraverse" "esutils@2.0.2","BSD","https://github.com/estools/esutils" "etag@1.8.1","MIT","https://github.com/jshttp/etag" -"eventemitter2@4.1.2","MIT","https://github.com/hij1nx/EventEmitter2" +"eventemitter2@6.4.3","MIT","https://github.com/hij1nx/EventEmitter2" "eventemitter3@4.0.0","MIT","https://github.com/primus/eventemitter3" "events@3.1.0","MIT","https://github.com/Gozala/events" "eventsource@1.0.7","MIT","https://github.com/EventSource/eventsource" "evp_bytestokey@1.0.3","MIT","https://github.com/crypto-browserify/EVP_BytesToKey" "execa@1.0.0","MIT","https://github.com/sindresorhus/execa" "execa@2.0.4","MIT","https://github.com/sindresorhus/execa" -"execa@3.3.0","MIT","https://github.com/sindresorhus/execa" +"execa@4.0.3","MIT","https://github.com/sindresorhus/execa" "executable@4.1.1","MIT","https://github.com/kevva/executable" "exit-hook@1.1.1","MIT","https://github.com/sindresorhus/exit-hook" "expand-brackets@2.1.4","MIT","https://github.com/jonschlinkert/expand-brackets" @@ -569,33 +620,36 @@ "extend@3.0.2","MIT","https://github.com/justmoon/node-extend" "external-editor@3.1.0","MIT","https://github.com/mrkmg/node-external-editor" "extglob@2.0.4","MIT","https://github.com/micromatch/extglob" -"extract-zip@1.6.7","BSD-2-Clause","https://github.com/maxogden/extract-zip" +"extract-zip@1.7.0","BSD-2-Clause","https://github.com/maxogden/extract-zip" "extsprintf@1.3.0","MIT","https://github.com/davepacheco/node-extsprintf" "fast-deep-equal@1.1.0","MIT","https://github.com/epoberezkin/fast-deep-equal" "fast-deep-equal@2.0.1","MIT","https://github.com/epoberezkin/fast-deep-equal" -"fast-deep-equal@3.1.1","MIT","https://github.com/epoberezkin/fast-deep-equal" +"fast-deep-equal@3.1.3","MIT","https://github.com/epoberezkin/fast-deep-equal" "fast-glob@3.0.4","MIT","https://github.com/mrmlnc/fast-glob" +"fast-glob@3.2.4","MIT","https://github.com/mrmlnc/fast-glob" "fast-json-stable-stringify@2.0.0","MIT","https://github.com/epoberezkin/fast-json-stable-stringify" +"fast-json-stable-stringify@2.1.0","MIT","https://github.com/epoberezkin/fast-json-stable-stringify" "fastparse@1.1.2","MIT","https://github.com/webpack/fastparse" "fastq@1.6.0","ISC","https://github.com/mcollina/fastq" "faye-websocket@0.10.0","MIT","https://github.com/faye/faye-websocket-node" "faye-websocket@0.11.3","Apache-2.0","https://github.com/faye/faye-websocket-node" -"fd-slicer@1.0.1","MIT","https://github.com/andrewrk/node-fd-slicer" "fd-slicer@1.1.0","MIT","https://github.com/andrewrk/node-fd-slicer" -"figgy-pudding@3.5.1","ISC","https://github.com/zkat/figgy-pudding" +"figgy-pudding@3.5.2","ISC","https://github.com/npm/figgy-pudding" "figures@1.7.0","MIT","https://github.com/sindresorhus/figures" "figures@2.0.0","MIT","https://github.com/sindresorhus/figures" "figures@3.2.0","MIT","https://github.com/sindresorhus/figures" -"file-loader@4.2.0","MIT","https://github.com/webpack-contrib/file-loader" +"file-loader@6.0.0","MIT","https://github.com/webpack-contrib/file-loader" +"file-uri-to-path@1.0.0","MIT","https://github.com/TooTallNate/file-uri-to-path" "fileset@2.0.3","MIT","https://github.com/mklabs/node-fileset" "fill-range@4.0.0","MIT","https://github.com/jonschlinkert/fill-range" "fill-range@7.0.1","MIT","https://github.com/jonschlinkert/fill-range" "finalhandler@1.1.2","MIT","https://github.com/pillarjs/finalhandler" "find-cache-dir@2.1.0","MIT","https://github.com/avajs/find-cache-dir" -"find-cache-dir@3.0.0","MIT","https://github.com/avajs/find-cache-dir" +"find-cache-dir@3.3.1","MIT","https://github.com/avajs/find-cache-dir" +"find-up@2.1.0","MIT","https://github.com/sindresorhus/find-up" "find-up@3.0.0","MIT","https://github.com/sindresorhus/find-up" "find-up@4.1.0","MIT","https://github.com/sindresorhus/find-up" -"flatted@2.0.1","ISC","https://github.com/WebReflection/flatted" +"flatted@2.0.2","ISC","https://github.com/WebReflection/flatted" "flush-write-stream@1.1.1","MIT","https://github.com/mafintosh/flush-write-stream" "follow-redirects@1.9.0","MIT","https://github.com/follow-redirects/follow-redirects" "font-awesome@4.7.0","(OFL-1.1 AND MIT)","https://github.com/FortAwesome/Font-Awesome" @@ -606,49 +660,51 @@ "fragment-cache@0.2.1","MIT","https://github.com/jonschlinkert/fragment-cache" "fresh@0.5.2","MIT","https://github.com/jshttp/fresh" "from2@2.3.0","MIT","https://github.com/hughsk/from2" -"fs-extra@7.0.1","MIT","https://github.com/jprichardson/node-fs-extra" +"fs-extra@4.0.2","MIT","https://github.com/jprichardson/node-fs-extra" "fs-extra@8.1.0","MIT","https://github.com/jprichardson/node-fs-extra" -"fs-minipass@1.2.5","ISC","https://github.com/npm/fs-minipass" +"fs-extra@9.0.1","MIT","https://github.com/jprichardson/node-fs-extra" "fs-minipass@1.2.7","ISC","https://github.com/npm/fs-minipass" +"fs-minipass@2.1.0","ISC","https://github.com/npm/fs-minipass" "fs-write-stream-atomic@1.0.10","ISC","https://github.com/npm/fs-write-stream-atomic" "fs.realpath@1.0.0","ISC","https://github.com/isaacs/fs.realpath" -"fsevents@1.2.7","MIT","https://github.com/strongloop/fsevents" +"fsevents@1.2.13","MIT","https://github.com/strongloop/fsevents" "fsevents@2.0.7","MIT","https://github.com/fsevents/fsevents" +"fsevents@2.1.3","MIT","https://github.com/fsevents/fsevents" "function-bind@1.1.1","MIT","https://github.com/Raynos/function-bind" "gauge@2.7.4","ISC","https://github.com/iarna/gauge" "genfun@5.0.0","MIT","https://github.com/zkat/genfun" "gensync@1.0.0-beta.1","MIT","" -"get-caller-file@1.0.3","ISC","https://github.com/stefanpenner/get-caller-file" "get-caller-file@2.0.5","ISC","https://github.com/stefanpenner/get-caller-file" "get-own-enumerable-property-symbols@3.0.0","ISC","https://github.com/mightyiam/get-own-enumerable-property-symbols" "get-stdin@7.0.0","MIT","https://github.com/sindresorhus/get-stdin" "get-stream@4.1.0","MIT","https://github.com/sindresorhus/get-stream" "get-stream@5.1.0","MIT","https://github.com/sindresorhus/get-stream" +"get-stream@5.2.0","MIT","https://github.com/sindresorhus/get-stream" "get-value@2.0.6","MIT","https://github.com/jonschlinkert/get-value" -"getos@3.1.4","MIT","https://github.com/retrohacker/getos" +"getos@3.2.1","MIT","https://github.com/retrohacker/getos" "getpass@0.1.7","MIT","https://github.com/arekinath/node-getpass" "glob-parent@3.1.0","ISC","https://github.com/es128/glob-parent" "glob-parent@5.1.0","ISC","https://github.com/gulpjs/glob-parent" -"glob@7.0.6","ISC","https://github.com/isaacs/node-glob" +"glob-parent@5.1.1","ISC","https://github.com/gulpjs/glob-parent" "glob@7.1.2","ISC","https://github.com/isaacs/node-glob" -"glob@7.1.3","ISC","https://github.com/isaacs/node-glob" "glob@7.1.4","ISC","https://github.com/isaacs/node-glob" "glob@7.1.6","ISC","https://github.com/isaacs/node-glob" -"global-dirs@0.1.1","MIT","https://github.com/sindresorhus/global-dirs" +"global-dirs@2.0.1","MIT","https://github.com/sindresorhus/global-dirs" "globals@11.11.0","MIT","https://github.com/sindresorhus/globals" "globals@11.12.0","MIT","https://github.com/sindresorhus/globals" "globby@10.0.1","MIT","https://github.com/sindresorhus/globby" +"globby@11.0.1","MIT","https://github.com/sindresorhus/globby" "globby@6.1.0","MIT","https://github.com/sindresorhus/globby" -"globby@7.1.1","MIT","https://github.com/sindresorhus/globby" "good-listener@1.2.2","MIT","https://github.com/zenorocha/good-listener" "graceful-fs@4.1.11","ISC","https://github.com/isaacs/node-graceful-fs" "graceful-fs@4.2.2","ISC","https://github.com/isaacs/node-graceful-fs" -"graceful-fs@4.2.3","ISC","https://github.com/isaacs/node-graceful-fs" +"graceful-fs@4.2.4","ISC","https://github.com/isaacs/node-graceful-fs" "graphlib@2.1.7","MIT","https://github.com/dagrejs/graphlib" -"handle-thing@2.0.0","MIT","https://github.com/indutny/handle-thing" -"handlebars@4.3.1","MIT","https://github.com/wycats/handlebars.js" +"handle-thing@2.0.1","MIT","https://github.com/indutny/handle-thing" +"handlebars@4.7.6","MIT","https://github.com/wycats/handlebars.js" "har-schema@2.0.0","ISC","https://github.com/ahmadnassri/har-schema" "har-validator@5.1.0","ISC","https://github.com/ahmadnassri/har-validator" +"har-validator@5.1.5","MIT","https://github.com/ahmadnassri/node-har-validator" "has-ansi@2.0.0","MIT","https://github.com/sindresorhus/has-ansi" "has-binary2@1.0.3","MIT","" "has-cors@1.1.0","MIT","https://github.com/component/has-cors" @@ -663,21 +719,25 @@ "has-values@0.1.4","MIT","https://github.com/jonschlinkert/has-values" "has-values@1.0.0","MIT","https://github.com/jonschlinkert/has-values" "has@1.0.3","MIT","https://github.com/tarruda/has" -"hash-base@3.0.4","MIT","https://github.com/crypto-browserify/hash-base" +"hash-base@3.1.0","MIT","https://github.com/crypto-browserify/hash-base" "hash.js@1.1.7","MIT","https://github.com/indutny/hash.js" "heap@0.2.6","PSF","https://github.com/qiao/heap.js" +"hex-color-regex@1.1.0","MIT","https://github.com/regexps/hex-color-regex" "hmac-drbg@1.0.1","MIT","https://github.com/indutny/hmac-drbg" "hosted-git-info@2.6.0","ISC","https://github.com/npm/hosted-git-info" +"hosted-git-info@3.0.4","ISC","https://github.com/npm/hosted-git-info" "hpack.js@2.1.6","MIT","https://github.com/indutny/hpack.js" -"html-entities@1.2.1","MIT","https://github.com/mdevils/node-html-entities" +"hsl-regex@1.0.0","MIT","https://github.com/regexps/hsl-regex" +"hsla-regex@1.0.0","MIT","https://github.com/regexps/hsla-regex" +"html-comment-regex@1.1.2","MIT","https://github.com/stevemao/html-comment-regex" +"html-entities@1.3.1","MIT","https://github.com/mdevils/node-html-entities" "http-cache-semantics@3.8.1","BSD-2-Clause","https://github.com/pornel/http-cache-semantics" "http-deceiver@1.2.7","MIT","https://github.com/indutny/http-deceiver" "http-errors@1.6.3","MIT","https://github.com/jshttp/http-errors" "http-errors@1.7.2","MIT","https://github.com/jshttp/http-errors" -"http-parser-js@0.4.10","MIT","https://github.com/creationix/http-parser-js" "http-proxy-agent@2.1.0","MIT","https://github.com/TooTallNate/node-http-proxy-agent" "http-proxy-middleware@0.19.1","MIT","https://github.com/chimurai/http-proxy-middleware" -"http-proxy@1.18.0","MIT","https://github.com/http-party/node-http-proxy" +"http-proxy@1.18.1","MIT","https://github.com/http-party/node-http-proxy" "http-signature@1.2.0","MIT","https://github.com/joyent/node-http-signature" "https-browserify@1.0.0","MIT","https://github.com/substack/https-browserify" "https-proxy-agent@2.2.4","MIT","https://github.com/TooTallNate/node-https-proxy-agent" @@ -685,52 +745,55 @@ "humanize-ms@1.2.1","MIT","https://github.com/node-modules/humanize-ms" "husky@3.0.5","MIT","https://github.com/typicode/husky" "iconv-lite@0.4.24","MIT","https://github.com/ashtuchkin/iconv-lite" +"icss-utils@4.1.1","ISC","https://github.com/css-modules/icss-utils" "ieee754@1.1.13","BSD-3-Clause","https://github.com/feross/ieee754" "iferr@0.1.5","MIT","https://github.com/shesek/iferr" -"ignore-walk@3.0.1","ISC","https://github.com/isaacs/ignore-walk" "ignore-walk@3.0.3","ISC","https://github.com/isaacs/ignore-walk" -"ignore@3.3.10","MIT","https://github.com/kaelzhang/node-ignore" "ignore@5.1.4","MIT","https://github.com/kaelzhang/node-ignore" +"ignore@5.1.8","MIT","https://github.com/kaelzhang/node-ignore" "image-size@0.5.5","MIT","https://github.com/image-size/image-size" -"immediate@3.0.6","MIT","https://github.com/calvinmetcalf/immediate" "import-cwd@2.1.0","MIT","https://github.com/sindresorhus/import-cwd" "import-fresh@2.0.0","MIT","https://github.com/sindresorhus/import-fresh" "import-from@2.1.0","MIT","https://github.com/sindresorhus/import-from" "import-local@2.0.0","MIT","https://github.com/sindresorhus/import-local" "imurmurhash@0.1.4","MIT","https://github.com/jensyt/imurmurhash-js" "indent-string@3.2.0","MIT","https://github.com/sindresorhus/indent-string" +"indexes-of@1.0.1","MIT","https://github.com/dominictarr/indexes-of" "indexof@0.0.1","MIT*","" "infer-owner@1.0.4","ISC","https://github.com/npm/infer-owner" "inflight@1.0.6","ISC","https://github.com/npm/inflight" "inherits@2.0.1","ISC","https://github.com/isaacs/inherits" "inherits@2.0.3","ISC","https://github.com/isaacs/inherits" +"inherits@2.0.4","ISC","https://github.com/isaacs/inherits" "ini@1.3.5","ISC","https://github.com/isaacs/ini" -"inquirer@6.5.1","MIT","https://github.com/SBoudrias/Inquirer.js" +"inquirer@7.1.0","MIT","https://github.com/SBoudrias/Inquirer.js" "internal-ip@4.3.0","MIT","https://github.com/sindresorhus/internal-ip" "invariant@2.2.2","BSD-3-Clause","https://github.com/zertosh/invariant" "invariant@2.2.4","MIT","https://github.com/zertosh/invariant" -"invert-kv@2.0.0","MIT","https://github.com/sindresorhus/invert-kv" "ip-regex@2.1.0","MIT","https://github.com/sindresorhus/ip-regex" "ip@1.1.5","MIT","https://github.com/indutny/node-ip" "ipaddr.js@1.9.1","MIT","https://github.com/whitequark/ipaddr.js" +"is-absolute-url@2.1.0","MIT","https://github.com/sindresorhus/is-absolute-url" "is-absolute-url@3.0.3","MIT","https://github.com/sindresorhus/is-absolute-url" "is-accessor-descriptor@0.1.6","MIT","https://github.com/jonschlinkert/is-accessor-descriptor" "is-accessor-descriptor@1.0.0","MIT","https://github.com/jonschlinkert/is-accessor-descriptor" "is-arguments@1.0.4","MIT","https://github.com/ljharb/is-arguments" "is-arrayish@0.2.1","MIT","https://github.com/qix-/node-is-arrayish" +"is-arrayish@0.3.2","MIT","https://github.com/qix-/node-is-arrayish" "is-binary-path@1.0.1","MIT","https://github.com/sindresorhus/is-binary-path" "is-binary-path@2.1.0","MIT","https://github.com/sindresorhus/is-binary-path" "is-buffer@1.1.6","MIT","https://github.com/feross/is-buffer" "is-builtin-module@1.0.0","MIT","https://github.com/sindresorhus/is-builtin-module" -"is-callable@1.1.4","MIT","https://github.com/ljharb/is-callable" -"is-callable@1.1.5","MIT","https://github.com/ljharb/is-callable" +"is-callable@1.2.0","MIT","https://github.com/ljharb/is-callable" "is-ci@2.0.0","MIT","https://github.com/watson/is-ci" +"is-color-stop@1.1.0","MIT","https://github.com/pigcan/is-color-stop" "is-data-descriptor@0.1.4","MIT","https://github.com/jonschlinkert/is-data-descriptor" "is-data-descriptor@1.0.0","MIT","https://github.com/jonschlinkert/is-data-descriptor" -"is-date-object@1.0.1","MIT","https://github.com/ljharb/is-date-object" +"is-date-object@1.0.2","MIT","https://github.com/ljharb/is-date-object" "is-descriptor@0.1.6","MIT","https://github.com/jonschlinkert/is-descriptor" "is-descriptor@1.0.2","MIT","https://github.com/jonschlinkert/is-descriptor" "is-directory@0.3.1","MIT","https://github.com/jonschlinkert/is-directory" +"is-docker@2.0.0","MIT","https://github.com/sindresorhus/is-docker" "is-extendable@0.1.1","MIT","https://github.com/jonschlinkert/is-extendable" "is-extendable@1.0.1","MIT","https://github.com/jonschlinkert/is-extendable" "is-extglob@2.1.1","MIT","https://github.com/jonschlinkert/is-extglob" @@ -739,32 +802,36 @@ "is-fullwidth-code-point@3.0.0","MIT","https://github.com/sindresorhus/is-fullwidth-code-point" "is-glob@3.1.0","MIT","https://github.com/jonschlinkert/is-glob" "is-glob@4.0.1","MIT","https://github.com/micromatch/is-glob" -"is-installed-globally@0.1.0","MIT","https://github.com/sindresorhus/is-installed-globally" +"is-installed-globally@0.3.2","MIT","https://github.com/sindresorhus/is-installed-globally" +"is-interactive@1.0.0","MIT","https://github.com/sindresorhus/is-interactive" "is-number@3.0.0","MIT","https://github.com/jonschlinkert/is-number" "is-number@4.0.0","MIT","https://github.com/jonschlinkert/is-number" "is-number@7.0.0","MIT","https://github.com/jonschlinkert/is-number" "is-obj@1.0.1","MIT","https://github.com/sindresorhus/is-obj" +"is-obj@2.0.0","MIT","https://github.com/sindresorhus/is-obj" "is-observable@1.1.0","MIT","https://github.com/sindresorhus/is-observable" "is-odd@2.0.0","MIT","https://github.com/jonschlinkert/is-odd" "is-path-cwd@2.2.0","MIT","https://github.com/sindresorhus/is-path-cwd" "is-path-in-cwd@2.1.0","MIT","https://github.com/sindresorhus/is-path-in-cwd" -"is-path-inside@1.0.1","MIT","https://github.com/sindresorhus/is-path-inside" "is-path-inside@2.1.0","MIT","https://github.com/sindresorhus/is-path-inside" "is-path-inside@3.0.1","MIT","https://github.com/sindresorhus/is-path-inside" "is-plain-obj@1.1.0","MIT","https://github.com/sindresorhus/is-plain-obj" "is-plain-object@2.0.4","MIT","https://github.com/jonschlinkert/is-plain-object" "is-promise@2.1.0","MIT","https://github.com/then/is-promise" -"is-regex@1.0.5","MIT","https://github.com/ljharb/is-regex" +"is-regex@1.1.0","MIT","https://github.com/ljharb/is-regex" "is-regexp@1.0.0","MIT","https://github.com/sindresorhus/is-regexp" +"is-resolvable@1.1.0","ISC","https://github.com/shinnn/is-resolvable" "is-stream@1.1.0","MIT","https://github.com/sindresorhus/is-stream" "is-stream@2.0.0","MIT","https://github.com/sindresorhus/is-stream" -"is-symbol@1.0.2","MIT","https://github.com/ljharb/is-symbol" +"is-svg@3.0.0","MIT","https://github.com/sindresorhus/is-svg" +"is-symbol@1.0.3","MIT","https://github.com/inspect-js/is-symbol" "is-typedarray@1.0.0","MIT","https://github.com/hughsk/is-typedarray" "is-windows@1.0.2","MIT","https://github.com/jonschlinkert/is-windows" "is-wsl@1.1.0","MIT","https://github.com/sindresorhus/is-wsl" +"is-wsl@2.2.0","MIT","https://github.com/sindresorhus/is-wsl" "isarray@1.0.0","MIT","https://github.com/juliangruber/isarray" "isarray@2.0.1","MIT","https://github.com/juliangruber/isarray" -"isbinaryfile@3.0.3","MIT","https://github.com/gjtorikian/isBinaryFile" +"isbinaryfile@4.0.6","MIT","https://github.com/gjtorikian/isBinaryFile" "isexe@2.0.0","ISC","https://github.com/isaacs/isexe" "isobject@2.1.0","MIT","https://github.com/jonschlinkert/isobject" "isobject@3.0.1","MIT","https://github.com/jonschlinkert/isobject" @@ -774,14 +841,15 @@ "istanbul-lib-coverage@3.0.0","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-hook@2.0.7","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-instrument@3.3.0","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" -"istanbul-lib-instrument@4.0.1","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" +"istanbul-lib-instrument@4.0.3","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-report@2.0.8","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-source-maps@3.0.6","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-reports@2.2.6","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "jasmine-core@3.5.0","MIT","https://github.com/jasmine/jasmine" "jasmine-spec-reporter@4.2.1","Apache-2.0","https://github.com/bcaudan/jasmine-spec-reporter" -"jest-worker@24.9.0","MIT","https://github.com/facebook/jest" -"jquery@3.4.0","MIT","https://github.com/jquery/jquery" +"jest-worker@25.1.0","MIT","https://github.com/facebook/jest" +"jest-worker@26.1.0","MIT","https://github.com/facebook/jest" +"jquery@3.5.1","MIT","https://github.com/jquery/jquery" "js-levenshtein@1.1.6","MIT","https://github.com/gustf/js-levenshtein" "js-tokens@3.0.2","MIT","https://github.com/lydell/js-tokens" "js-tokens@4.0.0","MIT","https://github.com/lydell/js-tokens" @@ -798,18 +866,19 @@ "json5@0.5.1","MIT","https://github.com/aseemk/json5" "json5@1.0.1","MIT","https://github.com/json5/json5" "json5@2.1.0","MIT","https://github.com/json5/json5" -"json5@2.1.1","MIT","https://github.com/json5/json5" +"json5@2.1.3","MIT","https://github.com/json5/json5" "jsonfile@4.0.0","MIT","https://github.com/jprichardson/node-jsonfile" +"jsonfile@6.0.1","MIT","https://github.com/jprichardson/node-jsonfile" "jsonparse@1.3.1","MIT","https://github.com/creationix/jsonparse" "jsprim@1.4.1","MIT","https://github.com/joyent/node-jsprim" -"jszip@3.2.2","(MIT OR GPL-3.0)","https://github.com/Stuk/jszip" "karma-chrome-launcher@3.1.0","MIT","https://github.com/karma-runner/karma-chrome-launcher" "karma-coverage-istanbul-reporter@2.1.0","MIT","https://github.com/mattlewis92/karma-coverage-istanbul-reporter" "karma-jasmine-html-reporter@1.4.2","MIT","https://github.com/dfederm/karma-jasmine-html-reporter" "karma-jasmine@2.0.1","MIT","https://github.com/karma-runner/karma-jasmine" "karma-source-map-support@1.4.0","MIT","https://github.com/tschaub/karma-source-map-support" "karma-spec-reporter@0.0.32","MIT","https://github.com/mlex/karma-spec-reporter" -"karma@4.4.1","MIT","https://github.com/karma-runner/karma" +"karma@5.2.2","MIT","https://github.com/karma-runner/karma" +"katex@0.11.1","MIT","https://github.com/KaTeX/KaTeX" "killable@1.0.1","ISC","https://github.com/marten-de-vries/killable" "kind-of@3.2.2","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@4.0.0","MIT","https://github.com/jonschlinkert/kind-of" @@ -817,14 +886,12 @@ "kind-of@6.0.2","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@6.0.3","MIT","https://github.com/jonschlinkert/kind-of" "lazy-ass@1.6.0","MIT","https://github.com/bahmutov/lazy-ass" -"lcid@2.0.0","MIT","https://github.com/sindresorhus/lcid" "less-loader@5.0.0","MIT","https://github.com/webpack-contrib/less-loader" -"less@3.9.0","Apache-2.0","https://github.com/less/less.js" +"less@3.11.3","Apache-2.0","https://github.com/less/less.js" "leven@3.1.0","MIT","https://github.com/sindresorhus/leven" "levenary@1.1.1","MIT","https://github.com/tanhauhau/levenary" "license-checker@25.0.1","BSD-3-Clause","https://github.com/davglass/license-checker" -"license-webpack-plugin@2.1.2","ISC","https://github.com/xz64/license-webpack-plugin" -"lie@3.3.0","MIT","https://github.com/calvinmetcalf/lie" +"license-webpack-plugin@2.1.4","ISC","https://github.com/xz64/license-webpack-plugin" "lines-and-columns@1.1.6","MIT","https://github.com/eventualbuddha/lines-and-columns" "lint-staged@9.4.0","MIT","https://github.com/okonet/lint-staged" "listr-silent-renderer@1.1.1","MIT","https://github.com/SamVerschueren/listr-silent-renderer" @@ -833,37 +900,41 @@ "listr@0.14.3","MIT","https://github.com/SamVerschueren/listr" "loader-runner@2.4.0","MIT","https://github.com/webpack/loader-runner" "loader-utils@1.1.0","MIT","https://github.com/webpack/loader-utils" -"loader-utils@1.2.3","MIT","https://github.com/webpack/loader-utils" "loader-utils@1.4.0","MIT","https://github.com/webpack/loader-utils" +"loader-utils@2.0.0","MIT","https://github.com/webpack/loader-utils" +"locate-path@2.0.0","MIT","https://github.com/sindresorhus/locate-path" "locate-path@3.0.0","MIT","https://github.com/sindresorhus/locate-path" "locate-path@5.0.0","MIT","https://github.com/sindresorhus/locate-path" "lodash.clonedeep@4.5.0","MIT","https://github.com/lodash/lodash" "lodash.debounce@4.0.8","MIT","https://github.com/lodash/lodash" +"lodash.memoize@4.1.2","MIT","https://github.com/lodash/lodash" "lodash.once@4.1.1","MIT","https://github.com/lodash/lodash" -"lodash@3.10.1","MIT","https://github.com/lodash/lodash" -"lodash@4.17.15","MIT","https://github.com/lodash/lodash" +"lodash.uniq@4.5.0","MIT","https://github.com/lodash/lodash" +"lodash@4.17.20","MIT","https://github.com/lodash/lodash" "log-symbols@1.0.2","MIT","https://github.com/sindresorhus/log-symbols" "log-symbols@3.0.0","MIT","https://github.com/sindresorhus/log-symbols" +"log-symbols@4.0.0","MIT","https://github.com/sindresorhus/log-symbols" "log-update@2.3.0","MIT","https://github.com/sindresorhus/log-update" -"log4js@4.5.1","Apache-2.0","https://github.com/log4js-node/log4js-node" -"loglevel@1.6.7","MIT","https://github.com/pimterry/loglevel" +"log4js@6.3.0","Apache-2.0","https://github.com/log4js-node/log4js-node" +"loglevel@1.6.8","MIT","https://github.com/pimterry/loglevel" "loose-envify@1.3.1","MIT","https://github.com/zertosh/loose-envify" -"lru-cache@4.1.5","ISC","https://github.com/isaacs/node-lru-cache" "lru-cache@5.1.1","ISC","https://github.com/isaacs/node-lru-cache" -"magic-string@0.25.3","MIT","https://github.com/rich-harris/magic-string" +"magic-string@0.25.7","MIT","https://github.com/rich-harris/magic-string" "make-dir@2.1.0","MIT","https://github.com/sindresorhus/make-dir" -"make-dir@3.0.2","MIT","https://github.com/sindresorhus/make-dir" +"make-dir@3.1.0","MIT","https://github.com/sindresorhus/make-dir" "make-error@1.3.5","ISC","https://github.com/JsCommunity/make-error" "make-fetch-happen@5.0.2","ISC","https://github.com/zkat/make-fetch-happen" "mamacro@0.0.3","MIT","" -"map-age-cleaner@0.1.3","MIT","https://github.com/SamVerschueren/map-age-cleaner" "map-cache@0.2.2","MIT","https://github.com/jonschlinkert/map-cache" "map-visit@1.0.0","MIT","https://github.com/jonschlinkert/map-visit" -"marked@0.7.0","MIT","https://github.com/markedjs/marked" +"marked@1.1.0","MIT","https://github.com/markedjs/marked" +"material-design-icons-iconfont@6.1.0","Apache-2.0","https://github.com/jossef/material-design-icons-iconfont" "md5.js@1.3.5","MIT","https://github.com/crypto-browserify/md5.js" +"mdn-data@2.0.4","CC0-1.0","https://github.com/mdn/data" +"mdn-data@2.0.6","CC0-1.0","https://github.com/mdn/data" "media-typer@0.3.0","MIT","https://github.com/jshttp/media-typer" -"mem@4.3.0","MIT","https://github.com/sindresorhus/mem" "memory-fs@0.4.1","MIT","https://github.com/webpack/memory-fs" +"memory-fs@0.5.0","MIT","https://github.com/webpack/memory-fs" "merge-descriptors@1.0.1","MIT","https://github.com/component/merge-descriptors" "merge-source-map@1.1.0","MIT","https://github.com/keik/merge-source-map" "merge-stream@2.0.0","MIT","https://github.com/grncdr/merge-stream" @@ -875,28 +946,31 @@ "mime-db@1.33.0","MIT","https://github.com/jshttp/mime-db" "mime-db@1.37.0","MIT","https://github.com/jshttp/mime-db" "mime-db@1.40.0","MIT","https://github.com/jshttp/mime-db" -"mime-db@1.43.0","MIT","https://github.com/jshttp/mime-db" +"mime-db@1.44.0","MIT","https://github.com/jshttp/mime-db" "mime-types@2.1.18","MIT","https://github.com/jshttp/mime-types" "mime-types@2.1.21","MIT","https://github.com/jshttp/mime-types" "mime-types@2.1.24","MIT","https://github.com/jshttp/mime-types" "mime@1.6.0","MIT","https://github.com/broofa/node-mime" -"mime@2.4.4","MIT","https://github.com/broofa/node-mime" +"mime@2.4.6","MIT","https://github.com/broofa/mime" "mimic-fn@1.2.0","MIT","https://github.com/sindresorhus/mimic-fn" "mimic-fn@2.1.0","MIT","https://github.com/sindresorhus/mimic-fn" -"mini-css-extract-plugin@0.8.0","MIT","https://github.com/webpack-contrib/mini-css-extract-plugin" +"mini-css-extract-plugin@0.9.0","MIT","https://github.com/webpack-contrib/mini-css-extract-plugin" "minimalistic-assert@1.0.1","ISC","https://github.com/calvinmetcalf/minimalistic-assert" "minimalistic-crypto-utils@1.0.1","MIT","https://github.com/indutny/minimalistic-crypto-utils" "minimatch@3.0.4","ISC","https://github.com/isaacs/minimatch" -"minimist@0.0.8","MIT","https://github.com/substack/minimist" -"minimist@1.2.0","MIT","https://github.com/substack/minimist" -"minipass@2.3.5","ISC","https://github.com/isaacs/minipass" +"minimist@1.2.5","MIT","https://github.com/substack/minimist" +"minipass-collect@1.0.2","ISC","" +"minipass-flush@1.0.5","ISC","https://github.com/isaacs/minipass-flush" +"minipass-pipeline@1.2.3","ISC","" "minipass@2.9.0","ISC","https://github.com/isaacs/minipass" -"minizlib@1.2.1","MIT","https://github.com/isaacs/minizlib" +"minipass@3.1.3","ISC","https://github.com/isaacs/minipass" "minizlib@1.3.3","MIT","https://github.com/isaacs/minizlib" +"minizlib@2.1.0","MIT","https://github.com/isaacs/minizlib" "mississippi@3.0.0","BSD-2-Clause","https://github.com/maxogden/mississippi" "mixin-deep@1.3.2","MIT","https://github.com/jonschlinkert/mixin-deep" -"mkdirp@0.5.1","MIT","https://github.com/substack/node-mkdirp" -"moment@2.24.0","MIT","https://github.com/moment/moment" +"mkdirp@0.5.5","MIT","https://github.com/substack/node-mkdirp" +"mkdirp@1.0.4","MIT","https://github.com/isaacs/node-mkdirp" +"moment@2.27.0","MIT","https://github.com/moment/moment" "move-concurrently@1.0.1","ISC","https://github.com/npm/move-concurrently" "ms@2.0.0","MIT","https://github.com/zeit/ms" "ms@2.1.1","MIT","https://github.com/zeit/ms" @@ -904,26 +978,23 @@ "multicast-dns-service-types@1.1.0","MIT","https://github.com/mafintosh/multicast-dns-service-types" "multicast-dns@6.2.3","MIT","https://github.com/mafintosh/multicast-dns" "mute-stream@0.0.8","ISC","https://github.com/isaacs/mute-stream" -"nan@2.13.2","MIT","https://github.com/nodejs/nan" +"nan@2.14.1","MIT","https://github.com/nodejs/nan" "nanomatch@1.2.9","MIT","https://github.com/micromatch/nanomatch" -"needle@2.2.4","MIT","https://github.com/tomas/needle" "negotiator@0.6.1","MIT","https://github.com/jshttp/negotiator" "negotiator@0.6.2","MIT","https://github.com/jshttp/negotiator" "neo-async@2.6.0","MIT","https://github.com/suguru03/neo-async" "neo-async@2.6.1","MIT","https://github.com/suguru03/neo-async" "ng2-ui-auth@10.0.1","UNKNOWN","" -"ngx-bootstrap@3.0.1","MIT","https://github.com/valor-software/ngx-bootstrap" -"ngx-clipboard@12.2.1","MIT","https://github.com/maxisam/ngx-clipboard" -"ngx-markdown@8.1.0","MIT","https://github.com/jfcere/ngx-markdown" -"ngx-window-token@2.0.1","MIT","https://github.com/maxisam/ngx-window-token" +"ngx-clipboard@13.0.1","MIT","https://github.com/maxisam/ngx-clipboard" +"ngx-markdown@9.1.1","MIT","https://github.com/jfcere/ngx-markdown" +"ngx-sharebuttons@8.0.0","MIT","https://github.com/murhafsousli/ngx-sharebuttons" +"ngx-window-token@3.0.0","MIT","https://github.com/maxisam/ngx-window-token" "nice-try@1.0.5","MIT","https://github.com/electerious/nice-try" -"node-fetch-npm@2.0.2","MIT","https://github.com/npm/node-fetch-npm" +"node-fetch-npm@2.0.4","MIT","https://github.com/npm/node-fetch-npm" "node-forge@0.9.0","(BSD-3-Clause OR GPL-2.0)","https://github.com/digitalbazaar/forge" "node-libs-browser@2.2.1","MIT","https://github.com/webpack/node-libs-browser" -"node-pre-gyp@0.10.3","BSD-3-Clause","https://github.com/mapbox/node-pre-gyp" "node-releases@1.1.32","MIT","https://github.com/chicoxyzzy/node-releases" -"node-releases@1.1.50","MIT","https://github.com/chicoxyzzy/node-releases" -"nopt@4.0.1","ISC","https://github.com/npm/nopt" +"node-releases@1.1.58","MIT","https://github.com/chicoxyzzy/node-releases" "nopt@4.0.3","ISC","https://github.com/npm/nopt" "normalize-package-data@2.4.0","BSD-2-Clause","https://github.com/npm/normalize-package-data" "normalize-package-data@2.5.0","BSD-2-Clause","https://github.com/npm/normalize-package-data" @@ -931,33 +1002,36 @@ "normalize-path@3.0.0","MIT","https://github.com/jonschlinkert/normalize-path" "normalize-range@0.1.2","MIT","https://github.com/jamestalmage/normalize-range" "normalize-url@1.9.1","MIT","https://github.com/sindresorhus/normalize-url" -"npm-bundled@1.0.5","ISC","https://github.com/npm/npm-bundled" +"normalize-url@3.3.0","MIT","https://github.com/sindresorhus/normalize-url" "npm-bundled@1.1.1","ISC","https://github.com/npm/npm-bundled" +"npm-install-checks@4.0.0","BSD-2-Clause","https://github.com/npm/npm-install-checks" "npm-normalize-package-bin@1.0.1","ISC","https://github.com/npm/npm-normalize-package-bin" "npm-package-arg@6.1.0","ISC","https://github.com/npm/npm-package-arg" -"npm-packlist@1.2.0","ISC","https://github.com/npm/npm-packlist" +"npm-package-arg@8.0.1","ISC","https://github.com/npm/npm-package-arg" "npm-packlist@1.4.8","ISC","https://github.com/npm/npm-packlist" -"npm-pick-manifest@2.2.3","ISC","https://github.com/zkat/npm-pick-manifest" "npm-pick-manifest@3.0.2","ISC","https://github.com/npm/npm-pick-manifest" +"npm-pick-manifest@6.0.0","ISC","https://github.com/npm/npm-pick-manifest" "npm-registry-client@8.6.0","ISC","https://github.com/npm/npm-registry-client" -"npm-registry-fetch@4.0.3","ISC","https://github.com/npm/registry-fetch" +"npm-registry-fetch@4.0.7","ISC","https://github.com/npm/registry-fetch" "npm-run-path@2.0.2","MIT","https://github.com/sindresorhus/npm-run-path" "npm-run-path@3.1.0","MIT","https://github.com/sindresorhus/npm-run-path" "npm-run-path@4.0.1","MIT","https://github.com/sindresorhus/npm-run-path" "npmlog@4.1.2","ISC","https://github.com/npm/npmlog" +"nth-check@1.0.2","BSD-2-Clause","https://github.com/fb55/nth-check" "num2fraction@1.2.2","MIT","https://github.com/yisibl/num2fraction" "number-is-nan@1.0.1","MIT","https://github.com/sindresorhus/number-is-nan" "oauth-sign@0.9.0","Apache-2.0","https://github.com/mikeal/oauth-sign" "object-assign@4.1.1","MIT","https://github.com/sindresorhus/object-assign" "object-component@0.0.3","MIT*","" "object-copy@0.1.0","MIT","https://github.com/jonschlinkert/object-copy" -"object-inspect@1.7.0","MIT","https://github.com/substack/object-inspect" -"object-is@1.0.2","MIT","https://github.com/es-shims/object-is" +"object-inspect@1.8.0","MIT","https://github.com/inspect-js/object-inspect" +"object-is@1.1.2","MIT","https://github.com/es-shims/object-is" "object-keys@1.1.1","MIT","https://github.com/ljharb/object-keys" "object-visit@1.0.1","MIT","https://github.com/jonschlinkert/object-visit" "object.assign@4.1.0","MIT","https://github.com/ljharb/object.assign" "object.getownpropertydescriptors@2.1.0","MIT","https://github.com/es-shims/object.getownpropertydescriptors" "object.pick@1.3.0","MIT","https://github.com/jonschlinkert/object.pick" +"object.values@1.1.1","MIT","https://github.com/es-shims/Object.values" "obuf@1.1.2","MIT","https://github.com/indutny/offset-buffer" "on-finished@2.3.0","MIT","https://github.com/jshttp/on-finished" "on-headers@1.0.2","MIT","https://github.com/jshttp/on-headers" @@ -965,28 +1039,31 @@ "onetime@1.1.0","MIT","https://github.com/sindresorhus/onetime" "onetime@2.0.1","MIT","https://github.com/sindresorhus/onetime" "onetime@5.1.0","MIT","https://github.com/sindresorhus/onetime" -"open@6.4.0","MIT","https://github.com/sindresorhus/open" +"open@7.0.3","MIT","https://github.com/sindresorhus/open" "opencollective-postinstall@2.0.2","MIT","https://github.com/opencollective/opencollective-postinstall" "opn@5.5.0","MIT","https://github.com/sindresorhus/opn" -"optimist@0.6.1","MIT*","https://github.com/substack/node-optimist" +"ora@4.0.3","MIT","https://github.com/sindresorhus/ora" "original@1.0.2","MIT","https://github.com/unshiftio/original" "os-browserify@0.3.0","MIT","https://github.com/CoderPuppy/os-browserify" "os-homedir@1.0.2","MIT","https://github.com/sindresorhus/os-homedir" -"os-locale@3.1.0","MIT","https://github.com/sindresorhus/os-locale" "os-tmpdir@1.0.2","MIT","https://github.com/sindresorhus/os-tmpdir" "osenv@0.1.5","ISC","https://github.com/npm/osenv" -"p-defer@1.0.0","MIT","https://github.com/sindresorhus/p-defer" +"ospath@1.2.2","MIT","https://github.com/jprichardson/ospath" "p-finally@1.0.0","MIT","https://github.com/sindresorhus/p-finally" "p-finally@2.0.1","MIT","https://github.com/sindresorhus/p-finally" -"p-is-promise@2.1.0","MIT","https://github.com/sindresorhus/p-is-promise" +"p-limit@1.3.0","MIT","https://github.com/sindresorhus/p-limit" "p-limit@2.2.1","MIT","https://github.com/sindresorhus/p-limit" +"p-limit@2.3.0","MIT","https://github.com/sindresorhus/p-limit" +"p-locate@2.0.0","MIT","https://github.com/sindresorhus/p-locate" "p-locate@3.0.0","MIT","https://github.com/sindresorhus/p-locate" "p-locate@4.1.0","MIT","https://github.com/sindresorhus/p-locate" "p-map@2.1.0","MIT","https://github.com/sindresorhus/p-map" "p-map@3.0.0","MIT","https://github.com/sindresorhus/p-map" +"p-map@4.0.0","MIT","https://github.com/sindresorhus/p-map" "p-retry@3.0.1","MIT","https://github.com/sindresorhus/p-retry" +"p-try@1.0.0","MIT","https://github.com/sindresorhus/p-try" "p-try@2.2.0","MIT","https://github.com/sindresorhus/p-try" -"pacote@9.5.5","MIT","https://github.com/npm/pacote" +"pacote@9.5.12","MIT","https://github.com/npm/pacote" "pako@1.0.6","(MIT AND Zlib)","https://github.com/nodeca/pako" "parallel-transform@1.2.0","MIT","https://github.com/mafintosh/parallel-transform" "parse-asn1@5.1.5","ISC","https://github.com/crypto-browserify/parse-asn1" @@ -994,6 +1071,7 @@ "parse-json@5.0.0","MIT","https://github.com/sindresorhus/parse-json" "parse5@4.0.0","MIT","https://github.com/inikulin/parse5" "parse5@5.1.0","MIT","https://github.com/inikulin/parse5" +"parse5@5.1.1","MIT","https://github.com/inikulin/parse5" "parseqs@0.0.5","MIT","https://github.com/get/querystring" "parseuri@0.0.5","MIT","https://github.com/get/parseuri" "parseurl@1.3.3","MIT","https://github.com/pillarjs/parseurl" @@ -1010,33 +1088,66 @@ "path-parse@1.0.5","MIT","https://github.com/jbgutierrez/path-parse" "path-parse@1.0.6","MIT","https://github.com/jbgutierrez/path-parse" "path-to-regexp@0.1.7","MIT","https://github.com/component/path-to-regexp" -"path-type@3.0.0","MIT","https://github.com/sindresorhus/path-type" "path-type@4.0.0","MIT","https://github.com/sindresorhus/path-type" -"pbkdf2@3.0.17","MIT","https://github.com/crypto-browserify/pbkdf2" +"pbkdf2@3.1.1","MIT","https://github.com/crypto-browserify/pbkdf2" "pend@1.2.0","MIT","https://github.com/andrewrk/node-pend" "performance-now@2.1.0","MIT","https://github.com/braveg1rl/performance-now" "picomatch@2.0.7","MIT","https://github.com/micromatch/picomatch" +"picomatch@2.2.2","MIT","https://github.com/micromatch/picomatch" "pify@2.3.0","MIT","https://github.com/sindresorhus/pify" -"pify@3.0.0","MIT","https://github.com/sindresorhus/pify" "pify@4.0.1","MIT","https://github.com/sindresorhus/pify" "pinkie-promise@2.0.1","MIT","https://github.com/floatdrop/pinkie-promise" "pinkie@2.0.4","MIT","https://github.com/floatdrop/pinkie" -"pipeline-builder@0.3.10-dev.313","MIT","https://github.com/epam/pipeline-builder" "pkg-dir@3.0.0","MIT","https://github.com/sindresorhus/pkg-dir" "pkg-dir@4.2.0","MIT","https://github.com/sindresorhus/pkg-dir" +"pkg-up@2.0.0","MIT","https://github.com/sindresorhus/pkg-up" "please-upgrade-node@3.2.0","MIT","https://github.com/typicode/please-upgrade-node" "popper.js@1.15.0","MIT","https://github.com/FezVrasta/popper.js" -"portfinder@1.0.25","MIT","https://github.com/indexzero/node-portfinder" +"portfinder@1.0.28","MIT","https://github.com/http-party/node-portfinder" "posix-character-classes@0.1.1","MIT","https://github.com/jonschlinkert/posix-character-classes" +"postcss-calc@7.0.2","MIT","https://github.com/postcss/postcss-calc" +"postcss-colormin@4.0.3","MIT","https://github.com/cssnano/cssnano" +"postcss-convert-values@4.0.1","MIT","https://github.com/cssnano/cssnano" +"postcss-discard-comments@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-discard-duplicates@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-discard-empty@4.0.1","MIT","https://github.com/cssnano/cssnano" +"postcss-discard-overridden@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-import@12.0.1","MIT","https://github.com/postcss/postcss-import" "postcss-load-config@2.1.0","MIT","https://github.com/michael-ciniawsky/postcss-load-config" "postcss-loader@3.0.0","MIT","https://github.com/postcss/postcss-loader" +"postcss-merge-longhand@4.0.11","MIT","https://github.com/cssnano/cssnano" +"postcss-merge-rules@4.0.3","MIT","https://github.com/cssnano/cssnano" +"postcss-minify-font-values@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-minify-gradients@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-minify-params@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-minify-selectors@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-modules-extract-imports@2.0.0","ISC","https://github.com/css-modules/postcss-modules-extract-imports" +"postcss-modules-local-by-default@3.0.2","MIT","https://github.com/css-modules/postcss-modules-local-by-default" +"postcss-modules-scope@2.2.0","ISC","https://github.com/css-modules/postcss-modules-scope" +"postcss-modules-values@3.0.0","ISC","https://github.com/css-modules/postcss-modules-values" +"postcss-normalize-charset@4.0.1","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-display-values@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-positions@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-repeat-style@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-string@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-timing-functions@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-unicode@4.0.1","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-url@4.0.1","MIT","https://github.com/cssnano/cssnano" +"postcss-normalize-whitespace@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-ordered-values@4.1.2","MIT","https://github.com/cssnano/cssnano" +"postcss-reduce-initial@4.0.3","MIT","https://github.com/cssnano/cssnano" +"postcss-reduce-transforms@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-selector-parser@3.1.2","MIT","https://github.com/postcss/postcss-selector-parser" +"postcss-selector-parser@6.0.2","MIT","https://github.com/postcss/postcss-selector-parser" +"postcss-svgo@4.0.2","MIT","https://github.com/cssnano/cssnano" +"postcss-unique-selectors@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-value-parser@3.3.1","MIT","https://github.com/TrySound/postcss-value-parser" -"postcss-value-parser@4.0.3","MIT","https://github.com/TrySound/postcss-value-parser" -"postcss@7.0.17","MIT","https://github.com/postcss/postcss" +"postcss-value-parser@4.1.0","MIT","https://github.com/TrySound/postcss-value-parser" +"postcss@7.0.27","MIT","https://github.com/postcss/postcss" "prepend-http@1.0.4","MIT","https://github.com/sindresorhus/prepend-http" -"prettier@1.18.2","MIT","https://github.com/prettier/prettier" -"prismjs@1.17.1","MIT","https://github.com/LeaVerou/prism" +"prettier@2.1.1","MIT","https://github.com/prettier/prettier" +"pretty-bytes@5.4.1","MIT","https://github.com/sindresorhus/pretty-bytes" +"prismjs@1.22.0","MIT","https://github.com/PrismJS/prism" "private@0.1.8","MIT","https://github.com/benjamn/private" "process-nextick-args@2.0.0","MIT","https://github.com/calvinmetcalf/process-nextick-args" "process@0.11.10","MIT","https://github.com/shtylman/node-process" @@ -1046,7 +1157,6 @@ "protoduck@5.0.1","MIT","https://github.com/zkat/protoduck" "proxy-addr@2.0.6","MIT","https://github.com/jshttp/proxy-addr" "prr@1.0.1","MIT","https://github.com/rvagg/prr" -"pseudomap@1.0.2","ISC","https://github.com/isaacs/pseudomap" "psl@1.1.29","MIT","https://github.com/wrangr/psl" "public-encrypt@4.0.3","MIT","https://github.com/crypto-browserify/publicEncrypt" "pump@2.0.1","MIT","https://github.com/mafintosh/pump" @@ -1055,6 +1165,7 @@ "punycode@1.3.2","MIT","https://github.com/bestiejs/punycode.js" "punycode@1.4.1","MIT","https://github.com/bestiejs/punycode.js" "punycode@2.1.1","MIT","https://github.com/bestiejs/punycode.js" +"q@1.5.1","MIT","https://github.com/kriskowal/q" "qjobs@1.2.0","MIT","https://github.com/franck34/qjobs" "qs@6.5.2","BSD-3-Clause","https://github.com/ljharb/qs" "qs@6.7.0","BSD-3-Clause","https://github.com/ljharb/qs" @@ -1067,8 +1178,7 @@ "randomfill@1.0.4","MIT","https://github.com/crypto-browserify/randomfill" "range-parser@1.2.1","MIT","https://github.com/jshttp/range-parser" "raw-body@2.4.0","MIT","https://github.com/stream-utils/raw-body" -"raw-loader@3.1.0","MIT","https://github.com/webpack-contrib/raw-loader" -"rc@1.2.8","(BSD-2-Clause OR MIT OR Apache-2.0)","https://github.com/dominictarr/rc" +"raw-loader@4.0.0","MIT","https://github.com/webpack-contrib/raw-loader" "read-cache@1.0.0","MIT","https://github.com/TrySound/read-cache" "read-installed@4.0.3","ISC","https://github.com/isaacs/read-installed" "read-package-json@2.1.1","ISC","https://github.com/npm/read-package-json" @@ -1079,30 +1189,28 @@ "readdir-scoped-modules@1.1.0","ISC","https://github.com/npm/readdir-scoped-modules" "readdirp@2.2.1","MIT","https://github.com/paulmillr/readdirp" "readdirp@3.1.2","MIT","https://github.com/paulmillr/readdirp" +"readdirp@3.4.0","MIT","https://github.com/paulmillr/readdirp" "reflect-metadata@0.1.13","Apache-2.0","https://github.com/rbuckton/reflect-metadata" "regenerate-unicode-properties@8.1.0","MIT","https://github.com/mathiasbynens/regenerate-unicode-properties" +"regenerate-unicode-properties@8.2.0","MIT","https://github.com/mathiasbynens/regenerate-unicode-properties" "regenerate@1.4.0","MIT","https://github.com/mathiasbynens/regenerate" -"regenerator-runtime@0.13.3","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime" -"regenerator-runtime@0.13.4","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime" +"regenerator-runtime@0.13.5","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime" "regenerator-transform@0.14.1","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" -"regenerator-transform@0.14.2","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" +"regenerator-transform@0.14.4","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" "regex-not@1.0.2","MIT","https://github.com/jonschlinkert/regex-not" "regexp.prototype.flags@1.3.0","MIT","https://github.com/es-shims/RegExp.prototype.flags" -"regexpu-core@1.0.0","MIT","https://github.com/mathiasbynens/regexpu-core" "regexpu-core@4.6.0","MIT","https://github.com/mathiasbynens/regexpu-core" -"regjsgen@0.2.0","MIT","https://github.com/d10/regjsgen" +"regexpu-core@4.7.0","MIT","https://github.com/mathiasbynens/regexpu-core" "regjsgen@0.5.0","MIT","https://github.com/bnjmnt4n/regjsgen" -"regjsgen@0.5.1","MIT","https://github.com/bnjmnt4n/regjsgen" -"regjsparser@0.1.5","BSD*","https://github.com/jviereck/regjsparser" +"regjsgen@0.5.2","MIT","https://github.com/bnjmnt4n/regjsgen" "regjsparser@0.6.0","BSD-2-Clause","https://github.com/jviereck/regjsparser" -"regjsparser@0.6.3","BSD-2-Clause","https://github.com/jviereck/regjsparser" +"regjsparser@0.6.4","BSD-2-Clause","https://github.com/jviereck/regjsparser" "remove-trailing-separator@1.1.0","ISC","https://github.com/darsain/remove-trailing-separator" "repeat-element@1.1.2","MIT","https://github.com/jonschlinkert/repeat-element" "repeat-string@1.6.1","MIT","https://github.com/jonschlinkert/repeat-string" "request-progress@3.0.0","MIT","https://github.com/IndigoUnited/node-request-progress" "request@2.88.0","Apache-2.0","https://github.com/request/request" "require-directory@2.1.1","MIT","https://github.com/troygoode/node-require-directory" -"require-main-filename@1.0.1","ISC","https://github.com/yargs/require-main-filename" "require-main-filename@2.0.0","ISC","https://github.com/yargs/require-main-filename" "requires-port@1.0.0","MIT","https://github.com/unshiftio/requires-port" "resolve-cwd@2.0.0","MIT","https://github.com/sindresorhus/resolve-cwd" @@ -1118,31 +1226,33 @@ "retry@0.12.0","MIT","https://github.com/tim-kos/node-retry" "reusify@1.0.4","MIT","https://github.com/mcollina/reusify" "rfdc@1.1.4","MIT","https://github.com/davidmarkclements/rfdc" +"rgb-regex@1.0.1","MIT","https://github.com/regexps/rgb-regex" +"rgba-regex@1.0.0","MIT","https://github.com/johnotander/rgba-regex" "rimraf@2.6.2","ISC","https://github.com/isaacs/rimraf" -"rimraf@2.6.3","ISC","https://github.com/isaacs/rimraf" "rimraf@2.7.1","ISC","https://github.com/isaacs/rimraf" "rimraf@3.0.0","ISC","https://github.com/isaacs/rimraf" +"rimraf@3.0.2","ISC","https://github.com/isaacs/rimraf" "ripemd160@2.0.2","MIT","https://github.com/crypto-browserify/ripemd160" -"run-async@2.4.0","MIT","https://github.com/SBoudrias/run-async" +"rollup@2.1.0","MIT","https://github.com/rollup/rollup" +"run-async@2.4.1","MIT","https://github.com/SBoudrias/run-async" "run-node@1.0.0","MIT","https://github.com/sindresorhus/run-node" "run-parallel@1.1.9","MIT","https://github.com/feross/run-parallel" "run-queue@1.0.3","ISC","https://github.com/iarna/run-queue" "rxjs-tslint-rules@4.17.0","MIT","https://github.com/cartant/rxjs-tslint-rules" -"rxjs-tslint@0.1.7","MIT","https://github.com/reactivex/rxjs-tslint" +"rxjs-tslint@0.1.8","MIT","https://github.com/reactivex/rxjs-tslint" "rxjs@6.3.3","Apache-2.0","https://github.com/reactivex/rxjs" -"rxjs@6.4.0","Apache-2.0","https://github.com/reactivex/rxjs" "rxjs@6.5.3","Apache-2.0","https://github.com/reactivex/rxjs" +"rxjs@6.5.4","Apache-2.0","https://github.com/reactivex/rxjs" "safe-buffer@5.1.1","MIT","https://github.com/feross/safe-buffer" "safe-buffer@5.1.2","MIT","https://github.com/feross/safe-buffer" -"safe-buffer@5.2.0","MIT","https://github.com/feross/safe-buffer" +"safe-buffer@5.2.1","MIT","https://github.com/feross/safe-buffer" "safe-regex@1.1.0","MIT","https://github.com/substack/safe-regex" "safer-buffer@2.1.2","MIT","https://github.com/ChALkeR/safer-buffer" -"sass-loader@7.2.0","MIT","https://github.com/webpack-contrib/sass-loader" -"sass@1.22.9","MIT","https://github.com/sass/dart-sass" -"sax@0.5.8","BSD*","https://github.com/isaacs/sax-js" +"sass-loader@8.0.2","MIT","https://github.com/webpack-contrib/sass-loader" +"sass@1.26.3","MIT","https://github.com/sass/dart-sass" "sax@1.2.4","ISC","https://github.com/isaacs/sax-js" "schema-utils@1.0.0","MIT","https://github.com/webpack-contrib/schema-utils" -"schema-utils@2.6.4","MIT","https://github.com/webpack/schema-utils" +"schema-utils@2.7.0","MIT","https://github.com/webpack/schema-utils" "schematics-utilities@1.1.3","MIT","https://github.com/nitayneeman/schematics-utilities" "select-hose@2.0.0","MIT","https://github.com/indutny/select-hose" "select@1.1.2","MIT","https://github.com/zenorocha/select" @@ -1151,16 +1261,16 @@ "semver-dsl@1.0.1","MIT","https://github.com/mgechev/semver-dsl" "semver-intersect@1.4.0","MIT","https://github.com/snyamathi/semver-intersect" "semver@5.5.0","ISC","https://github.com/npm/node-semver" -"semver@5.6.0","ISC","https://github.com/npm/node-semver" "semver@5.7.1","ISC","https://github.com/npm/node-semver" "semver@6.3.0","ISC","https://github.com/npm/node-semver" "semver@7.0.0","ISC","https://github.com/npm/node-semver" +"semver@7.1.3","ISC","https://github.com/npm/node-semver" +"semver@7.3.2","ISC","https://github.com/npm/node-semver" "send@0.17.1","MIT","https://github.com/pillarjs/send" -"serialize-javascript@2.1.2","BSD-3-Clause","https://github.com/yahoo/serialize-javascript" +"serialize-javascript@3.1.0","BSD-3-Clause","https://github.com/yahoo/serialize-javascript" "serve-index@1.9.1","MIT","https://github.com/expressjs/serve-index" "serve-static@1.14.1","MIT","https://github.com/expressjs/serve-static" "set-blocking@2.0.0","ISC","https://github.com/yargs/set-blocking" -"set-immediate-shim@1.0.1","MIT","https://github.com/sindresorhus/set-immediate-shim" "set-value@2.0.1","MIT","https://github.com/jonschlinkert/set-value" "setimmediate@1.0.5","MIT","https://github.com/YuzuJS/setImmediate" "setprototypeof@1.1.0","ISC","https://github.com/wesleytodd/setprototypeof" @@ -1172,7 +1282,7 @@ "shebang-regex@1.0.0","MIT","https://github.com/sindresorhus/shebang-regex" "shebang-regex@3.0.0","MIT","https://github.com/sindresorhus/shebang-regex" "signal-exit@3.0.2","ISC","https://github.com/tapjs/signal-exit" -"slash@1.0.0","MIT","https://github.com/sindresorhus/slash" +"simple-swizzle@0.2.2","MIT","https://github.com/qix-/node-simple-swizzle" "slash@3.0.0","MIT","https://github.com/sindresorhus/slash" "slice-ansi@0.0.4","MIT","https://github.com/chalk/slice-ansi" "slide@1.1.6","ISC","https://github.com/isaacs/slide-flow-control" @@ -1181,28 +1291,25 @@ "snapdragon-util@3.0.1","MIT","https://github.com/jonschlinkert/snapdragon-util" "snapdragon@0.8.2","MIT","https://github.com/jonschlinkert/snapdragon" "socket.io-adapter@1.1.2","MIT","https://github.com/socketio/socket.io-adapter" -"socket.io-client@2.1.1","MIT","https://github.com/Automattic/socket.io-client" -"socket.io-parser@3.2.0","MIT","https://github.com/Automattic/socket.io-parser" -"socket.io@2.1.1","MIT","https://github.com/socketio/socket.io" +"socket.io-client@2.3.0","MIT","https://github.com/Automattic/socket.io-client" +"socket.io-parser@3.3.0","MIT","https://github.com/Automattic/socket.io-parser" +"socket.io-parser@3.4.1","MIT","https://github.com/socketio/socket.io-parser" +"socket.io@2.3.0","MIT","https://github.com/socketio/socket.io" "sockjs-client@1.4.0","MIT","https://github.com/sockjs/sockjs-client" -"sockjs@0.3.19","MIT","https://github.com/sockjs/sockjs-node" +"sockjs@0.3.20","MIT","https://github.com/sockjs/sockjs-node" "socks-proxy-agent@4.0.2","MIT","https://github.com/TooTallNate/node-socks-proxy-agent" "socks@2.3.3","MIT","https://github.com/JoshGlazebrook/socks" "sort-keys@1.1.2","MIT","https://github.com/sindresorhus/sort-keys" -"source-list-map@0.1.8","MIT","https://github.com/webpack/source-list-map" "source-list-map@2.0.1","MIT","https://github.com/webpack/source-list-map" "source-map-loader@0.2.4","MIT","https://github.com/webpack-contrib/source-map-loader" "source-map-resolve@0.5.2","MIT","https://github.com/lydell/source-map-resolve" -"source-map-support@0.5.13","MIT","https://github.com/evanw/node-source-map-support" -"source-map-support@0.5.16","MIT","https://github.com/evanw/node-source-map-support" +"source-map-support@0.5.19","MIT","https://github.com/evanw/node-source-map-support" "source-map-support@0.5.6","MIT","https://github.com/evanw/node-source-map-support" "source-map-url@0.4.0","MIT","https://github.com/lydell/source-map-url" -"source-map@0.1.43","BSD","https://github.com/mozilla/source-map" -"source-map@0.4.4","BSD-3-Clause","https://github.com/mozilla/source-map" "source-map@0.5.7","BSD-3-Clause","https://github.com/mozilla/source-map" "source-map@0.6.1","BSD-3-Clause","https://github.com/mozilla/source-map" "source-map@0.7.3","BSD-3-Clause","https://github.com/mozilla/source-map" -"sourcemap-codec@1.4.6","MIT","https://github.com/Rich-Harris/sourcemap-codec" +"sourcemap-codec@1.4.8","MIT","https://github.com/Rich-Harris/sourcemap-codec" "spdx-compare@1.0.0","MIT","https://github.com/kemitchell/spdx-compare.js" "spdx-correct@3.0.0","Apache-2.0","https://github.com/jslicense/spdx-correct.js" "spdx-exceptions@2.1.0","CC-BY-3.0","https://github.com/kemitchell/spdx-exceptions.json" @@ -1211,7 +1318,7 @@ "spdx-ranges@2.1.1","(MIT AND CC-BY-3.0)","https://github.com/kemitchell/spdx-ranges.js" "spdx-satisfies@4.0.1","MIT","https://github.com/kemitchell/spdx-satisfies.js" "spdy-transport@3.0.0","MIT","https://github.com/spdy-http2/spdy-transport" -"spdy@4.0.1","MIT","https://github.com/indutny/node-spdy" +"spdy@4.0.2","MIT","https://github.com/indutny/node-spdy" "speed-measure-webpack-plugin@1.3.1","MIT","https://github.com/stephencookdev/speed-measure-webpack-plugin" "split-string@3.1.0","MIT","https://github.com/jonschlinkert/split-string" "sprintf-js@1.0.3","BSD-3-Clause","https://github.com/alexei/sprintf.js" @@ -1219,21 +1326,23 @@ "sshpk@1.15.2","MIT","https://github.com/joyent/node-sshpk" "ssri@5.3.0","ISC","https://github.com/zkat/ssri" "ssri@6.0.1","ISC","https://github.com/zkat/ssri" +"ssri@8.0.0","ISC","https://github.com/npm/ssri" +"stable@0.1.8","MIT","https://github.com/Two-Screen/stable" "static-extend@0.1.2","MIT","https://github.com/jonschlinkert/static-extend" "statuses@1.5.0","MIT","https://github.com/jshttp/statuses" "stream-browserify@2.0.2","MIT","https://github.com/browserify/stream-browserify" "stream-each@1.2.3","MIT","https://github.com/mafintosh/stream-each" "stream-http@2.8.3","MIT","https://github.com/jhiesey/stream-http" -"stream-shift@1.0.0","MIT","https://github.com/mafintosh/stream-shift" -"streamroller@1.0.6","MIT","https://github.com/nomiddlename/streamroller" +"stream-shift@1.0.1","MIT","https://github.com/mafintosh/stream-shift" +"streamroller@2.2.4","MIT","https://github.com/nomiddlename/streamroller" "strict-uri-encode@1.1.0","MIT","https://github.com/kevva/strict-uri-encode" "string-argv@0.3.1","MIT","https://github.com/mccormicka/string-argv" "string-width@1.0.2","MIT","https://github.com/sindresorhus/string-width" "string-width@2.1.1","MIT","https://github.com/sindresorhus/string-width" "string-width@3.1.0","MIT","https://github.com/sindresorhus/string-width" "string-width@4.2.0","MIT","https://github.com/sindresorhus/string-width" -"string.prototype.trimleft@2.1.1","MIT","https://github.com/es-shims/String.prototype.trimLeft" -"string.prototype.trimright@2.1.1","MIT","https://github.com/es-shims/String.prototype.trimRight" +"string.prototype.trimend@1.0.1","MIT","https://github.com/es-shims/String.prototype.trimEnd" +"string.prototype.trimstart@1.0.1","MIT","https://github.com/es-shims/String.prototype.trimStart" "string_decoder@1.1.1","MIT","https://github.com/nodejs/string_decoder" "string_decoder@1.3.0","MIT","https://github.com/nodejs/string_decoder" "stringify-object@3.3.0","BSD-2-Clause","https://github.com/yeoman/stringify-object" @@ -1244,29 +1353,34 @@ "strip-bom@3.0.0","MIT","https://github.com/sindresorhus/strip-bom" "strip-eof@1.0.0","MIT","https://github.com/sindresorhus/strip-eof" "strip-final-newline@2.0.0","MIT","https://github.com/sindresorhus/strip-final-newline" -"strip-json-comments@2.0.1","MIT","https://github.com/sindresorhus/strip-json-comments" -"style-loader@1.0.0","MIT","https://github.com/webpack-contrib/style-loader" +"style-loader@1.1.3","MIT","https://github.com/webpack-contrib/style-loader" +"stylehacks@4.0.3","MIT","https://github.com/cssnano/cssnano" "stylus-loader@3.0.2","MIT","https://github.com/shama/stylus-loader" -"stylus@0.54.5","MIT","https://github.com/stylus/stylus" +"stylus@0.54.7","MIT","https://github.com/stylus/stylus" "supports-color@2.0.0","MIT","https://github.com/chalk/supports-color" "supports-color@4.5.0","MIT","https://github.com/chalk/supports-color" "supports-color@5.5.0","MIT","https://github.com/chalk/supports-color" "supports-color@6.1.0","MIT","https://github.com/chalk/supports-color" "supports-color@7.1.0","MIT","https://github.com/chalk/supports-color" +"supports-color@7.2.0","MIT","https://github.com/chalk/supports-color" +"svgo@1.3.2","MIT","https://github.com/svg/svgo" "symbol-observable@1.2.0","MIT","https://github.com/blesh/symbol-observable" "tapable@1.1.3","MIT","https://github.com/webpack/tapable" "tar@4.4.13","ISC","https://github.com/npm/node-tar" -"tar@4.4.8","ISC","https://github.com/npm/node-tar" -"terser-webpack-plugin@1.4.3","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" -"terser@4.6.3","BSD-2-Clause","https://github.com/terser/terser" +"tar@6.0.2","ISC","https://github.com/npm/node-tar" +"terser-webpack-plugin@1.4.4","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" +"terser-webpack-plugin@3.0.3","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" +"terser@4.6.10","BSD-2-Clause","https://github.com/terser/terser" +"terser@4.8.0","BSD-2-Clause","https://github.com/terser/terser" "throttleit@1.0.0","MIT","https://github.com/component/throttle" "through2@2.0.5","MIT","https://github.com/rvagg/through2" "through@2.3.8","MIT","https://github.com/dominictarr/through" "thunky@1.1.0","MIT","https://github.com/mafintosh/thunky" "timers-browserify@2.0.11","MIT","https://github.com/jryans/timers-browserify" +"timsort@0.3.0","MIT","https://github.com/mziccard/node-timsort" "tiny-emitter@2.1.0","MIT","https://github.com/scottcorgan/tiny-emitter" "tmp@0.0.33","MIT","https://github.com/raszi/node-tmp" -"tmp@0.1.0","MIT","https://github.com/raszi/node-tmp" +"tmp@0.2.1","MIT","https://github.com/raszi/node-tmp" "to-array@0.1.4","MIT","https://github.com/Raynos/to-array" "to-arraybuffer@1.0.1","MIT","https://github.com/jhiesey/to-arraybuffer" "to-fast-properties@2.0.0","MIT","https://github.com/sindresorhus/to-fast-properties" @@ -1276,16 +1390,17 @@ "to-regex@3.0.2","MIT","https://github.com/jonschlinkert/to-regex" "toidentifier@1.0.0","MIT","https://github.com/component/toidentifier" "tough-cookie@2.4.3","BSD-3-Clause","https://github.com/salesforce/tough-cookie" +"tough-cookie@2.5.0","BSD-3-Clause","https://github.com/salesforce/tough-cookie" "tree-kill@1.2.2","MIT","https://github.com/pkrumins/node-tree-kill" "treeify@1.1.0","MIT","https://github.com/notatestuser/treeify" "trim-right@1.0.1","MIT","https://github.com/sindresorhus/trim-right" "ts-loader@5.4.5","MIT","https://github.com/TypeStrong/ts-loader" "ts-md5@1.2.6","MIT","https://github.com/cotag/ts-md5" "ts-node@8.4.1","MIT","https://github.com/TypeStrong/ts-node" -"tslib@1.10.0","Apache-2.0","https://github.com/Microsoft/tslib" -"tslib@1.9.0","Apache-2.0","https://github.com/Microsoft/tslib" +"tslib@1.11.1","Apache-2.0","https://github.com/Microsoft/tslib" +"tslib@1.13.0","0BSD","https://github.com/Microsoft/tslib" "tslint-config-prettier@1.18.0","MIT","https://github.com/prettier/tslint-config-prettier" -"tslint@5.20.0","Apache-2.0","https://github.com/palantir/tslint" +"tslint@5.20.1","Apache-2.0","https://github.com/palantir/tslint" "tsutils@2.29.0","MIT","https://github.com/ajafff/tsutils" "tsutils@3.17.1","MIT","https://github.com/ajafff/tsutils" "tty-browserify@0.0.0","MIT","https://github.com/substack/tty-browserify" @@ -1295,19 +1410,25 @@ "type-fest@0.6.0","(MIT OR CC0-1.0)","https://github.com/sindresorhus/type-fest" "type-is@1.6.18","MIT","https://github.com/jshttp/type-is" "typedarray@0.0.6","MIT","https://github.com/substack/typedarray" -"typescript@3.5.3","Apache-2.0","https://github.com/Microsoft/TypeScript" +"typescript@3.6.5","Apache-2.0","https://github.com/Microsoft/TypeScript" +"typescript@3.8.3","Apache-2.0","https://github.com/Microsoft/TypeScript" +"ua-parser-js@0.7.21","MIT","https://github.com/faisalman/ua-parser-js" "uglify-js@3.6.0","BSD-2-Clause","https://github.com/mishoo/UglifyJS2" -"ultron@1.1.1","MIT","https://github.com/unshiftio/ultron" "unicode-canonical-property-names-ecmascript@1.0.4","MIT","https://github.com/mathiasbynens/unicode-canonical-property-names-ecmascript" "unicode-match-property-ecmascript@1.0.4","MIT","https://github.com/mathiasbynens/unicode-match-property-ecmascript" "unicode-match-property-value-ecmascript@1.1.0","MIT","https://github.com/mathiasbynens/unicode-match-property-value-ecmascript" +"unicode-match-property-value-ecmascript@1.2.0","MIT","https://github.com/mathiasbynens/unicode-match-property-value-ecmascript" "unicode-property-aliases-ecmascript@1.0.5","MIT","https://github.com/mathiasbynens/unicode-property-aliases-ecmascript" "union-value@1.0.1","MIT","https://github.com/jonschlinkert/union-value" +"uniq@1.0.1","MIT","https://github.com/mikolalysenko/uniq" +"uniqs@2.0.0","MIT","https://github.com/fgnass/uniqs" "unique-filename@1.1.1","ISC","https://github.com/iarna/unique-filename" "unique-slug@2.0.2","ISC","https://github.com/iarna/unique-slug" "universal-analytics@0.4.20","MIT","https://github.com/peaksandpies/universal-analytics" "universalify@0.1.2","MIT","https://github.com/RyanZim/universalify" +"universalify@1.0.0","MIT","https://github.com/RyanZim/universalify" "unpipe@1.0.0","MIT","https://github.com/stream-utils/unpipe" +"unquote@1.1.1","MIT","https://github.com/lakenen/node-unquote" "unset-value@1.0.0","MIT","https://github.com/jonschlinkert/unset-value" "untildify@4.0.0","MIT","https://github.com/sindresorhus/untildify" "upath@1.2.0","MIT","https://github.com/anodynos/upath" @@ -1316,61 +1437,65 @@ "url-parse@1.4.7","MIT","https://github.com/unshiftio/url-parse" "url@0.11.0","MIT","https://github.com/defunctzombie/node-url" "use@3.1.0","MIT","https://github.com/jonschlinkert/use" -"useragent@2.3.0","MIT","https://github.com/3rd-Eden/useragent" "util-deprecate@1.0.2","MIT","https://github.com/TooTallNate/util-deprecate" "util-extend@1.0.3","MIT","https://github.com/isaacs/util-extend" "util-promisify@2.1.0","MIT","https://github.com/juliangruber/util-promisify" +"util.promisify@1.0.1","MIT","https://github.com/ljharb/util.promisify" "util@0.10.3","MIT","https://github.com/defunctzombie/node-util" "util@0.11.1","MIT","https://github.com/defunctzombie/node-util" "utils-merge@1.0.1","MIT","https://github.com/jaredhanson/utils-merge" "uuid@3.4.0","MIT","https://github.com/uuidjs/uuid" +"uuid@7.0.2","MIT","https://github.com/uuidjs/uuid" "uuid@7.0.3","MIT","https://github.com/uuidjs/uuid" "validate-npm-package-license@3.0.3","Apache-2.0","https://github.com/kemitchell/validate-npm-package-license.js" "validate-npm-package-name@3.0.0","ISC","https://github.com/npm/validate-npm-package-name" "vary@1.1.2","MIT","https://github.com/jshttp/vary" +"vendors@1.0.4","MIT","https://github.com/wooorm/vendors" "verror@1.10.0","MIT","https://github.com/davepacheco/node-verror" "vm-browserify@1.1.2","MIT","https://github.com/substack/vm-browserify" "void-elements@2.0.1","MIT","https://github.com/hemanth/void-elements" -"watchpack@1.6.0","MIT","https://github.com/webpack/watchpack" +"watchpack-chokidar2@2.0.0","MIT","https://github.com/webpack/watchpack" +"watchpack@1.7.2","MIT","https://github.com/webpack/watchpack" "wbuf@1.7.3","MIT","https://github.com/indutny/wbuf" -"webpack-core@0.6.9","MIT","https://github.com/webpack/core" +"wcwidth@1.0.1","MIT","https://github.com/timoxley/wcwidth" "webpack-dev-middleware@3.7.2","MIT","https://github.com/webpack/webpack-dev-middleware" -"webpack-dev-server@3.9.0","MIT","https://github.com/webpack/webpack-dev-server" +"webpack-dev-server@3.11.0","MIT","https://github.com/webpack/webpack-dev-server" "webpack-log@2.0.0","MIT","https://github.com/webpack-contrib/webpack-log" -"webpack-merge@4.2.1","MIT","https://github.com/survivejs/webpack-merge" +"webpack-merge@4.2.2","MIT","https://github.com/survivejs/webpack-merge" "webpack-sources@1.4.3","MIT","https://github.com/webpack/webpack-sources" -"webpack-subresource-integrity@1.1.0-rc.6","MIT","https://github.com/waysact/webpack-subresource-integrity" -"webpack@4.39.2","MIT","https://github.com/webpack/webpack" -"websocket-driver@0.7.3","Apache-2.0","https://github.com/faye/websocket-driver-node" -"websocket-extensions@0.1.3","MIT","https://github.com/faye/websocket-extensions-node" +"webpack-subresource-integrity@1.4.0","MIT","https://github.com/waysact/webpack-subresource-integrity" +"webpack@4.42.0","MIT","https://github.com/webpack/webpack" +"websocket-driver@0.6.5","MIT","https://github.com/faye/websocket-driver-node" +"websocket-extensions@0.1.4","Apache-2.0","https://github.com/faye/websocket-extensions-node" "when@3.6.4","MIT","https://github.com/cujojs/when" "which-module@2.0.0","ISC","https://github.com/nexdrew/which-module" "which@1.3.0","ISC","https://github.com/isaacs/node-which" "which@1.3.1","ISC","https://github.com/isaacs/node-which" "which@2.0.2","ISC","https://github.com/isaacs/node-which" "wide-align@1.1.3","ISC","https://github.com/iarna/wide-align" -"wordwrap@0.0.3","MIT","https://github.com/substack/node-wordwrap" +"wordwrap@1.0.0","MIT","https://github.com/substack/node-wordwrap" "worker-farm@1.7.0","MIT","https://github.com/rvagg/node-worker-farm" -"worker-plugin@3.2.0","Apache-2.0","https://github.com/GoogleChromeLabs/worker-plugin" -"wrap-ansi@2.1.0","MIT","https://github.com/chalk/wrap-ansi" +"worker-plugin@4.0.3","Apache-2.0","https://github.com/GoogleChromeLabs/worker-plugin" "wrap-ansi@3.0.1","MIT","https://github.com/chalk/wrap-ansi" +"wrap-ansi@5.1.0","MIT","https://github.com/chalk/wrap-ansi" +"wrap-ansi@6.2.0","MIT","https://github.com/chalk/wrap-ansi" "wrappy@1.0.2","ISC","https://github.com/npm/wrappy" -"ws@3.3.3","MIT","https://github.com/websockets/ws" +"ws@6.1.4","MIT","https://github.com/websockets/ws" "ws@6.2.1","MIT","https://github.com/websockets/ws" -"xhr2@0.1.4","MIT","https://github.com/pwnall/node-xhr2" +"ws@7.3.1","MIT","https://github.com/websockets/ws" +"xhr2@0.2.0","MIT","https://github.com/pwnall/node-xhr2" "xmlhttprequest-ssl@1.5.5","MIT","https://github.com/mjwwit/node-XMLHttpRequest" "xregexp@4.0.0","MIT","https://github.com/slevithan/xregexp" "xtend@4.0.2","MIT","https://github.com/Raynos/xtend" "y18n@4.0.0","ISC","https://github.com/yargs/y18n" -"yallist@2.1.2","ISC","https://github.com/isaacs/yallist" -"yallist@3.0.3","ISC","https://github.com/isaacs/yallist" "yallist@3.1.1","ISC","https://github.com/isaacs/yallist" -"yargs-parser@11.1.1","ISC","https://github.com/yargs/yargs-parser" -"yargs-parser@13.1.1","ISC","https://github.com/yargs/yargs-parser" -"yargs@12.0.5","MIT","https://github.com/yargs/yargs" -"yargs@13.1.0","MIT","https://github.com/yargs/yargs" +"yallist@4.0.0","ISC","https://github.com/isaacs/yallist" +"yargs-parser@13.1.2","ISC","https://github.com/yargs/yargs-parser" +"yargs-parser@18.1.3","ISC","https://github.com/yargs/yargs-parser" +"yargs@13.3.2","MIT","https://github.com/yargs/yargs" +"yargs@15.3.0","MIT","https://github.com/yargs/yargs" +"yargs@15.4.1","MIT","https://github.com/yargs/yargs" "yauzl@2.10.0","MIT","https://github.com/thejoshwolfe/yauzl" -"yauzl@2.4.1","MIT","https://github.com/thejoshwolfe/yauzl" "yeast@0.1.2","MIT","https://github.com/unshiftio/yeast" "yn@3.1.1","MIT","https://github.com/sindresorhus/yn" -"zone.js@0.9.1","MIT","https://github.com/angular/zone.js" +"zone.js@0.10.3","MIT","https://github.com/angular/angular" diff --git a/package.json b/package.json index 8b1fc30586..120c9dc4fb 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "prebuild.prod": "npm run prebuild", "build.prod": "npx ng build --progress false --prod --subresource-integrity", "build": "npx ng build --progress false --subresource-integrity", - "license": "license-checker --excludePackages dockstore-ui2@2.3.0 --csv > THIRD-PARTY-LICENSES.csv", + "license": "license-checker --excludePackages dockstore-ui2@$npm_package_version --csv > THIRD-PARTY-LICENSES.csv", + "circle-ci-license-test-file": "license-checker --excludePackages dockstore-ui2@$npm_package_version --csv > CIRCLE-THIRD-PARTY-LICENSES.csv", "compodoc": "npx compodoc -p src/tsconfig.compodoc.json --output docs", "install-git-secrets": "./scripts/install-git-secrets.sh", "test": "npx ng test", diff --git a/scripts/detect-package-json-changes.sh b/scripts/detect-package-json-changes.sh index 1df38ea402..260794c05d 100644 --- a/scripts/detect-package-json-changes.sh +++ b/scripts/detect-package-json-changes.sh @@ -1,14 +1,9 @@ #!/bin/bash -packageJsonStatus="$(git diff --name-status develop -- package.json)" -packageLockJsonStatus="$(git diff --name-status develop -- package-lock.json)" +licenseFileStatus="$(diff CIRCLE-THIRD-PARTY-LICENSES.csv THIRD-PARTY-LICENSES.csv)" -if [ -n "$packageJsonStatus" ] && [ -n "$packageLockJsonStatus" ] -then - licenseFileStatus="$(git diff --name-status develop -- THIRD-PARTY-LICENSES.csv)" - if [ -z "$licenseFileStatus" ] +if [ -n "$licenseFileStatus" ] then - echo "The package.json and package-lock.json files have changed, but the THIRD-PARTY-LICENSES.csv file has not been updated. Update by running 'npm run license'. Review changes being made before committing and pushing." + echo "The THIRD-PARTY-LICENSES.csv file has not been updated. Update the file by running 'npm run license'." exit 1 fi -fi From e8795fda2438f6bf7a7f79290ebf59357b2e52e8 Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Thu, 4 Feb 2021 09:01:29 -0800 Subject: [PATCH 024/119] update develop's licenses (#1148) --- THIRD-PARTY-LICENSES.csv | 652 +++++++++++++++++++++------------------ 1 file changed, 344 insertions(+), 308 deletions(-) diff --git a/THIRD-PARTY-LICENSES.csv b/THIRD-PARTY-LICENSES.csv index d5cfad7032..9d55f432af 100644 --- a/THIRD-PARTY-LICENSES.csv +++ b/THIRD-PARTY-LICENSES.csv @@ -1,191 +1,207 @@ "module name","license","repository" -"@angular-devkit/architect@0.901.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-angular@0.901.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-optimizer@0.901.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/build-webpack@0.901.9","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/architect@0.1002.0","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-angular@0.1002.0","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-optimizer@0.1002.0","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/build-webpack@0.1002.0","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/core@10.2.0","MIT","https://github.com/angular/angular-cli" "@angular-devkit/core@7.3.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/core@9.1.9","MIT","https://github.com/angular/angular-cli" +"@angular-devkit/schematics@10.2.0","MIT","https://github.com/angular/angular-cli" "@angular-devkit/schematics@7.3.9","MIT","https://github.com/angular/angular-cli" -"@angular-devkit/schematics@9.1.9","MIT","https://github.com/angular/angular-cli" -"@angular/animations@9.1.11","MIT","https://github.com/angular/angular" -"@angular/cdk@9.2.4","MIT","https://github.com/angular/components" -"@angular/cli@9.1.9","MIT","https://github.com/angular/angular-cli" -"@angular/common@9.1.11","MIT","https://github.com/angular/angular" -"@angular/compiler-cli@9.1.11","MIT","https://github.com/angular/angular" -"@angular/compiler@9.1.11","MIT","https://github.com/angular/angular" -"@angular/core@9.1.11","MIT","https://github.com/angular/angular" -"@angular/flex-layout@9.0.0-beta.31","MIT","https://github.com/angular/flex-layout" -"@angular/forms@9.1.11","MIT","https://github.com/angular/angular" -"@angular/language-service@9.1.11","MIT","https://github.com/angular/angular" -"@angular/material@9.2.4","MIT","https://github.com/angular/components" -"@angular/platform-browser-dynamic@9.1.11","MIT","https://github.com/angular/angular" -"@angular/platform-browser@9.1.11","MIT","https://github.com/angular/angular" -"@angular/platform-server@9.1.11","MIT","https://github.com/angular/angular" -"@angular/router@9.1.11","MIT","https://github.com/angular/angular" +"@angular/animations@10.2.3","MIT","https://github.com/angular/angular" +"@angular/cdk@10.2.7","MIT","https://github.com/angular/components" +"@angular/cli@10.2.0","MIT","https://github.com/angular/angular-cli" +"@angular/common@10.2.3","MIT","https://github.com/angular/angular" +"@angular/compiler-cli@10.2.3","MIT","https://github.com/angular/angular" +"@angular/compiler@10.2.3","MIT","https://github.com/angular/angular" +"@angular/compiler@9.0.0","MIT","https://github.com/angular/angular" +"@angular/core@10.2.3","MIT","https://github.com/angular/angular" +"@angular/core@9.0.0","MIT","https://github.com/angular/angular" +"@angular/flex-layout@10.0.0-beta.32","MIT","https://github.com/angular/flex-layout" +"@angular/forms@10.2.3","MIT","https://github.com/angular/angular" +"@angular/language-service@10.2.3","MIT","https://github.com/angular/angular" +"@angular/material@10.2.7","MIT","https://github.com/angular/components" +"@angular/platform-browser-dynamic@10.2.3","MIT","https://github.com/angular/angular" +"@angular/platform-browser@10.2.3","MIT","https://github.com/angular/angular" +"@angular/platform-server@10.2.3","MIT","https://github.com/angular/angular" +"@angular/router@10.2.3","MIT","https://github.com/angular/angular" "@babel/code-frame@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-code-frame" -"@babel/code-frame@7.10.3","MIT","https://github.com/babel/babel" +"@babel/code-frame@7.10.4","MIT","https://github.com/babel/babel" "@babel/code-frame@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-code-frame" -"@babel/compat-data@7.10.3","MIT","https://github.com/babel/babel" -"@babel/core@7.10.3","MIT","https://github.com/babel/babel" +"@babel/compat-data@7.12.7","MIT","https://github.com/babel/babel" +"@babel/core@7.11.1","MIT","https://github.com/babel/babel" +"@babel/core@7.12.10","MIT","https://github.com/babel/babel" "@babel/core@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" -"@babel/core@7.9.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-core" -"@babel/generator@7.10.3","MIT","https://github.com/babel/babel" +"@babel/generator@7.11.0","MIT","https://github.com/babel/babel" +"@babel/generator@7.12.10","MIT","https://github.com/babel/babel" "@babel/generator@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" "@babel/generator@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" -"@babel/generator@7.9.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-generator" "@babel/helper-annotate-as-pure@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-annotate-as-pure" -"@babel/helper-annotate-as-pure@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-annotate-as-pure@7.12.10","MIT","https://github.com/babel/babel" "@babel/helper-builder-binary-assignment-operator-visitor@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-builder-binary-assignment-operator-visitor" -"@babel/helper-builder-binary-assignment-operator-visitor@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-builder-binary-assignment-operator-visitor@7.10.4","MIT","https://github.com/babel/babel" "@babel/helper-call-delegate@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate" -"@babel/helper-compilation-targets@7.10.2","MIT","https://github.com/babel/babel" -"@babel/helper-create-regexp-features-plugin@7.10.1","MIT","https://github.com/babel/babel" -"@babel/helper-define-map@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-compilation-targets@7.12.5","MIT","https://github.com/babel/babel" +"@babel/helper-create-class-features-plugin@7.12.1","MIT","https://github.com/babel/babel" +"@babel/helper-create-regexp-features-plugin@7.12.7","MIT","https://github.com/babel/babel" +"@babel/helper-define-map@7.10.5","MIT","https://github.com/babel/babel" "@babel/helper-define-map@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-define-map" "@babel/helper-explode-assignable-expression@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-explode-assignable-expression" -"@babel/helper-explode-assignable-expression@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-explode-assignable-expression@7.12.1","MIT","https://github.com/babel/babel" "@babel/helper-function-name@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-function-name" -"@babel/helper-function-name@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-function-name@7.10.4","MIT","https://github.com/babel/babel" "@babel/helper-get-function-arity@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity" -"@babel/helper-get-function-arity@7.10.3","MIT","https://github.com/babel/babel" -"@babel/helper-hoist-variables@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-get-function-arity@7.12.10","MIT","https://github.com/babel/babel" +"@babel/helper-hoist-variables@7.10.4","MIT","https://github.com/babel/babel" "@babel/helper-hoist-variables@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-hoist-variables" -"@babel/helper-member-expression-to-functions@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-member-expression-to-functions@7.12.7","MIT","https://github.com/babel/babel" "@babel/helper-member-expression-to-functions@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-member-expression-to-functions" "@babel/helper-module-imports@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-imports" -"@babel/helper-module-imports@7.10.3","MIT","https://github.com/babel/babel" -"@babel/helper-module-transforms@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-module-imports@7.12.5","MIT","https://github.com/babel/babel" +"@babel/helper-module-transforms@7.12.1","MIT","https://github.com/babel/babel" "@babel/helper-module-transforms@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-transforms" "@babel/helper-module-transforms@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-module-transforms" "@babel/helper-optimise-call-expression@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-optimise-call-expression" -"@babel/helper-optimise-call-expression@7.10.3","MIT","https://github.com/babel/babel" +"@babel/helper-optimise-call-expression@7.12.10","MIT","https://github.com/babel/babel" "@babel/helper-plugin-utils@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-plugin-utils" -"@babel/helper-plugin-utils@7.10.3","MIT","https://github.com/babel/babel" -"@babel/helper-regex@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-plugin-utils@7.10.4","MIT","https://github.com/babel/babel" "@babel/helper-regex@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-regex" "@babel/helper-regex@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-regex" "@babel/helper-remap-async-to-generator@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-remap-async-to-generator" -"@babel/helper-remap-async-to-generator@7.10.3","MIT","https://github.com/babel/babel" -"@babel/helper-replace-supers@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-remap-async-to-generator@7.12.1","MIT","https://github.com/babel/babel" +"@babel/helper-replace-supers@7.12.5","MIT","https://github.com/babel/babel" "@babel/helper-replace-supers@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-replace-supers" "@babel/helper-simple-access@7.1.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-simple-access" -"@babel/helper-simple-access@7.10.1","MIT","https://github.com/babel/babel" -"@babel/helper-split-export-declaration@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-simple-access@7.12.1","MIT","https://github.com/babel/babel" +"@babel/helper-skip-transparent-expression-wrappers@7.12.1","MIT","https://github.com/babel/babel" +"@babel/helper-split-export-declaration@7.11.0","MIT","https://github.com/babel/babel" "@babel/helper-split-export-declaration@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration" "@babel/helper-split-export-declaration@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration" -"@babel/helper-validator-identifier@7.10.3","MIT","https://github.com/babel/babel" -"@babel/helper-wrap-function@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helper-validator-identifier@7.10.4","MIT","https://github.com/babel/babel" +"@babel/helper-validator-option@7.12.1","MIT","https://github.com/babel/babel" +"@babel/helper-wrap-function@7.12.3","MIT","https://github.com/babel/babel" "@babel/helper-wrap-function@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-helper-wrap-function" -"@babel/helpers@7.10.1","MIT","https://github.com/babel/babel" +"@babel/helpers@7.12.5","MIT","https://github.com/babel/babel" "@babel/helpers@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-helpers" "@babel/highlight@7.0.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-highlight" -"@babel/highlight@7.10.3","MIT","https://github.com/babel/babel" -"@babel/parser@7.10.3","MIT","https://github.com/babel/babel" +"@babel/highlight@7.10.4","MIT","https://github.com/babel/babel" +"@babel/parser@7.10.5","MIT","https://github.com/babel/babel" +"@babel/parser@7.12.10","MIT","https://github.com/babel/babel" "@babel/parser@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-parser" "@babel/parser@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-parser" -"@babel/plugin-proposal-async-generator-functions@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-async-generator-functions@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-async-generator-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-async-generator-functions" -"@babel/plugin-proposal-dynamic-import@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-class-properties@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-dynamic-import@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-dynamic-import@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-dynamic-import" -"@babel/plugin-proposal-json-strings@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-export-namespace-from@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-json-strings@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-json-strings@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-json-strings" -"@babel/plugin-proposal-nullish-coalescing-operator@7.10.1","MIT","https://github.com/babel/babel" -"@babel/plugin-proposal-numeric-separator@7.10.1","MIT","https://github.com/babel/babel" -"@babel/plugin-proposal-object-rest-spread@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-logical-assignment-operators@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-nullish-coalescing-operator@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-numeric-separator@7.12.7","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-object-rest-spread@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-object-rest-spread@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-object-rest-spread" -"@babel/plugin-proposal-optional-catch-binding@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-optional-catch-binding@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-optional-catch-binding@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-catch-binding" -"@babel/plugin-proposal-optional-chaining@7.10.3","MIT","https://github.com/babel/babel" -"@babel/plugin-proposal-unicode-property-regex@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-optional-chaining@7.12.7","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-private-methods@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-proposal-unicode-property-regex@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-proposal-unicode-property-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-unicode-property-regex" "@babel/plugin-syntax-async-generators@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators" "@babel/plugin-syntax-async-generators@7.8.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators" +"@babel/plugin-syntax-class-properties@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-syntax-dynamic-import@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-dynamic-import" "@babel/plugin-syntax-dynamic-import@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-dynamic-import" +"@babel/plugin-syntax-export-namespace-from@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-namespace-from" "@babel/plugin-syntax-json-strings@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings" "@babel/plugin-syntax-json-strings@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings" +"@babel/plugin-syntax-logical-assignment-operators@7.10.4","MIT","https://github.com/babel/babel" "@babel/plugin-syntax-nullish-coalescing-operator@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator" -"@babel/plugin-syntax-numeric-separator@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-syntax-numeric-separator@7.10.4","MIT","https://github.com/babel/babel" "@babel/plugin-syntax-object-rest-spread@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread" "@babel/plugin-syntax-object-rest-spread@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread" "@babel/plugin-syntax-optional-catch-binding@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding" "@babel/plugin-syntax-optional-catch-binding@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding" "@babel/plugin-syntax-optional-chaining@7.8.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining" -"@babel/plugin-syntax-top-level-await@7.10.1","MIT","https://github.com/babel/babel" -"@babel/plugin-transform-arrow-functions@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-syntax-top-level-await@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-arrow-functions@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-arrow-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-arrow-functions" -"@babel/plugin-transform-async-to-generator@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-async-to-generator@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-async-to-generator@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-to-generator" -"@babel/plugin-transform-block-scoped-functions@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-block-scoped-functions@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-block-scoped-functions@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoped-functions" -"@babel/plugin-transform-block-scoping@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-block-scoping@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-block-scoping@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoping" -"@babel/plugin-transform-classes@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-classes@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-classes@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-classes" -"@babel/plugin-transform-computed-properties@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-computed-properties@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-computed-properties@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-computed-properties" -"@babel/plugin-transform-destructuring@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-destructuring@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-destructuring@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-destructuring" -"@babel/plugin-transform-dotall-regex@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-dotall-regex@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-dotall-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-dotall-regex" -"@babel/plugin-transform-duplicate-keys@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-duplicate-keys@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-duplicate-keys@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-duplicate-keys" -"@babel/plugin-transform-exponentiation-operator@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-exponentiation-operator@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-exponentiation-operator@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-exponentiation-operator" -"@babel/plugin-transform-for-of@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-for-of@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-for-of@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-for-of" -"@babel/plugin-transform-function-name@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-function-name@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-function-name@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-function-name" -"@babel/plugin-transform-literals@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-literals@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-literals" -"@babel/plugin-transform-member-expression-literals@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-member-expression-literals@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-member-expression-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-member-expression-literals" -"@babel/plugin-transform-modules-amd@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-modules-amd@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-amd@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-amd" -"@babel/plugin-transform-modules-commonjs@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-modules-commonjs@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-commonjs@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-commonjs" -"@babel/plugin-transform-modules-systemjs@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-modules-systemjs@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-systemjs@7.5.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-systemjs" -"@babel/plugin-transform-modules-umd@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-modules-umd@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-modules-umd@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-umd" -"@babel/plugin-transform-named-capturing-groups-regex@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-named-capturing-groups-regex@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-named-capturing-groups-regex@7.6.2","MIT","https://github.com/babel/babel" -"@babel/plugin-transform-new-target@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-new-target@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-new-target@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-new-target" -"@babel/plugin-transform-object-super@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-object-super@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-object-super@7.5.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-super" -"@babel/plugin-transform-parameters@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-parameters@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-parameters@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-parameters" -"@babel/plugin-transform-property-literals@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-property-literals@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-property-literals@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-property-literals" -"@babel/plugin-transform-regenerator@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-regenerator@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-regenerator@7.4.5","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-regenerator" -"@babel/plugin-transform-reserved-words@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-reserved-words@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-reserved-words@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-reserved-words" -"@babel/plugin-transform-shorthand-properties@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-runtime@7.11.0","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-shorthand-properties@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-shorthand-properties@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-shorthand-properties" -"@babel/plugin-transform-spread@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-spread@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-spread@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-spread" -"@babel/plugin-transform-sticky-regex@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-sticky-regex@7.12.7","MIT","https://github.com/babel/babel" "@babel/plugin-transform-sticky-regex@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-sticky-regex" -"@babel/plugin-transform-template-literals@7.10.3","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-template-literals@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-template-literals@7.4.4","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-template-literals" -"@babel/plugin-transform-typeof-symbol@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-typeof-symbol@7.12.10","MIT","https://github.com/babel/babel" "@babel/plugin-transform-typeof-symbol@7.2.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-typeof-symbol" -"@babel/plugin-transform-unicode-regex@7.10.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-unicode-escapes@7.12.1","MIT","https://github.com/babel/babel" +"@babel/plugin-transform-unicode-regex@7.12.1","MIT","https://github.com/babel/babel" "@babel/plugin-transform-unicode-regex@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-unicode-regex" +"@babel/preset-env@7.11.0","MIT","https://github.com/babel/babel" "@babel/preset-env@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-preset-env" -"@babel/preset-env@7.9.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-preset-env" -"@babel/preset-modules@0.1.3","MIT","" -"@babel/runtime@7.10.3","MIT","https://github.com/babel/babel" -"@babel/template@7.10.3","MIT","https://github.com/babel/babel" +"@babel/preset-modules@0.1.4","MIT","" +"@babel/runtime@7.11.2","MIT","https://github.com/babel/babel" +"@babel/template@7.10.4","MIT","https://github.com/babel/babel" +"@babel/template@7.12.7","MIT","https://github.com/babel/babel" "@babel/template@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" "@babel/template@7.6.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" -"@babel/template@7.8.6","MIT","https://github.com/babel/babel/tree/master/packages/babel-template" -"@babel/traverse@7.10.3","MIT","https://github.com/babel/babel" +"@babel/traverse@7.10.5","MIT","https://github.com/babel/babel" +"@babel/traverse@7.12.10","MIT","https://github.com/babel/babel" "@babel/traverse@7.4.3","MIT","https://github.com/babel/babel/tree/master/packages/babel-traverse" "@babel/traverse@7.6.2","MIT","https://github.com/babel/babel/tree/master/packages/babel-traverse" -"@babel/types@7.10.3","MIT","https://github.com/babel/babel" +"@babel/types@7.10.5","MIT","https://github.com/babel/babel" +"@babel/types@7.12.10","MIT","https://github.com/babel/babel" "@babel/types@7.4.0","MIT","https://github.com/babel/babel/tree/master/packages/babel-types" "@babel/types@7.6.1","MIT","https://github.com/babel/babel/tree/master/packages/babel-types" "@cypress/listr-verbose-renderer@0.4.1","MIT","https://github.com/SamVerschueren/listr-verbose-renderer" @@ -195,24 +211,24 @@ "@datorama/akita-ng-forms-manager@3.1.0","Apache*","https://github.com/NetanelBasal/akita-ng-forms-manager" "@datorama/akita-ngdevtools@3.0.2","Apache*","" "@datorama/akita@4.10.8","Apache*","https://github.com/datorama/akita" -"@fortawesome/angular-fontawesome@0.6.1","MIT","https://github.com/FortAwesome/angular-fontawesome" +"@fortawesome/angular-fontawesome@0.7.0","MIT","https://github.com/FortAwesome/angular-fontawesome" "@fortawesome/fontawesome-common-types@0.2.29","MIT","https://github.com/FortAwesome/Font-Awesome" "@fortawesome/fontawesome-svg-core@1.2.29","MIT","https://github.com/FortAwesome/Font-Awesome" "@fortawesome/free-brands-svg-icons@5.13.1","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" "@fortawesome/free-solid-svg-icons@5.13.1","(CC-BY-4.0 AND MIT)","https://github.com/FortAwesome/Font-Awesome" "@istanbuljs/schema@0.1.2","MIT","https://github.com/istanbuljs/schema" -"@jsdevtools/coverage-istanbul-loader@3.0.3","MIT","https://github.com/JS-DevTools/coverage-istanbul-loader" -"@material-extended/mde@2.3.1","MIT","https://github.com/material-extended/popover" -"@ngtools/webpack@9.1.9","MIT","https://github.com/angular/angular-cli" +"@jsdevtools/coverage-istanbul-loader@3.0.5","MIT","https://github.com/JS-DevTools/coverage-istanbul-loader" +"@material-extended/mde@3.0.3","MIT","https://github.com/material-extended/mde" +"@ngtools/webpack@10.2.0","MIT","https://github.com/angular/angular-cli" "@ngx-lite/json-ld@0.6.2","MIT","https://github.com/coryrylan/ngx-json-ld" "@nodelib/fs.scandir@2.1.2","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir" "@nodelib/fs.stat@2.0.2","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat" "@nodelib/fs.walk@1.2.3","MIT","https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk" "@npmcli/move-file@1.0.1","MIT","https://github.com/npm/move-file" -"@phenomnomnominal/tsquery@3.0.0","MIT","https://github.com/phenomnomnominal/tsquery" +"@phenomnomnominal/tsquery@4.1.1","MIT","https://github.com/phenomnomnominal/tsquery" "@samverschueren/stream-to-observable@0.3.0","MIT","https://github.com/SamVerschueren/stream-to-observable" -"@schematics/angular@9.1.9","MIT","https://github.com/angular/angular-cli" -"@schematics/update@0.901.9","MIT","https://github.com/angular/angular-cli" +"@schematics/angular@10.2.0","MIT","https://github.com/angular/angular-cli" +"@schematics/update@0.1002.0","MIT","https://github.com/angular/angular-cli" "@types/color-name@1.1.1","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/cytoscape@3.8.2","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/elastic.js@1.2.8","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" @@ -223,7 +239,7 @@ "@types/jasminewd2@2.0.6","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/jquery@3.3.31","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/json-schema@7.0.5","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" -"@types/marked@0.7.4","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/marked@1.2.1","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/minimatch@3.0.3","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" "@types/node@12.12.47","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/normalize-package-data@2.4.0","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" @@ -232,33 +248,37 @@ "@types/sizzle@2.3.2","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" "@types/source-list-map@0.1.2","MIT","https://www.github.com/DefinitelyTyped/DefinitelyTyped" "@types/webpack-sources@0.1.8","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" -"@webassemblyjs/ast@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/floating-point-hex-parser@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/helper-api-error@1.8.5","MIT","" -"@webassemblyjs/helper-buffer@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/helper-code-frame@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/helper-fsm@1.8.5","ISC","" -"@webassemblyjs/helper-module-context@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/helper-wasm-bytecode@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/helper-wasm-section@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/ieee754@1.8.5","MIT","" -"@webassemblyjs/leb128@1.8.5","MIT","" -"@webassemblyjs/utf8@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wasm-edit@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wasm-gen@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wasm-opt@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wasm-parser@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wast-parser@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" -"@webassemblyjs/wast-printer@1.8.5","MIT","https://github.com/xtuc/webassemblyjs" +"@types/yargs-parser@15.0.0","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@types/yargs@15.0.11","MIT","https://github.com/DefinitelyTyped/DefinitelyTyped" +"@webassemblyjs/ast@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/floating-point-hex-parser@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/helper-api-error@1.9.0","MIT","" +"@webassemblyjs/helper-buffer@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/helper-code-frame@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/helper-fsm@1.9.0","ISC","" +"@webassemblyjs/helper-module-context@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/helper-wasm-bytecode@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/helper-wasm-section@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/ieee754@1.9.0","MIT","" +"@webassemblyjs/leb128@1.9.0","MIT","" +"@webassemblyjs/utf8@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wasm-edit@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wasm-gen@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wasm-opt@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wasm-parser@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wast-parser@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" +"@webassemblyjs/wast-printer@1.9.0","MIT","https://github.com/xtuc/webassemblyjs" "@xtuc/ieee754@1.2.0","BSD-3-Clause","https://github.com/feross/ieee754" "@xtuc/long@4.2.2","Apache-2.0","https://github.com/dcodeIO/long.js" "@yarnpkg/lockfile@1.1.0","BSD-2-Clause","https://github.com/yarnpkg/yarn/blob/master/packages/lockfile" "JSONStream@1.3.5","(MIT OR Apache-2.0)","https://github.com/dominictarr/JSONStream" +"abab@2.0.5","BSD-3-Clause","https://github.com/jsdom/abab" "abbrev@1.1.1","ISC","https://github.com/isaacs/abbrev-js" "accepts@1.3.5","MIT","https://github.com/jshttp/accepts" "accepts@1.3.7","MIT","https://github.com/jshttp/accepts" "ace-builds@1.4.6","BSD-3-Clause","https://github.com/ajaxorg/ace-builds" -"acorn@6.4.1","MIT","https://github.com/acornjs/acorn" +"acorn@6.4.2","MIT","https://github.com/acornjs/acorn" +"adjust-sourcemap-loader@3.0.0","MIT","https://github.com/bholloway/adjust-sourcemap-loader" "after@0.8.2","MIT","https://github.com/Raynos/after" "agent-base@4.2.1","MIT","https://github.com/TooTallNate/node-agent-base" "agent-base@4.3.0","MIT","https://github.com/TooTallNate/node-agent-base" @@ -267,12 +287,12 @@ "ajv-errors@1.0.1","MIT","https://github.com/epoberezkin/ajv-errors" "ajv-keywords@3.5.0","MIT","https://github.com/epoberezkin/ajv-keywords" "ajv@5.5.2","MIT","https://github.com/epoberezkin/ajv" -"ajv@6.12.0","MIT","https://github.com/epoberezkin/ajv" "ajv@6.12.2","MIT","https://github.com/epoberezkin/ajv" "ajv@6.12.4","MIT","https://github.com/ajv-validator/ajv" +"ajv@6.12.6","MIT","https://github.com/ajv-validator/ajv" "ajv@6.9.1","MIT","https://github.com/epoberezkin/ajv" "alphanum-sort@1.0.2","MIT","https://github.com/TrySound/alphanum-sort" -"angular-tag-cloud-module@3.8.1","MIT*","" +"angular-tag-cloud-module@5.2.0","MIT*","" "ansi-colors@3.2.4","MIT","https://github.com/doowb/ansi-colors" "ansi-colors@4.1.1","MIT","https://github.com/doowb/ansi-colors" "ansi-escapes@3.2.0","MIT","https://github.com/sindresorhus/ansi-escapes" @@ -286,18 +306,18 @@ "ansi-styles@3.2.0","MIT","https://github.com/chalk/ansi-styles" "ansi-styles@3.2.1","MIT","https://github.com/chalk/ansi-styles" "ansi-styles@4.2.1","MIT","https://github.com/chalk/ansi-styles" +"ansi-styles@4.3.0","MIT","https://github.com/chalk/ansi-styles" "any-observable@0.3.0","MIT","https://github.com/sindresorhus/any-observable" "anymatch@2.0.0","ISC","https://github.com/micromatch/anymatch" -"anymatch@3.1.0","ISC","https://github.com/micromatch/anymatch" "anymatch@3.1.1","ISC","https://github.com/micromatch/anymatch" -"app-root-path@2.2.1","MIT","https://github.com/inxilpro/node-app-root-path" -"append-transform@1.0.0","MIT","https://github.com/istanbuljs/append-transform" +"app-root-path@3.0.0","MIT","https://github.com/inxilpro/node-app-root-path" "aproba@1.2.0","ISC","https://github.com/iarna/aproba" "arch@2.1.2","MIT","https://github.com/feross/arch" "are-we-there-yet@1.1.5","ISC","https://github.com/iarna/are-we-there-yet" "arg@4.1.1","MIT","https://github.com/zeit/arg" "argparse@1.0.10","MIT","https://github.com/nodeca/argparse" "aria-query@3.0.0","Apache-2.0","https://github.com/A11yance/aria-query" +"arity-n@1.0.4","MIT","https://github.com/stoeffel/arityN" "arr-diff@4.0.0","MIT","https://github.com/jonschlinkert/arr-diff" "arr-flatten@1.1.0","MIT","https://github.com/jonschlinkert/arr-flatten" "arr-union@3.1.0","MIT","https://github.com/jonschlinkert/arr-union" @@ -310,7 +330,7 @@ "array-unique@0.3.2","MIT","https://github.com/jonschlinkert/array-unique" "arraybuffer.slice@0.0.7","MIT","https://github.com/rase-/arraybuffer.slice" "asap@2.0.6","MIT","https://github.com/kriskowal/asap" -"asn1.js@4.10.1","MIT","https://github.com/indutny/asn1.js" +"asn1.js@5.4.1","MIT","https://github.com/indutny/asn1.js" "asn1@0.2.4","MIT","https://github.com/joyent/node-asn1" "assert-plus@1.0.0","MIT","https://github.com/mcavage/node-assert-plus" "assert@1.5.0","MIT","https://github.com/browserify/commonjs-assert" @@ -323,39 +343,36 @@ "asynckit@0.4.0","MIT","https://github.com/alexindigo/asynckit" "at-least-node@1.0.0","ISC","https://github.com/RyanZim/at-least-node" "atob@2.1.1","(MIT OR Apache-2.0)","git://git.coolaj86.com/coolaj86/atob.js" -"autoprefixer@9.7.4","MIT","https://github.com/postcss/autoprefixer" +"autoprefixer@9.8.6","MIT","https://github.com/postcss/autoprefixer" "aws-sign2@0.7.0","Apache-2.0","https://github.com/mikeal/aws-sign" "aws4@1.10.1","MIT","https://github.com/mhart/aws4" "aws4@1.8.0","MIT","https://github.com/mhart/aws4" "axobject-query@2.0.2","Apache-2.0","https://github.com/A11yance/axobject-query" -"babel-loader@8.0.6","MIT","https://github.com/babel/babel-loader" "babel-loader@8.1.0","MIT","https://github.com/babel/babel-loader" "babel-plugin-dynamic-import-node@2.3.0","MIT","https://github.com/airbnb/babel-plugin-dynamic-import-node" "babel-plugin-dynamic-import-node@2.3.3","MIT","https://github.com/airbnb/babel-plugin-dynamic-import-node" "backo2@1.0.2","MIT","https://github.com/mokesmokes/backo" "balanced-match@1.0.0","MIT","https://github.com/juliangruber/balanced-match" -"base64-arraybuffer@0.1.5","MIT","https://github.com/niklasvh/base64-arraybuffer" -"base64-js@1.3.1","MIT","https://github.com/beatgammit/base64-js" +"base64-arraybuffer@0.1.4","MIT","https://github.com/niklasvh/base64-arraybuffer" +"base64-js@1.5.1","MIT","https://github.com/beatgammit/base64-js" "base64id@2.0.0","MIT","https://github.com/faeldt/base64id" "base@0.11.2","MIT","https://github.com/node-base/base" "batch@0.6.1","MIT","https://github.com/visionmedia/batch" "bcrypt-pbkdf@1.0.2","BSD-3-Clause","https://github.com/joyent/node-bcrypt-pbkdf" -"better-assert@1.0.2","MIT*","https://github.com/visionmedia/better-assert" +"bent@7.3.12","Apache-2.0","https://github.com/mikeal/bent" "big.js@3.2.0","MIT","https://github.com/MikeMcl/big.js" "big.js@5.2.2","MIT","https://github.com/MikeMcl/big.js" "binary-extensions@1.11.0","MIT","https://github.com/sindresorhus/binary-extensions" -"binary-extensions@2.0.0","MIT","https://github.com/sindresorhus/binary-extensions" "binary-extensions@2.1.0","MIT","https://github.com/sindresorhus/binary-extensions" "bindings@1.5.0","MIT","https://github.com/TooTallNate/node-bindings" "blob-util@2.0.2","Apache-2.0","https://github.com/nolanlawson/blob-util" "blob@0.0.5","MIT","https://github.com/webmodules/blob" "bluebird@3.5.0","MIT","https://github.com/petkaantonov/bluebird" -"bluebird@3.5.1","MIT","https://github.com/petkaantonov/bluebird" "bluebird@3.7.2","MIT","https://github.com/petkaantonov/bluebird" "bn.js@4.11.9","MIT","https://github.com/indutny/bn.js" -"bn.js@5.1.2","MIT","https://github.com/indutny/bn.js" +"bn.js@5.1.3","MIT","https://github.com/indutny/bn.js" "body-parser@1.19.0","MIT","https://github.com/expressjs/body-parser" -"bodybuilder@2.2.17","MIT","https://github.com/danpaz/bodybuilder" +"bodybuilder@2.2.25","MIT","https://github.com/danpaz/bodybuilder" "bonjour@3.5.0","MIT","https://github.com/watson/bonjour" "boolbase@1.0.0","ISC","https://github.com/fb55/boolbase" "bootstrap-social@5.1.1","MIT","https://github.com/lipis/bootstrap-social" @@ -367,10 +384,10 @@ "browserify-aes@1.2.0","MIT","https://github.com/crypto-browserify/browserify-aes" "browserify-cipher@1.0.1","MIT","https://github.com/crypto-browserify/browserify-cipher" "browserify-des@1.0.2","MIT","https://github.com/crypto-browserify/browserify-des" -"browserify-rsa@4.0.1","MIT","https://github.com/crypto-browserify/browserify-rsa" -"browserify-sign@4.2.0","ISC","https://github.com/crypto-browserify/browserify-sign" +"browserify-rsa@4.1.0","MIT","https://github.com/crypto-browserify/browserify-rsa" +"browserify-sign@4.2.1","ISC","https://github.com/crypto-browserify/browserify-sign" "browserify-zlib@0.2.0","MIT","https://github.com/devongovett/browserify-zlib" -"browserslist@4.12.0","MIT","https://github.com/browserslist/browserslist" +"browserslist@4.16.0","MIT","https://github.com/browserslist/browserslist" "browserslist@4.7.0","MIT","https://github.com/browserslist/browserslist" "buffer-crc32@0.2.13","MIT","https://github.com/brianloveswords/buffer-crc32" "buffer-from@1.0.0","MIT","https://github.com/LinusU/buffer-from" @@ -382,33 +399,31 @@ "builtins@1.0.3","MIT","https://github.com/juliangruber/builtins" "bytes@3.0.0","MIT","https://github.com/visionmedia/bytes.js" "bytes@3.1.0","MIT","https://github.com/visionmedia/bytes.js" +"bytesish@0.4.4","(Apache-2.0 AND MIT)","https://github.com/mikeal/bytesish" "cacache@12.0.4","ISC","https://github.com/npm/cacache" -"cacache@15.0.0","ISC","https://github.com/npm/cacache" -"cacache@15.0.4","ISC","https://github.com/npm/cacache" +"cacache@15.0.5","ISC","https://github.com/npm/cacache" "cache-base@1.0.1","MIT","https://github.com/jonschlinkert/cache-base" "cachedir@2.3.0","MIT","https://github.com/LinusU/node-cachedir" +"call-bind@1.0.0","MIT","https://github.com/ljharb/call-bind" "caller-callsite@2.0.0","MIT","https://github.com/sindresorhus/caller-callsite" "caller-path@2.0.0","MIT","https://github.com/sindresorhus/caller-path" -"callsite@1.0.0","MIT*","" "callsites@2.0.0","MIT","https://github.com/sindresorhus/callsites" "camelcase@5.3.1","MIT","https://github.com/sindresorhus/camelcase" +"camelcase@6.2.0","MIT","https://github.com/sindresorhus/camelcase" "caniuse-api@3.0.0","MIT","https://github.com/nyalab/caniuse-api" "caniuse-lite@1.0.30000989","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" -"caniuse-lite@1.0.30001087","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" +"caniuse-lite@1.0.30001165","CC-BY-4.0","https://github.com/ben-eb/caniuse-lite" "canonical-path@1.0.0","MIT","https://github.com/petebacondarwin/node-canonical-path" "caseless@0.12.0","Apache-2.0","https://github.com/mikeal/caseless" "chalk@1.1.3","MIT","https://github.com/chalk/chalk" "chalk@2.3.0","MIT","https://github.com/chalk/chalk" "chalk@2.4.2","MIT","https://github.com/chalk/chalk" -"chalk@3.0.0","MIT","https://github.com/chalk/chalk" "chalk@4.1.0","MIT","https://github.com/chalk/chalk" "chardet@0.7.0","MIT","https://github.com/runk/node-chardet" "check-more-types@2.24.0","MIT","https://github.com/kensho/check-more-types" "chokidar@2.0.4","MIT","https://github.com/paulmillr/chokidar" "chokidar@2.1.8","MIT","https://github.com/paulmillr/chokidar" -"chokidar@3.1.1","MIT","https://github.com/paulmillr/chokidar" -"chokidar@3.4.0","MIT","https://github.com/paulmillr/chokidar" -"chokidar@3.4.2","MIT","https://github.com/paulmillr/chokidar" +"chokidar@3.4.3","MIT","https://github.com/paulmillr/chokidar" "chownr@1.1.4","ISC","https://github.com/isaacs/chownr" "chownr@2.0.0","ISC","https://github.com/isaacs/chownr" "chrome-trace-event@1.0.2","MIT","github.com:samccone/chrome-trace-event" @@ -420,27 +435,27 @@ "cli-cursor@1.0.2","MIT","https://github.com/sindresorhus/cli-cursor" "cli-cursor@2.1.0","MIT","https://github.com/sindresorhus/cli-cursor" "cli-cursor@3.1.0","MIT","https://github.com/sindresorhus/cli-cursor" -"cli-spinners@2.3.0","MIT","https://github.com/sindresorhus/cli-spinners" +"cli-spinners@2.5.0","MIT","https://github.com/sindresorhus/cli-spinners" "cli-table3@0.6.0","MIT","https://github.com/cli-table/cli-table3" "cli-truncate@0.2.1","MIT","https://github.com/sindresorhus/cli-truncate" -"cli-width@2.2.1","ISC","https://github.com/knownasilya/cli-width" +"cli-width@3.0.0","ISC","https://github.com/knownasilya/cli-width" "clipboard@2.0.6","MIT","https://github.com/zenorocha/clipboard.js" "cliui@5.0.0","ISC","https://github.com/yargs/cliui" "cliui@6.0.0","ISC","https://github.com/yargs/cliui" -"clone-deep@4.0.1","MIT","https://github.com/jonschlinkert/clone-deep" "clone@1.0.4","MIT","https://github.com/pvorb/node-clone" "clone@2.1.2","MIT","https://github.com/pvorb/node-clone" "co@4.6.0","MIT","https://github.com/tj/co" "coa@2.0.2","MIT","https://github.com/veged/coa" "code-point-at@1.1.0","MIT","https://github.com/sindresorhus/code-point-at" -"codelyzer@5.2.2","MIT","https://github.com/mgechev/codelyzer" +"codelyzer@6.0.1","MIT","https://github.com/mgechev/codelyzer" "collection-visit@1.0.0","MIT","https://github.com/jonschlinkert/collection-visit" "color-convert@1.9.1","MIT","https://github.com/Qix-/color-convert" "color-convert@2.0.1","MIT","https://github.com/Qix-/color-convert" "color-name@1.1.3","MIT","https://github.com/dfcreative/color-name" "color-name@1.1.4","MIT","https://github.com/colorjs/color-name" -"color-string@1.5.3","MIT","https://github.com/Qix-/color-string" -"color@3.1.2","MIT","https://github.com/Qix-/color" +"color-string@1.5.4","MIT","https://github.com/Qix-/color-string" +"color@3.1.3","MIT","https://github.com/Qix-/color" +"colorette@1.2.1","MIT","https://github.com/jorgebucaran/colorette" "colors@1.1.2","MIT","https://github.com/Marak/colors.js" "colors@1.4.0","MIT","https://github.com/Marak/colors.js" "combined-stream@1.0.7","MIT","https://github.com/felixge/node-combined-stream" @@ -451,11 +466,11 @@ "commander@4.1.1","MIT","https://github.com/tj/commander.js" "common-tags@1.8.0","MIT","https://github.com/declandewet/common-tags" "commondir@1.0.1","MIT","https://github.com/substack/node-commondir" -"compare-versions@3.5.1","MIT","https://github.com/omichelsen/compare-versions" "component-bind@1.0.0","MIT*","https://github.com/component/bind" "component-emitter@1.2.1","MIT","https://github.com/component/emitter" "component-emitter@1.3.0","MIT","https://github.com/component/emitter" "component-inherit@0.0.3","MIT*","https://github.com/component/inherit" +"compose-function@3.0.3","MIT","https://github.com/stoeffel/compose-function" "compressible@2.0.18","MIT","https://github.com/jshttp/compressible" "compression@1.7.4","MIT","https://github.com/expressjs/compression" "concat-map@0.0.1","MIT","https://github.com/substack/node-concat-map" @@ -467,21 +482,22 @@ "constants-browserify@1.0.0","MIT","https://github.com/juliangruber/constants-browserify" "content-disposition@0.5.3","MIT","https://github.com/jshttp/content-disposition" "content-type@1.0.4","MIT","https://github.com/jshttp/content-type" +"convert-source-map@0.3.5","MIT","https://github.com/thlorenz/convert-source-map" "convert-source-map@1.5.1","MIT","https://github.com/thlorenz/convert-source-map" "convert-source-map@1.7.0","MIT","https://github.com/thlorenz/convert-source-map" "cookie-signature@1.0.6","MIT","https://github.com/visionmedia/node-cookie-signature" -"cookie@0.3.1","MIT","https://github.com/jshttp/cookie" "cookie@0.4.0","MIT","https://github.com/jshttp/cookie" +"cookie@0.4.1","MIT","https://github.com/jshttp/cookie" "copy-concurrently@1.0.5","ISC","https://github.com/npm/copy-concurrently" "copy-descriptor@0.1.1","MIT","https://github.com/jonschlinkert/copy-descriptor" -"copy-webpack-plugin@6.0.2","MIT","https://github.com/webpack-contrib/copy-webpack-plugin" +"copy-webpack-plugin@6.0.3","MIT","https://github.com/webpack-contrib/copy-webpack-plugin" "core-js-compat@3.2.1","MIT","https://github.com/zloirock/core-js" -"core-js-compat@3.6.5","MIT","https://github.com/zloirock/core-js" +"core-js-compat@3.8.1","MIT","https://github.com/zloirock/core-js" "core-js@3.2.1","MIT","https://github.com/zloirock/core-js" "core-js@3.6.4","MIT","https://github.com/zloirock/core-js" "core-util-is@1.0.2","MIT","https://github.com/isaacs/core-util-is" "cosmiconfig@5.2.1","MIT","https://github.com/davidtheclark/cosmiconfig" -"create-ecdh@4.0.3","MIT","https://github.com/crypto-browserify/createECDH" +"create-ecdh@4.0.4","MIT","https://github.com/crypto-browserify/createECDH" "create-hash@1.2.0","MIT","https://github.com/crypto-browserify/createHash" "create-hmac@1.1.7","MIT","https://github.com/crypto-browserify/createHmac" "cross-spawn@6.0.5","MIT","https://github.com/moxystudio/node-cross-spawn" @@ -489,14 +505,14 @@ "crypto-browserify@3.12.0","MIT","https://github.com/crypto-browserify/crypto-browserify" "css-color-names@0.0.4","MIT","https://github.com/bahamas10/css-color-names" "css-declaration-sorter@4.0.1","MIT","https://github.com/Siilwyn/css-declaration-sorter" -"css-loader@3.5.1","MIT","https://github.com/webpack-contrib/css-loader" +"css-loader@4.2.2","MIT","https://github.com/webpack-contrib/css-loader" "css-parse@2.0.0","MIT","https://github.com/reworkcss/css-parse" "css-select-base-adapter@0.1.1","MIT","https://github.com/nrkn/css-select-base-adapter" "css-select@2.1.0","BSD-2-Clause","https://github.com/fb55/css-select" -"css-selector-tokenizer@0.7.2","MIT","https://github.com/css-modules/css-selector-tokenizer" +"css-selector-tokenizer@0.7.3","MIT","https://github.com/css-modules/css-selector-tokenizer" "css-tree@1.0.0-alpha.37","MIT","https://github.com/csstree/csstree" -"css-tree@1.0.0-alpha.39","MIT","https://github.com/csstree/csstree" -"css-what@3.3.0","BSD-2-Clause","https://github.com/fb55/css-what" +"css-tree@1.1.2","MIT","https://github.com/csstree/csstree" +"css-what@3.4.2","BSD-2-Clause","https://github.com/fb55/css-what" "css@2.2.4","MIT","https://github.com/reworkcss/css" "cssauron@1.4.0","MIT","https://github.com/chrisdickinson/cssauron" "cssesc@3.0.0","MIT","https://github.com/mathiasbynens/cssesc" @@ -506,32 +522,34 @@ "cssnano-util-raw-cache@4.0.1","MIT","https://github.com/cssnano/cssnano" "cssnano-util-same-parent@4.0.1","MIT","https://github.com/cssnano/cssnano" "cssnano@4.1.10","MIT","https://github.com/cssnano/cssnano" -"csso@4.0.3","MIT","https://github.com/css/csso" +"csso@4.2.0","MIT","https://github.com/css/csso" "custom-event@1.0.1","MIT","https://github.com/webmodules/custom-event" "cyclist@1.0.1","MIT","https://github.com/mafintosh/cyclist" "cypress@5.0.0","MIT","https://github.com/cypress-io/cypress" "cytoscape-dagre@2.2.2","MIT","https://github.com/cytoscape/cytoscape.js-dagre" "cytoscape-popper@1.0.4","MIT","https://github.com/cytoscape/cytoscape.js-popper" "cytoscape@3.10.1","MIT","https://github.com/cytoscape/cytoscape.js" +"d@1.0.1","ISC","https://github.com/medikoo/d" "dagre@0.8.4","MIT","https://github.com/dagrejs/dagre" "damerau-levenshtein@1.0.6","BSD-2-Clause","https://github.com/tad-lispy/node-damerau-levenshtein" "dashdash@1.14.1","MIT","https://github.com/trentm/node-dashdash" +"data-urls@2.0.0","MIT","https://github.com/jsdom/data-urls" "date-fns@1.30.1","MIT","https://github.com/date-fns/date-fns" "date-format@2.1.0","MIT","https://github.com/nomiddlename/date-format" "date-format@3.0.0","MIT","https://github.com/nomiddlename/date-format" "debug@2.6.9","MIT","https://github.com/visionmedia/debug" "debug@3.1.0","MIT","https://github.com/visionmedia/debug" "debug@3.2.6","MIT","https://github.com/visionmedia/debug" +"debug@3.2.7","MIT","https://github.com/visionmedia/debug" "debug@4.1.1","MIT","https://github.com/visionmedia/debug" -"debug@4.2.0","MIT","https://github.com/visionmedia/debug" +"debug@4.3.1","MIT","https://github.com/visionmedia/debug" "debuglog@1.0.1","MIT","https://github.com/sam-github/node-debuglog" "decamelize@1.2.0","MIT","https://github.com/sindresorhus/decamelize" -"decamelize@2.0.0","MIT","https://github.com/sindresorhus/decamelize" +"decamelize@4.0.0","MIT","https://github.com/sindresorhus/decamelize" "decode-uri-component@0.2.0","MIT","https://github.com/SamVerschueren/decode-uri-component" "dedent@0.7.0","MIT","https://github.com/dmnd/dedent" "deep-equal@1.1.1","MIT","https://github.com/substack/node-deep-equal" "default-gateway@4.2.0","BSD-2-Clause","https://github.com/silverwind/default-gateway" -"default-require-extensions@2.0.0","MIT","https://github.com/avajs/default-require-extensions" "defaults@1.0.3","MIT","https://github.com/tmpvar/defaults" "define-properties@1.1.3","MIT","https://github.com/ljharb/define-properties" "define-property@0.2.5","MIT","https://github.com/jonschlinkert/define-property" @@ -559,53 +577,58 @@ "dom-serializer@0.2.2","MIT","https://github.com/cheeriojs/dom-renderer" "domain-browser@1.2.0","MIT","https://github.com/bevry/domain-browser" "domelementtype@1.3.1","BSD-2-Clause","https://github.com/fb55/domelementtype" -"domelementtype@2.0.1","BSD-2-Clause","https://github.com/fb55/domelementtype" -"domino@2.1.5","BSD-2-Clause","https://github.com/fgnass/domino" +"domelementtype@2.1.0","BSD-2-Clause","https://github.com/fb55/domelementtype" +"domino@2.1.6","BSD-2-Clause","https://github.com/fgnass/domino" "dompurify@2.2.0","MPL-2.0 OR Apache-2.0","https://github.com/cure53/DOMPurify" "domutils@1.7.0","BSD-2-Clause","https://github.com/FB55/domutils" -"dot-prop@5.2.0","MIT","https://github.com/sindresorhus/dot-prop" +"dot-prop@5.3.0","MIT","https://github.com/sindresorhus/dot-prop" "duplexify@3.7.1","MIT","https://github.com/mafintosh/duplexify" "ecc-jsbn@0.1.2","MIT","https://github.com/quartzjer/ecc-jsbn" "ee-first@1.1.1","MIT","https://github.com/jonathanong/ee-first" -"elasticsearch-browser@15.0.0","Apache-2.0","https://github.com/elasticsearch/bower-elasticsearch-js" "electron-to-chromium@1.3.263","ISC","https://github.com/kilian/electron-to-chromium" -"electron-to-chromium@1.3.481","ISC","https://github.com/kilian/electron-to-chromium" +"electron-to-chromium@1.3.623","ISC","https://github.com/kilian/electron-to-chromium" "elegant-spinner@1.0.1","MIT","https://github.com/sindresorhus/elegant-spinner" "elliptic@6.5.3","MIT","https://github.com/indutny/elliptic" "emoji-regex@7.0.3","MIT","https://github.com/mathiasbynens/emoji-regex" "emoji-regex@8.0.0","MIT","https://github.com/mathiasbynens/emoji-regex" -"emoji-toolkit@5.5.1","(MIT)","https://github.com/joypixels/emoji-toolkit" +"emoji-toolkit@6.0.1","(MIT)","https://github.com/joypixels/emoji-toolkit" "emojis-list@2.1.0","MIT","https://github.com/kikobeats/emojis-list" "emojis-list@3.0.0","MIT","https://github.com/kikobeats/emojis-list" "encodeurl@1.0.2","MIT","https://github.com/pillarjs/encodeurl" -"encoding@0.1.12","MIT","https://github.com/andris9/encoding" +"encoding@0.1.13","MIT","https://github.com/andris9/encoding" "end-of-stream@1.4.1","MIT","https://github.com/mafintosh/end-of-stream" -"engine.io-client@3.4.3","MIT","https://github.com/socketio/engine.io-client" -"engine.io-parser@2.2.0","MIT","https://github.com/socketio/engine.io-parser" -"engine.io@3.4.2","MIT","https://github.com/socketio/engine.io" +"engine.io-client@3.5.0","MIT","https://github.com/socketio/engine.io-client" +"engine.io-parser@2.2.1","MIT","https://github.com/socketio/engine.io-parser" +"engine.io@3.5.0","MIT","https://github.com/socketio/engine.io" "enhanced-resolve@4.1.0","MIT","https://github.com/webpack/enhanced-resolve" -"enhanced-resolve@4.1.1","MIT","https://github.com/webpack/enhanced-resolve" +"enhanced-resolve@4.3.0","MIT","https://github.com/webpack/enhanced-resolve" "ent@2.2.0","MIT","https://github.com/substack/node-ent" -"entities@2.0.3","BSD-2-Clause","https://github.com/fb55/entities" +"entities@2.1.0","BSD-2-Clause","https://github.com/fb55/entities" "err-code@1.1.2","MIT","https://github.com/IndigoUnited/js-err-code" "errno@0.1.7","MIT","https://github.com/rvagg/node-errno" "error-ex@1.3.1","MIT","https://github.com/qix-/node-error-ex" -"es-abstract@1.17.6","MIT","https://github.com/ljharb/es-abstract" +"es-abstract@1.17.7","MIT","https://github.com/ljharb/es-abstract" +"es-abstract@1.18.0-next.1","MIT","https://github.com/ljharb/es-abstract" "es-to-primitive@1.2.1","MIT","https://github.com/ljharb/es-to-primitive" +"es5-ext@0.10.53","ISC","https://github.com/medikoo/es5-ext" +"es6-iterator@2.0.3","MIT","https://github.com/medikoo/es6-iterator" "es6-promise@4.2.8","MIT","https://github.com/stefanpenner/es6-promise" "es6-promisify@5.0.0","MIT","https://github.com/digitaldesignlabs/es6-promisify" +"es6-symbol@3.1.3","ISC","https://github.com/medikoo/es6-symbol" +"escalade@3.1.1","MIT","https://github.com/lukeed/escalade" "escape-html@1.0.3","MIT","https://github.com/component/escape-html" "escape-string-regexp@1.0.5","MIT","https://github.com/sindresorhus/escape-string-regexp" "eslint-scope@4.0.3","BSD-2-Clause","https://github.com/eslint/eslint-scope" "esprima@4.0.1","BSD-2-Clause","https://github.com/jquery/esprima" -"esquery@1.0.1","BSD-3-Clause","https://github.com/jrfeenst/esquery" -"esrecurse@4.2.1","BSD-2-Clause","https://github.com/estools/esrecurse" +"esquery@1.3.1","BSD-3-Clause","https://github.com/estools/esquery" +"esrecurse@4.3.0","BSD-2-Clause","https://github.com/estools/esrecurse" "estraverse@4.3.0","BSD-2-Clause","https://github.com/estools/estraverse" +"estraverse@5.2.0","BSD-2-Clause","https://github.com/estools/estraverse" "esutils@2.0.2","BSD","https://github.com/estools/esutils" "etag@1.8.1","MIT","https://github.com/jshttp/etag" "eventemitter2@6.4.3","MIT","https://github.com/hij1nx/EventEmitter2" "eventemitter3@4.0.0","MIT","https://github.com/primus/eventemitter3" -"events@3.1.0","MIT","https://github.com/Gozala/events" +"events@3.2.0","MIT","https://github.com/Gozala/events" "eventsource@1.0.7","MIT","https://github.com/EventSource/eventsource" "evp_bytestokey@1.0.3","MIT","https://github.com/crypto-browserify/EVP_BytesToKey" "execa@1.0.0","MIT","https://github.com/sindresorhus/execa" @@ -615,6 +638,7 @@ "exit-hook@1.1.1","MIT","https://github.com/sindresorhus/exit-hook" "expand-brackets@2.1.4","MIT","https://github.com/jonschlinkert/expand-brackets" "express@4.17.1","MIT","https://github.com/expressjs/express" +"ext@1.4.0","ISC","https://github.com/medikoo/es5-ext/tree/ext" "extend-shallow@2.0.1","MIT","https://github.com/jonschlinkert/extend-shallow" "extend-shallow@3.0.2","MIT","https://github.com/jonschlinkert/extend-shallow" "extend@3.0.2","MIT","https://github.com/justmoon/node-extend" @@ -640,13 +664,11 @@ "figures@3.2.0","MIT","https://github.com/sindresorhus/figures" "file-loader@6.0.0","MIT","https://github.com/webpack-contrib/file-loader" "file-uri-to-path@1.0.0","MIT","https://github.com/TooTallNate/file-uri-to-path" -"fileset@2.0.3","MIT","https://github.com/mklabs/node-fileset" "fill-range@4.0.0","MIT","https://github.com/jonschlinkert/fill-range" "fill-range@7.0.1","MIT","https://github.com/jonschlinkert/fill-range" "finalhandler@1.1.2","MIT","https://github.com/pillarjs/finalhandler" "find-cache-dir@2.1.0","MIT","https://github.com/avajs/find-cache-dir" "find-cache-dir@3.3.1","MIT","https://github.com/avajs/find-cache-dir" -"find-up@2.1.0","MIT","https://github.com/sindresorhus/find-up" "find-up@3.0.0","MIT","https://github.com/sindresorhus/find-up" "find-up@4.1.0","MIT","https://github.com/sindresorhus/find-up" "flatted@2.0.2","ISC","https://github.com/WebReflection/flatted" @@ -668,13 +690,13 @@ "fs-write-stream-atomic@1.0.10","ISC","https://github.com/npm/fs-write-stream-atomic" "fs.realpath@1.0.0","ISC","https://github.com/isaacs/fs.realpath" "fsevents@1.2.13","MIT","https://github.com/strongloop/fsevents" -"fsevents@2.0.7","MIT","https://github.com/fsevents/fsevents" "fsevents@2.1.3","MIT","https://github.com/fsevents/fsevents" "function-bind@1.1.1","MIT","https://github.com/Raynos/function-bind" "gauge@2.7.4","ISC","https://github.com/iarna/gauge" "genfun@5.0.0","MIT","https://github.com/zkat/genfun" -"gensync@1.0.0-beta.1","MIT","" +"gensync@1.0.0-beta.2","MIT","https://github.com/loganfsmyth/gensync" "get-caller-file@2.0.5","ISC","https://github.com/stefanpenner/get-caller-file" +"get-intrinsic@1.0.1","MIT","https://github.com/ljharb/get-intrinsic" "get-own-enumerable-property-symbols@3.0.0","ISC","https://github.com/mightyiam/get-own-enumerable-property-symbols" "get-stdin@7.0.0","MIT","https://github.com/sindresorhus/get-stdin" "get-stream@4.1.0","MIT","https://github.com/sindresorhus/get-stream" @@ -701,7 +723,6 @@ "graceful-fs@4.2.4","ISC","https://github.com/isaacs/node-graceful-fs" "graphlib@2.1.7","MIT","https://github.com/dagrejs/graphlib" "handle-thing@2.0.1","MIT","https://github.com/indutny/handle-thing" -"handlebars@4.7.6","MIT","https://github.com/wycats/handlebars.js" "har-schema@2.0.0","ISC","https://github.com/ahmadnassri/har-schema" "har-validator@5.1.0","ISC","https://github.com/ahmadnassri/har-validator" "har-validator@5.1.5","MIT","https://github.com/ahmadnassri/node-har-validator" @@ -725,12 +746,13 @@ "hex-color-regex@1.1.0","MIT","https://github.com/regexps/hex-color-regex" "hmac-drbg@1.0.1","MIT","https://github.com/indutny/hmac-drbg" "hosted-git-info@2.6.0","ISC","https://github.com/npm/hosted-git-info" -"hosted-git-info@3.0.4","ISC","https://github.com/npm/hosted-git-info" +"hosted-git-info@3.0.7","ISC","https://github.com/npm/hosted-git-info" "hpack.js@2.1.6","MIT","https://github.com/indutny/hpack.js" "hsl-regex@1.0.0","MIT","https://github.com/regexps/hsl-regex" "hsla-regex@1.0.0","MIT","https://github.com/regexps/hsla-regex" "html-comment-regex@1.1.2","MIT","https://github.com/stevemao/html-comment-regex" "html-entities@1.3.1","MIT","https://github.com/mdevils/node-html-entities" +"html-escaper@2.0.2","MIT","https://github.com/WebReflection/html-escaper" "http-cache-semantics@3.8.1","BSD-2-Clause","https://github.com/pornel/http-cache-semantics" "http-deceiver@1.2.7","MIT","https://github.com/indutny/http-deceiver" "http-errors@1.6.3","MIT","https://github.com/jshttp/http-errors" @@ -745,8 +767,9 @@ "humanize-ms@1.2.1","MIT","https://github.com/node-modules/humanize-ms" "husky@3.0.5","MIT","https://github.com/typicode/husky" "iconv-lite@0.4.24","MIT","https://github.com/ashtuchkin/iconv-lite" +"iconv-lite@0.6.2","MIT","https://github.com/ashtuchkin/iconv-lite" "icss-utils@4.1.1","ISC","https://github.com/css-modules/icss-utils" -"ieee754@1.1.13","BSD-3-Clause","https://github.com/feross/ieee754" +"ieee754@1.2.1","BSD-3-Clause","https://github.com/feross/ieee754" "iferr@0.1.5","MIT","https://github.com/shesek/iferr" "ignore-walk@3.0.3","ISC","https://github.com/isaacs/ignore-walk" "ignore@5.1.4","MIT","https://github.com/kaelzhang/node-ignore" @@ -766,10 +789,9 @@ "inherits@2.0.3","ISC","https://github.com/isaacs/inherits" "inherits@2.0.4","ISC","https://github.com/isaacs/inherits" "ini@1.3.5","ISC","https://github.com/isaacs/ini" -"inquirer@7.1.0","MIT","https://github.com/SBoudrias/Inquirer.js" +"inquirer@7.3.3","MIT","https://github.com/SBoudrias/Inquirer.js" "internal-ip@4.3.0","MIT","https://github.com/sindresorhus/internal-ip" "invariant@2.2.2","BSD-3-Clause","https://github.com/zertosh/invariant" -"invariant@2.2.4","MIT","https://github.com/zertosh/invariant" "ip-regex@2.1.0","MIT","https://github.com/sindresorhus/ip-regex" "ip@1.1.5","MIT","https://github.com/indutny/node-ip" "ipaddr.js@1.9.1","MIT","https://github.com/whitequark/ipaddr.js" @@ -777,23 +799,24 @@ "is-absolute-url@3.0.3","MIT","https://github.com/sindresorhus/is-absolute-url" "is-accessor-descriptor@0.1.6","MIT","https://github.com/jonschlinkert/is-accessor-descriptor" "is-accessor-descriptor@1.0.0","MIT","https://github.com/jonschlinkert/is-accessor-descriptor" -"is-arguments@1.0.4","MIT","https://github.com/ljharb/is-arguments" +"is-arguments@1.1.0","MIT","https://github.com/inspect-js/is-arguments" "is-arrayish@0.2.1","MIT","https://github.com/qix-/node-is-arrayish" "is-arrayish@0.3.2","MIT","https://github.com/qix-/node-is-arrayish" "is-binary-path@1.0.1","MIT","https://github.com/sindresorhus/is-binary-path" "is-binary-path@2.1.0","MIT","https://github.com/sindresorhus/is-binary-path" "is-buffer@1.1.6","MIT","https://github.com/feross/is-buffer" "is-builtin-module@1.0.0","MIT","https://github.com/sindresorhus/is-builtin-module" -"is-callable@1.2.0","MIT","https://github.com/ljharb/is-callable" +"is-callable@1.2.2","MIT","https://github.com/ljharb/is-callable" "is-ci@2.0.0","MIT","https://github.com/watson/is-ci" "is-color-stop@1.1.0","MIT","https://github.com/pigcan/is-color-stop" +"is-core-module@2.2.0","MIT","https://github.com/inspect-js/is-core-module" "is-data-descriptor@0.1.4","MIT","https://github.com/jonschlinkert/is-data-descriptor" "is-data-descriptor@1.0.0","MIT","https://github.com/jonschlinkert/is-data-descriptor" "is-date-object@1.0.2","MIT","https://github.com/ljharb/is-date-object" "is-descriptor@0.1.6","MIT","https://github.com/jonschlinkert/is-descriptor" "is-descriptor@1.0.2","MIT","https://github.com/jonschlinkert/is-descriptor" "is-directory@0.3.1","MIT","https://github.com/jonschlinkert/is-directory" -"is-docker@2.0.0","MIT","https://github.com/sindresorhus/is-docker" +"is-docker@2.1.1","MIT","https://github.com/sindresorhus/is-docker" "is-extendable@0.1.1","MIT","https://github.com/jonschlinkert/is-extendable" "is-extendable@1.0.1","MIT","https://github.com/jonschlinkert/is-extendable" "is-extglob@2.1.1","MIT","https://github.com/jonschlinkert/is-extglob" @@ -804,6 +827,7 @@ "is-glob@4.0.1","MIT","https://github.com/micromatch/is-glob" "is-installed-globally@0.3.2","MIT","https://github.com/sindresorhus/is-installed-globally" "is-interactive@1.0.0","MIT","https://github.com/sindresorhus/is-interactive" +"is-negative-zero@2.0.1","MIT","https://github.com/inspect-js/is-negative-zero" "is-number@3.0.0","MIT","https://github.com/jonschlinkert/is-number" "is-number@4.0.0","MIT","https://github.com/jonschlinkert/is-number" "is-number@7.0.0","MIT","https://github.com/jonschlinkert/is-number" @@ -818,7 +842,7 @@ "is-plain-obj@1.1.0","MIT","https://github.com/sindresorhus/is-plain-obj" "is-plain-object@2.0.4","MIT","https://github.com/jonschlinkert/is-plain-object" "is-promise@2.1.0","MIT","https://github.com/then/is-promise" -"is-regex@1.1.0","MIT","https://github.com/ljharb/is-regex" +"is-regex@1.1.1","MIT","https://github.com/ljharb/is-regex" "is-regexp@1.0.0","MIT","https://github.com/sindresorhus/is-regexp" "is-resolvable@1.1.0","ISC","https://github.com/shinnn/is-resolvable" "is-stream@1.1.0","MIT","https://github.com/sindresorhus/is-stream" @@ -836,19 +860,16 @@ "isobject@2.1.0","MIT","https://github.com/jonschlinkert/isobject" "isobject@3.0.1","MIT","https://github.com/jonschlinkert/isobject" "isstream@0.1.2","MIT","https://github.com/rvagg/isstream" -"istanbul-api@2.1.6","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-coverage@2.0.5","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-coverage@3.0.0","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" -"istanbul-lib-hook@2.0.7","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" -"istanbul-lib-instrument@3.3.0","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-instrument@4.0.3","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" -"istanbul-lib-report@2.0.8","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" +"istanbul-lib-report@3.0.0","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "istanbul-lib-source-maps@3.0.6","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" -"istanbul-reports@2.2.6","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" +"istanbul-reports@3.0.2","BSD-3-Clause","https://github.com/istanbuljs/istanbuljs" "jasmine-core@3.5.0","MIT","https://github.com/jasmine/jasmine" -"jasmine-spec-reporter@4.2.1","Apache-2.0","https://github.com/bcaudan/jasmine-spec-reporter" -"jest-worker@25.1.0","MIT","https://github.com/facebook/jest" -"jest-worker@26.1.0","MIT","https://github.com/facebook/jest" +"jasmine-core@3.6.0","MIT","https://github.com/jasmine/jasmine" +"jasmine-spec-reporter@5.0.2","Apache-2.0","https://github.com/bcaudan/jasmine-spec-reporter" +"jest-worker@26.3.0","MIT","https://github.com/facebook/jest" "jquery@3.5.1","MIT","https://github.com/jquery/jquery" "js-levenshtein@1.1.6","MIT","https://github.com/gustf/js-levenshtein" "js-tokens@3.0.2","MIT","https://github.com/lydell/js-tokens" @@ -867,31 +888,34 @@ "json5@1.0.1","MIT","https://github.com/json5/json5" "json5@2.1.0","MIT","https://github.com/json5/json5" "json5@2.1.3","MIT","https://github.com/json5/json5" +"jsonc-parser@2.3.0","MIT","https://github.com/microsoft/node-jsonc-parser" "jsonfile@4.0.0","MIT","https://github.com/jprichardson/node-jsonfile" "jsonfile@6.0.1","MIT","https://github.com/jprichardson/node-jsonfile" "jsonparse@1.3.1","MIT","https://github.com/creationix/jsonparse" "jsprim@1.4.1","MIT","https://github.com/joyent/node-jsprim" "karma-chrome-launcher@3.1.0","MIT","https://github.com/karma-runner/karma-chrome-launcher" -"karma-coverage-istanbul-reporter@2.1.0","MIT","https://github.com/mattlewis92/karma-coverage-istanbul-reporter" -"karma-jasmine-html-reporter@1.4.2","MIT","https://github.com/dfederm/karma-jasmine-html-reporter" -"karma-jasmine@2.0.1","MIT","https://github.com/karma-runner/karma-jasmine" +"karma-coverage-istanbul-reporter@3.0.3","MIT","https://github.com/mattlewis92/karma-coverage-istanbul-reporter" +"karma-jasmine-html-reporter@1.5.4","MIT","https://github.com/dfederm/karma-jasmine-html-reporter" +"karma-jasmine@4.0.1","MIT","https://github.com/karma-runner/karma-jasmine" "karma-source-map-support@1.4.0","MIT","https://github.com/tschaub/karma-source-map-support" "karma-spec-reporter@0.0.32","MIT","https://github.com/mlex/karma-spec-reporter" -"karma@5.2.2","MIT","https://github.com/karma-runner/karma" -"katex@0.11.1","MIT","https://github.com/KaTeX/KaTeX" +"karma@5.0.9","MIT","https://github.com/karma-runner/karma" +"katex@0.12.0","MIT","https://github.com/KaTeX/KaTeX" "killable@1.0.1","ISC","https://github.com/marten-de-vries/killable" "kind-of@3.2.2","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@4.0.0","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@5.1.0","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@6.0.2","MIT","https://github.com/jonschlinkert/kind-of" "kind-of@6.0.3","MIT","https://github.com/jonschlinkert/kind-of" +"kleur@3.0.3","MIT","https://github.com/lukeed/kleur" +"klona@2.0.4","MIT","https://github.com/lukeed/klona" "lazy-ass@1.6.0","MIT","https://github.com/bahmutov/lazy-ass" -"less-loader@5.0.0","MIT","https://github.com/webpack-contrib/less-loader" -"less@3.11.3","Apache-2.0","https://github.com/less/less.js" +"less-loader@6.2.0","MIT","https://github.com/webpack-contrib/less-loader" +"less@3.12.2","Apache-2.0","https://github.com/less/less.js" "leven@3.1.0","MIT","https://github.com/sindresorhus/leven" "levenary@1.1.1","MIT","https://github.com/tanhauhau/levenary" "license-checker@25.0.1","BSD-3-Clause","https://github.com/davglass/license-checker" -"license-webpack-plugin@2.1.4","ISC","https://github.com/xz64/license-webpack-plugin" +"license-webpack-plugin@2.3.0","ISC","https://github.com/xz64/license-webpack-plugin" "lines-and-columns@1.1.6","MIT","https://github.com/eventualbuddha/lines-and-columns" "lint-staged@9.4.0","MIT","https://github.com/okonet/lint-staged" "listr-silent-renderer@1.1.1","MIT","https://github.com/SamVerschueren/listr-silent-renderer" @@ -900,15 +924,16 @@ "listr@0.14.3","MIT","https://github.com/SamVerschueren/listr" "loader-runner@2.4.0","MIT","https://github.com/webpack/loader-runner" "loader-utils@1.1.0","MIT","https://github.com/webpack/loader-utils" +"loader-utils@1.2.3","MIT","https://github.com/webpack/loader-utils" "loader-utils@1.4.0","MIT","https://github.com/webpack/loader-utils" "loader-utils@2.0.0","MIT","https://github.com/webpack/loader-utils" -"locate-path@2.0.0","MIT","https://github.com/sindresorhus/locate-path" "locate-path@3.0.0","MIT","https://github.com/sindresorhus/locate-path" "locate-path@5.0.0","MIT","https://github.com/sindresorhus/locate-path" "lodash.clonedeep@4.5.0","MIT","https://github.com/lodash/lodash" "lodash.debounce@4.0.8","MIT","https://github.com/lodash/lodash" "lodash.memoize@4.1.2","MIT","https://github.com/lodash/lodash" "lodash.once@4.1.1","MIT","https://github.com/lodash/lodash" +"lodash.sortby@4.7.0","MIT","https://github.com/lodash/lodash" "lodash.uniq@4.5.0","MIT","https://github.com/lodash/lodash" "lodash@4.17.20","MIT","https://github.com/lodash/lodash" "log-symbols@1.0.2","MIT","https://github.com/sindresorhus/log-symbols" @@ -916,22 +941,22 @@ "log-symbols@4.0.0","MIT","https://github.com/sindresorhus/log-symbols" "log-update@2.3.0","MIT","https://github.com/sindresorhus/log-update" "log4js@6.3.0","Apache-2.0","https://github.com/log4js-node/log4js-node" -"loglevel@1.6.8","MIT","https://github.com/pimterry/loglevel" +"loglevel@1.7.1","MIT","https://github.com/pimterry/loglevel" "loose-envify@1.3.1","MIT","https://github.com/zertosh/loose-envify" "lru-cache@5.1.1","ISC","https://github.com/isaacs/node-lru-cache" +"lru-cache@6.0.0","ISC","https://github.com/isaacs/node-lru-cache" "magic-string@0.25.7","MIT","https://github.com/rich-harris/magic-string" "make-dir@2.1.0","MIT","https://github.com/sindresorhus/make-dir" "make-dir@3.1.0","MIT","https://github.com/sindresorhus/make-dir" "make-error@1.3.5","ISC","https://github.com/JsCommunity/make-error" "make-fetch-happen@5.0.2","ISC","https://github.com/zkat/make-fetch-happen" -"mamacro@0.0.3","MIT","" "map-cache@0.2.2","MIT","https://github.com/jonschlinkert/map-cache" "map-visit@1.0.0","MIT","https://github.com/jonschlinkert/map-visit" -"marked@1.1.0","MIT","https://github.com/markedjs/marked" +"marked@1.2.6","MIT","https://github.com/markedjs/marked" "material-design-icons-iconfont@6.1.0","Apache-2.0","https://github.com/jossef/material-design-icons-iconfont" "md5.js@1.3.5","MIT","https://github.com/crypto-browserify/md5.js" +"mdn-data@2.0.14","CC0-1.0","https://github.com/mdn/data" "mdn-data@2.0.4","CC0-1.0","https://github.com/mdn/data" -"mdn-data@2.0.6","CC0-1.0","https://github.com/mdn/data" "media-typer@0.3.0","MIT","https://github.com/jshttp/media-typer" "memory-fs@0.4.1","MIT","https://github.com/webpack/memory-fs" "memory-fs@0.5.0","MIT","https://github.com/webpack/memory-fs" @@ -946,7 +971,7 @@ "mime-db@1.33.0","MIT","https://github.com/jshttp/mime-db" "mime-db@1.37.0","MIT","https://github.com/jshttp/mime-db" "mime-db@1.40.0","MIT","https://github.com/jshttp/mime-db" -"mime-db@1.44.0","MIT","https://github.com/jshttp/mime-db" +"mime-db@1.45.0","MIT","https://github.com/jshttp/mime-db" "mime-types@2.1.18","MIT","https://github.com/jshttp/mime-types" "mime-types@2.1.21","MIT","https://github.com/jshttp/mime-types" "mime-types@2.1.24","MIT","https://github.com/jshttp/mime-types" @@ -954,18 +979,18 @@ "mime@2.4.6","MIT","https://github.com/broofa/mime" "mimic-fn@1.2.0","MIT","https://github.com/sindresorhus/mimic-fn" "mimic-fn@2.1.0","MIT","https://github.com/sindresorhus/mimic-fn" -"mini-css-extract-plugin@0.9.0","MIT","https://github.com/webpack-contrib/mini-css-extract-plugin" +"mini-css-extract-plugin@0.10.0","MIT","https://github.com/webpack-contrib/mini-css-extract-plugin" "minimalistic-assert@1.0.1","ISC","https://github.com/calvinmetcalf/minimalistic-assert" "minimalistic-crypto-utils@1.0.1","MIT","https://github.com/indutny/minimalistic-crypto-utils" "minimatch@3.0.4","ISC","https://github.com/isaacs/minimatch" "minimist@1.2.5","MIT","https://github.com/substack/minimist" "minipass-collect@1.0.2","ISC","" "minipass-flush@1.0.5","ISC","https://github.com/isaacs/minipass-flush" -"minipass-pipeline@1.2.3","ISC","" +"minipass-pipeline@1.2.4","ISC","" "minipass@2.9.0","ISC","https://github.com/isaacs/minipass" "minipass@3.1.3","ISC","https://github.com/isaacs/minipass" "minizlib@1.3.3","MIT","https://github.com/isaacs/minizlib" -"minizlib@2.1.0","MIT","https://github.com/isaacs/minizlib" +"minizlib@2.1.2","MIT","https://github.com/isaacs/minizlib" "mississippi@3.0.0","BSD-2-Clause","https://github.com/maxogden/mississippi" "mixin-deep@1.3.2","MIT","https://github.com/jonschlinkert/mixin-deep" "mkdirp@0.5.5","MIT","https://github.com/substack/node-mkdirp" @@ -975,26 +1000,28 @@ "ms@2.0.0","MIT","https://github.com/zeit/ms" "ms@2.1.1","MIT","https://github.com/zeit/ms" "ms@2.1.2","MIT","https://github.com/zeit/ms" +"ms@2.1.3","MIT","https://github.com/vercel/ms" "multicast-dns-service-types@1.1.0","MIT","https://github.com/mafintosh/multicast-dns-service-types" "multicast-dns@6.2.3","MIT","https://github.com/mafintosh/multicast-dns" "mute-stream@0.0.8","ISC","https://github.com/isaacs/mute-stream" "nan@2.14.1","MIT","https://github.com/nodejs/nan" "nanomatch@1.2.9","MIT","https://github.com/micromatch/nanomatch" +"native-request@1.0.8","MIT","https://github.com/ZaralDev/native-request" "negotiator@0.6.1","MIT","https://github.com/jshttp/negotiator" "negotiator@0.6.2","MIT","https://github.com/jshttp/negotiator" "neo-async@2.6.0","MIT","https://github.com/suguru03/neo-async" -"neo-async@2.6.1","MIT","https://github.com/suguru03/neo-async" +"neo-async@2.6.2","MIT","https://github.com/suguru03/neo-async" +"next-tick@1.0.0","MIT","https://github.com/medikoo/next-tick" "ng2-ui-auth@10.0.1","UNKNOWN","" -"ngx-clipboard@13.0.1","MIT","https://github.com/maxisam/ngx-clipboard" -"ngx-markdown@9.1.1","MIT","https://github.com/jfcere/ngx-markdown" +"ngx-markdown@10.1.1","MIT","https://github.com/jfcere/ngx-markdown" "ngx-sharebuttons@8.0.0","MIT","https://github.com/murhafsousli/ngx-sharebuttons" -"ngx-window-token@3.0.0","MIT","https://github.com/maxisam/ngx-window-token" +"ngx-window-token@4.0.0","MIT","https://github.com/maxisam/ngx-window-token" "nice-try@1.0.5","MIT","https://github.com/electerious/nice-try" "node-fetch-npm@2.0.4","MIT","https://github.com/npm/node-fetch-npm" -"node-forge@0.9.0","(BSD-3-Clause OR GPL-2.0)","https://github.com/digitalbazaar/forge" +"node-forge@0.10.0","(BSD-3-Clause OR GPL-2.0)","https://github.com/digitalbazaar/forge" "node-libs-browser@2.2.1","MIT","https://github.com/webpack/node-libs-browser" "node-releases@1.1.32","MIT","https://github.com/chicoxyzzy/node-releases" -"node-releases@1.1.58","MIT","https://github.com/chicoxyzzy/node-releases" +"node-releases@1.1.67","MIT","https://github.com/chicoxyzzy/node-releases" "nopt@4.0.3","ISC","https://github.com/npm/nopt" "normalize-package-data@2.4.0","BSD-2-Clause","https://github.com/npm/normalize-package-data" "normalize-package-data@2.5.0","BSD-2-Clause","https://github.com/npm/normalize-package-data" @@ -1008,9 +1035,10 @@ "npm-normalize-package-bin@1.0.1","ISC","https://github.com/npm/npm-normalize-package-bin" "npm-package-arg@6.1.0","ISC","https://github.com/npm/npm-package-arg" "npm-package-arg@8.0.1","ISC","https://github.com/npm/npm-package-arg" +"npm-package-arg@8.1.0","ISC","https://github.com/npm/npm-package-arg" "npm-packlist@1.4.8","ISC","https://github.com/npm/npm-packlist" "npm-pick-manifest@3.0.2","ISC","https://github.com/npm/npm-pick-manifest" -"npm-pick-manifest@6.0.0","ISC","https://github.com/npm/npm-pick-manifest" +"npm-pick-manifest@6.1.0","ISC","https://github.com/npm/npm-pick-manifest" "npm-registry-client@8.6.0","ISC","https://github.com/npm/npm-registry-client" "npm-registry-fetch@4.0.7","ISC","https://github.com/npm/registry-fetch" "npm-run-path@2.0.2","MIT","https://github.com/sindresorhus/npm-run-path" @@ -1022,16 +1050,16 @@ "number-is-nan@1.0.1","MIT","https://github.com/sindresorhus/number-is-nan" "oauth-sign@0.9.0","Apache-2.0","https://github.com/mikeal/oauth-sign" "object-assign@4.1.1","MIT","https://github.com/sindresorhus/object-assign" -"object-component@0.0.3","MIT*","" "object-copy@0.1.0","MIT","https://github.com/jonschlinkert/object-copy" -"object-inspect@1.8.0","MIT","https://github.com/inspect-js/object-inspect" -"object-is@1.1.2","MIT","https://github.com/es-shims/object-is" +"object-inspect@1.9.0","MIT","https://github.com/inspect-js/object-inspect" +"object-is@1.1.4","MIT","https://github.com/es-shims/object-is" "object-keys@1.1.1","MIT","https://github.com/ljharb/object-keys" "object-visit@1.0.1","MIT","https://github.com/jonschlinkert/object-visit" "object.assign@4.1.0","MIT","https://github.com/ljharb/object.assign" -"object.getownpropertydescriptors@2.1.0","MIT","https://github.com/es-shims/object.getownpropertydescriptors" +"object.assign@4.1.2","MIT","https://github.com/ljharb/object.assign" +"object.getownpropertydescriptors@2.1.1","MIT","https://github.com/es-shims/object.getownpropertydescriptors" "object.pick@1.3.0","MIT","https://github.com/jonschlinkert/object.pick" -"object.values@1.1.1","MIT","https://github.com/es-shims/Object.values" +"object.values@1.1.2","MIT","https://github.com/es-shims/Object.values" "obuf@1.1.2","MIT","https://github.com/indutny/offset-buffer" "on-finished@2.3.0","MIT","https://github.com/jshttp/on-finished" "on-headers@1.0.2","MIT","https://github.com/jshttp/on-headers" @@ -1039,10 +1067,10 @@ "onetime@1.1.0","MIT","https://github.com/sindresorhus/onetime" "onetime@2.0.1","MIT","https://github.com/sindresorhus/onetime" "onetime@5.1.0","MIT","https://github.com/sindresorhus/onetime" -"open@7.0.3","MIT","https://github.com/sindresorhus/open" +"open@7.2.0","MIT","https://github.com/sindresorhus/open" "opencollective-postinstall@2.0.2","MIT","https://github.com/opencollective/opencollective-postinstall" "opn@5.5.0","MIT","https://github.com/sindresorhus/opn" -"ora@4.0.3","MIT","https://github.com/sindresorhus/ora" +"ora@5.0.0","MIT","https://github.com/sindresorhus/ora" "original@1.0.2","MIT","https://github.com/unshiftio/original" "os-browserify@0.3.0","MIT","https://github.com/CoderPuppy/os-browserify" "os-homedir@1.0.2","MIT","https://github.com/sindresorhus/os-homedir" @@ -1051,29 +1079,27 @@ "ospath@1.2.2","MIT","https://github.com/jprichardson/ospath" "p-finally@1.0.0","MIT","https://github.com/sindresorhus/p-finally" "p-finally@2.0.1","MIT","https://github.com/sindresorhus/p-finally" -"p-limit@1.3.0","MIT","https://github.com/sindresorhus/p-limit" "p-limit@2.2.1","MIT","https://github.com/sindresorhus/p-limit" -"p-limit@2.3.0","MIT","https://github.com/sindresorhus/p-limit" -"p-locate@2.0.0","MIT","https://github.com/sindresorhus/p-locate" +"p-limit@3.1.0","MIT","https://github.com/sindresorhus/p-limit" "p-locate@3.0.0","MIT","https://github.com/sindresorhus/p-locate" "p-locate@4.1.0","MIT","https://github.com/sindresorhus/p-locate" "p-map@2.1.0","MIT","https://github.com/sindresorhus/p-map" "p-map@3.0.0","MIT","https://github.com/sindresorhus/p-map" "p-map@4.0.0","MIT","https://github.com/sindresorhus/p-map" "p-retry@3.0.1","MIT","https://github.com/sindresorhus/p-retry" -"p-try@1.0.0","MIT","https://github.com/sindresorhus/p-try" "p-try@2.2.0","MIT","https://github.com/sindresorhus/p-try" "pacote@9.5.12","MIT","https://github.com/npm/pacote" -"pako@1.0.6","(MIT AND Zlib)","https://github.com/nodeca/pako" +"pako@1.0.11","(MIT AND Zlib)","https://github.com/nodeca/pako" "parallel-transform@1.2.0","MIT","https://github.com/mafintosh/parallel-transform" -"parse-asn1@5.1.5","ISC","https://github.com/crypto-browserify/parse-asn1" +"parse-asn1@5.1.6","ISC","https://github.com/crypto-browserify/parse-asn1" "parse-json@4.0.0","MIT","https://github.com/sindresorhus/parse-json" "parse-json@5.0.0","MIT","https://github.com/sindresorhus/parse-json" -"parse5@4.0.0","MIT","https://github.com/inikulin/parse5" +"parse5-htmlparser2-tree-adapter@6.0.1","MIT","https://github.com/inikulin/parse5" "parse5@5.1.0","MIT","https://github.com/inikulin/parse5" "parse5@5.1.1","MIT","https://github.com/inikulin/parse5" -"parseqs@0.0.5","MIT","https://github.com/get/querystring" -"parseuri@0.0.5","MIT","https://github.com/get/parseuri" +"parse5@6.0.1","MIT","https://github.com/inikulin/parse5" +"parseqs@0.0.6","MIT","https://github.com/get/querystring" +"parseuri@0.0.6","MIT","https://github.com/get/parseuri" "parseurl@1.3.3","MIT","https://github.com/pillarjs/parseurl" "pascalcase@0.1.1","MIT","https://github.com/jonschlinkert/pascalcase" "path-browserify@0.0.1","MIT","https://github.com/substack/path-browserify" @@ -1100,12 +1126,12 @@ "pinkie@2.0.4","MIT","https://github.com/floatdrop/pinkie" "pkg-dir@3.0.0","MIT","https://github.com/sindresorhus/pkg-dir" "pkg-dir@4.2.0","MIT","https://github.com/sindresorhus/pkg-dir" -"pkg-up@2.0.0","MIT","https://github.com/sindresorhus/pkg-up" "please-upgrade-node@3.2.0","MIT","https://github.com/typicode/please-upgrade-node" +"pnp-webpack-plugin@1.6.4","MIT","https://github.com/arcanis/pnp-webpack-plugin" "popper.js@1.15.0","MIT","https://github.com/FezVrasta/popper.js" "portfinder@1.0.28","MIT","https://github.com/http-party/node-portfinder" "posix-character-classes@0.1.1","MIT","https://github.com/jonschlinkert/posix-character-classes" -"postcss-calc@7.0.2","MIT","https://github.com/postcss/postcss-calc" +"postcss-calc@7.0.5","MIT","https://github.com/postcss/postcss-calc" "postcss-colormin@4.0.3","MIT","https://github.com/cssnano/cssnano" "postcss-convert-values@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-discard-comments@4.0.2","MIT","https://github.com/cssnano/cssnano" @@ -1113,7 +1139,7 @@ "postcss-discard-empty@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-discard-overridden@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-import@12.0.1","MIT","https://github.com/postcss/postcss-import" -"postcss-load-config@2.1.0","MIT","https://github.com/michael-ciniawsky/postcss-load-config" +"postcss-load-config@2.1.2","MIT","https://github.com/postcss/postcss-load-config" "postcss-loader@3.0.0","MIT","https://github.com/postcss/postcss-loader" "postcss-merge-longhand@4.0.11","MIT","https://github.com/cssnano/cssnano" "postcss-merge-rules@4.0.3","MIT","https://github.com/cssnano/cssnano" @@ -1122,7 +1148,7 @@ "postcss-minify-params@4.0.2","MIT","https://github.com/cssnano/cssnano" "postcss-minify-selectors@4.0.2","MIT","https://github.com/cssnano/cssnano" "postcss-modules-extract-imports@2.0.0","ISC","https://github.com/css-modules/postcss-modules-extract-imports" -"postcss-modules-local-by-default@3.0.2","MIT","https://github.com/css-modules/postcss-modules-local-by-default" +"postcss-modules-local-by-default@3.0.3","MIT","https://github.com/css-modules/postcss-modules-local-by-default" "postcss-modules-scope@2.2.0","ISC","https://github.com/css-modules/postcss-modules-scope" "postcss-modules-values@3.0.0","ISC","https://github.com/css-modules/postcss-modules-values" "postcss-normalize-charset@4.0.1","MIT","https://github.com/cssnano/cssnano" @@ -1138,12 +1164,13 @@ "postcss-reduce-initial@4.0.3","MIT","https://github.com/cssnano/cssnano" "postcss-reduce-transforms@4.0.2","MIT","https://github.com/cssnano/cssnano" "postcss-selector-parser@3.1.2","MIT","https://github.com/postcss/postcss-selector-parser" -"postcss-selector-parser@6.0.2","MIT","https://github.com/postcss/postcss-selector-parser" +"postcss-selector-parser@6.0.4","MIT","https://github.com/postcss/postcss-selector-parser" "postcss-svgo@4.0.2","MIT","https://github.com/cssnano/cssnano" "postcss-unique-selectors@4.0.1","MIT","https://github.com/cssnano/cssnano" "postcss-value-parser@3.3.1","MIT","https://github.com/TrySound/postcss-value-parser" "postcss-value-parser@4.1.0","MIT","https://github.com/TrySound/postcss-value-parser" -"postcss@7.0.27","MIT","https://github.com/postcss/postcss" +"postcss@7.0.21","MIT","https://github.com/postcss/postcss" +"postcss@7.0.32","MIT","https://github.com/postcss/postcss" "prepend-http@1.0.4","MIT","https://github.com/sindresorhus/prepend-http" "prettier@2.1.1","MIT","https://github.com/prettier/prettier" "pretty-bytes@5.4.1","MIT","https://github.com/sindresorhus/pretty-bytes" @@ -1153,7 +1180,7 @@ "process@0.11.10","MIT","https://github.com/shtylman/node-process" "promise-inflight@1.0.1","ISC","https://github.com/iarna/promise-inflight" "promise-retry@1.1.1","MIT","https://github.com/IndigoUnited/node-promise-retry" -"promise@7.3.1","MIT","https://github.com/then/promise" +"prompts@2.3.2","MIT","https://github.com/terkelg/prompts" "protoduck@5.0.1","MIT","https://github.com/zkat/protoduck" "proxy-addr@2.0.6","MIT","https://github.com/jshttp/proxy-addr" "prr@1.0.1","MIT","https://github.com/rvagg/prr" @@ -1172,13 +1199,13 @@ "query-string@4.3.4","MIT","https://github.com/sindresorhus/query-string" "querystring-es3@0.2.1","MIT","https://github.com/mike-spainhower/querystring" "querystring@0.2.0","MIT","https://github.com/Gozala/querystring" -"querystringify@2.1.1","MIT","https://github.com/unshiftio/querystringify" +"querystringify@2.2.0","MIT","https://github.com/unshiftio/querystringify" "ramda@0.26.1","MIT","https://github.com/ramda/ramda" "randombytes@2.1.0","MIT","https://github.com/crypto-browserify/randombytes" "randomfill@1.0.4","MIT","https://github.com/crypto-browserify/randomfill" "range-parser@1.2.1","MIT","https://github.com/jshttp/range-parser" "raw-body@2.4.0","MIT","https://github.com/stream-utils/raw-body" -"raw-loader@4.0.0","MIT","https://github.com/webpack-contrib/raw-loader" +"raw-loader@4.0.1","MIT","https://github.com/webpack-contrib/raw-loader" "read-cache@1.0.0","MIT","https://github.com/TrySound/read-cache" "read-installed@4.0.3","ISC","https://github.com/isaacs/read-installed" "read-package-json@2.1.1","ISC","https://github.com/npm/read-package-json" @@ -1188,19 +1215,19 @@ "readable-stream@3.6.0","MIT","https://github.com/nodejs/readable-stream" "readdir-scoped-modules@1.1.0","ISC","https://github.com/npm/readdir-scoped-modules" "readdirp@2.2.1","MIT","https://github.com/paulmillr/readdirp" -"readdirp@3.1.2","MIT","https://github.com/paulmillr/readdirp" -"readdirp@3.4.0","MIT","https://github.com/paulmillr/readdirp" +"readdirp@3.5.0","MIT","https://github.com/paulmillr/readdirp" "reflect-metadata@0.1.13","Apache-2.0","https://github.com/rbuckton/reflect-metadata" "regenerate-unicode-properties@8.1.0","MIT","https://github.com/mathiasbynens/regenerate-unicode-properties" "regenerate-unicode-properties@8.2.0","MIT","https://github.com/mathiasbynens/regenerate-unicode-properties" "regenerate@1.4.0","MIT","https://github.com/mathiasbynens/regenerate" -"regenerator-runtime@0.13.5","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime" +"regenerator-runtime@0.13.7","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime" "regenerator-transform@0.14.1","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" -"regenerator-transform@0.14.4","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" +"regenerator-transform@0.14.5","MIT","https://github.com/facebook/regenerator/tree/master/packages/regenerator-transform" "regex-not@1.0.2","MIT","https://github.com/jonschlinkert/regex-not" +"regex-parser@2.2.11","MIT","https://github.com/IonicaBizau/regex-parser.js" "regexp.prototype.flags@1.3.0","MIT","https://github.com/es-shims/RegExp.prototype.flags" "regexpu-core@4.6.0","MIT","https://github.com/mathiasbynens/regexpu-core" -"regexpu-core@4.7.0","MIT","https://github.com/mathiasbynens/regexpu-core" +"regexpu-core@4.7.1","MIT","https://github.com/mathiasbynens/regexpu-core" "regjsgen@0.5.0","MIT","https://github.com/bnjmnt4n/regjsgen" "regjsgen@0.5.2","MIT","https://github.com/bnjmnt4n/regjsgen" "regjsparser@0.6.0","BSD-2-Clause","https://github.com/jviereck/regjsparser" @@ -1210,13 +1237,16 @@ "repeat-string@1.6.1","MIT","https://github.com/jonschlinkert/repeat-string" "request-progress@3.0.0","MIT","https://github.com/IndigoUnited/node-request-progress" "request@2.88.0","Apache-2.0","https://github.com/request/request" +"request@2.88.2","Apache-2.0","https://github.com/request/request" "require-directory@2.1.1","MIT","https://github.com/troygoode/node-require-directory" "require-main-filename@2.0.0","ISC","https://github.com/yargs/require-main-filename" "requires-port@1.0.0","MIT","https://github.com/unshiftio/requires-port" "resolve-cwd@2.0.0","MIT","https://github.com/sindresorhus/resolve-cwd" "resolve-from@3.0.0","MIT","https://github.com/sindresorhus/resolve-from" +"resolve-url-loader@3.1.2","MIT","https://github.com/bholloway/resolve-url-loader" "resolve-url@0.2.1","MIT","https://github.com/lydell/resolve-url" "resolve@1.12.0","MIT","https://github.com/browserify/resolve" +"resolve@1.19.0","MIT","https://github.com/browserify/resolve" "resolve@1.5.0","MIT","https://github.com/browserify/node-resolve" "restore-cursor@1.0.1","MIT","https://github.com/sindresorhus/restore-cursor" "restore-cursor@2.0.0","MIT","https://github.com/sindresorhus/restore-cursor" @@ -1225,38 +1255,39 @@ "retry@0.10.1","MIT","https://github.com/tim-kos/node-retry" "retry@0.12.0","MIT","https://github.com/tim-kos/node-retry" "reusify@1.0.4","MIT","https://github.com/mcollina/reusify" +"rework-visit@1.0.0","MIT","" +"rework@1.0.1","MIT*","https://github.com/reworkcss/rework" "rfdc@1.1.4","MIT","https://github.com/davidmarkclements/rfdc" "rgb-regex@1.0.1","MIT","https://github.com/regexps/rgb-regex" "rgba-regex@1.0.0","MIT","https://github.com/johnotander/rgba-regex" -"rimraf@2.6.2","ISC","https://github.com/isaacs/rimraf" "rimraf@2.7.1","ISC","https://github.com/isaacs/rimraf" "rimraf@3.0.0","ISC","https://github.com/isaacs/rimraf" "rimraf@3.0.2","ISC","https://github.com/isaacs/rimraf" "ripemd160@2.0.2","MIT","https://github.com/crypto-browserify/ripemd160" -"rollup@2.1.0","MIT","https://github.com/rollup/rollup" +"rollup@2.26.5","MIT","https://github.com/rollup/rollup" "run-async@2.4.1","MIT","https://github.com/SBoudrias/run-async" "run-node@1.0.0","MIT","https://github.com/sindresorhus/run-node" "run-parallel@1.1.9","MIT","https://github.com/feross/run-parallel" "run-queue@1.0.3","ISC","https://github.com/iarna/run-queue" -"rxjs-tslint-rules@4.17.0","MIT","https://github.com/cartant/rxjs-tslint-rules" -"rxjs-tslint@0.1.8","MIT","https://github.com/reactivex/rxjs-tslint" +"rxjs-report-usage@1.0.5","MIT","https://github.com/cartant/rxjs-report-usage" +"rxjs-tslint-rules@4.34.7","MIT","https://github.com/cartant/rxjs-tslint-rules" "rxjs@6.3.3","Apache-2.0","https://github.com/reactivex/rxjs" -"rxjs@6.5.3","Apache-2.0","https://github.com/reactivex/rxjs" -"rxjs@6.5.4","Apache-2.0","https://github.com/reactivex/rxjs" +"rxjs@6.6.2","Apache-2.0","https://github.com/reactivex/rxjs" +"rxjs@6.6.3","Apache-2.0","https://github.com/reactivex/rxjs" "safe-buffer@5.1.1","MIT","https://github.com/feross/safe-buffer" "safe-buffer@5.1.2","MIT","https://github.com/feross/safe-buffer" "safe-buffer@5.2.1","MIT","https://github.com/feross/safe-buffer" "safe-regex@1.1.0","MIT","https://github.com/substack/safe-regex" "safer-buffer@2.1.2","MIT","https://github.com/ChALkeR/safer-buffer" -"sass-loader@8.0.2","MIT","https://github.com/webpack-contrib/sass-loader" -"sass@1.26.3","MIT","https://github.com/sass/dart-sass" +"sass-loader@10.0.1","MIT","https://github.com/webpack-contrib/sass-loader" +"sass@1.26.10","MIT","https://github.com/sass/dart-sass" "sax@1.2.4","ISC","https://github.com/isaacs/sax-js" "schema-utils@1.0.0","MIT","https://github.com/webpack-contrib/schema-utils" "schema-utils@2.7.0","MIT","https://github.com/webpack/schema-utils" "schematics-utilities@1.1.3","MIT","https://github.com/nitayneeman/schematics-utilities" "select-hose@2.0.0","MIT","https://github.com/indutny/select-hose" "select@1.1.2","MIT","https://github.com/zenorocha/select" -"selfsigned@1.10.7","MIT","https://github.com/jfromaniello/selfsigned" +"selfsigned@1.10.8","MIT","https://github.com/jfromaniello/selfsigned" "semver-compare@1.0.0","MIT","https://github.com/substack/semver-compare" "semver-dsl@1.0.1","MIT","https://github.com/mgechev/semver-dsl" "semver-intersect@1.4.0","MIT","https://github.com/snyamathi/semver-intersect" @@ -1264,10 +1295,10 @@ "semver@5.7.1","ISC","https://github.com/npm/node-semver" "semver@6.3.0","ISC","https://github.com/npm/node-semver" "semver@7.0.0","ISC","https://github.com/npm/node-semver" -"semver@7.1.3","ISC","https://github.com/npm/node-semver" "semver@7.3.2","ISC","https://github.com/npm/node-semver" +"semver@7.3.4","ISC","https://github.com/npm/node-semver" "send@0.17.1","MIT","https://github.com/pillarjs/send" -"serialize-javascript@3.1.0","BSD-3-Clause","https://github.com/yahoo/serialize-javascript" +"serialize-javascript@4.0.0","BSD-3-Clause","https://github.com/yahoo/serialize-javascript" "serve-index@1.9.1","MIT","https://github.com/expressjs/serve-index" "serve-static@1.14.1","MIT","https://github.com/expressjs/serve-static" "set-blocking@2.0.0","ISC","https://github.com/yargs/set-blocking" @@ -1276,13 +1307,13 @@ "setprototypeof@1.1.0","ISC","https://github.com/wesleytodd/setprototypeof" "setprototypeof@1.1.1","ISC","https://github.com/wesleytodd/setprototypeof" "sha.js@2.4.11","(MIT AND BSD-3-Clause)","https://github.com/crypto-browserify/sha.js" -"shallow-clone@3.0.1","MIT","https://github.com/jonschlinkert/shallow-clone" "shebang-command@1.2.0","MIT","https://github.com/kevva/shebang-command" "shebang-command@2.0.0","MIT","https://github.com/kevva/shebang-command" "shebang-regex@1.0.0","MIT","https://github.com/sindresorhus/shebang-regex" "shebang-regex@3.0.0","MIT","https://github.com/sindresorhus/shebang-regex" "signal-exit@3.0.2","ISC","https://github.com/tapjs/signal-exit" "simple-swizzle@0.2.2","MIT","https://github.com/qix-/node-simple-swizzle" +"sisteransi@1.0.5","MIT","https://github.com/terkelg/sisteransi" "slash@3.0.0","MIT","https://github.com/sindresorhus/slash" "slice-ansi@0.0.4","MIT","https://github.com/chalk/slice-ansi" "slide@1.1.6","ISC","https://github.com/isaacs/slide-flow-control" @@ -1291,17 +1322,17 @@ "snapdragon-util@3.0.1","MIT","https://github.com/jonschlinkert/snapdragon-util" "snapdragon@0.8.2","MIT","https://github.com/jonschlinkert/snapdragon" "socket.io-adapter@1.1.2","MIT","https://github.com/socketio/socket.io-adapter" -"socket.io-client@2.3.0","MIT","https://github.com/Automattic/socket.io-client" -"socket.io-parser@3.3.0","MIT","https://github.com/Automattic/socket.io-parser" +"socket.io-client@2.4.0","MIT","https://github.com/Automattic/socket.io-client" +"socket.io-parser@3.3.2","MIT","https://github.com/Automattic/socket.io-parser" "socket.io-parser@3.4.1","MIT","https://github.com/socketio/socket.io-parser" -"socket.io@2.3.0","MIT","https://github.com/socketio/socket.io" +"socket.io@2.4.1","MIT","https://github.com/socketio/socket.io" "sockjs-client@1.4.0","MIT","https://github.com/sockjs/sockjs-client" "sockjs@0.3.20","MIT","https://github.com/sockjs/sockjs-node" "socks-proxy-agent@4.0.2","MIT","https://github.com/TooTallNate/node-socks-proxy-agent" "socks@2.3.3","MIT","https://github.com/JoshGlazebrook/socks" "sort-keys@1.1.2","MIT","https://github.com/sindresorhus/sort-keys" "source-list-map@2.0.1","MIT","https://github.com/webpack/source-list-map" -"source-map-loader@0.2.4","MIT","https://github.com/webpack-contrib/source-map-loader" +"source-map-loader@1.0.2","MIT","https://github.com/webpack-contrib/source-map-loader" "source-map-resolve@0.5.2","MIT","https://github.com/lydell/source-map-resolve" "source-map-support@0.5.19","MIT","https://github.com/evanw/node-source-map-support" "source-map-support@0.5.6","MIT","https://github.com/evanw/node-source-map-support" @@ -1319,7 +1350,7 @@ "spdx-satisfies@4.0.1","MIT","https://github.com/kemitchell/spdx-satisfies.js" "spdy-transport@3.0.0","MIT","https://github.com/spdy-http2/spdy-transport" "spdy@4.0.2","MIT","https://github.com/indutny/node-spdy" -"speed-measure-webpack-plugin@1.3.1","MIT","https://github.com/stephencookdev/speed-measure-webpack-plugin" +"speed-measure-webpack-plugin@1.3.3","MIT","https://github.com/stephencookdev/speed-measure-webpack-plugin" "split-string@3.1.0","MIT","https://github.com/jonschlinkert/split-string" "sprintf-js@1.0.3","BSD-3-Clause","https://github.com/alexei/sprintf.js" "sprintf-js@1.1.2","BSD-3-Clause","https://github.com/alexei/sprintf.js" @@ -1341,8 +1372,8 @@ "string-width@2.1.1","MIT","https://github.com/sindresorhus/string-width" "string-width@3.1.0","MIT","https://github.com/sindresorhus/string-width" "string-width@4.2.0","MIT","https://github.com/sindresorhus/string-width" -"string.prototype.trimend@1.0.1","MIT","https://github.com/es-shims/String.prototype.trimEnd" -"string.prototype.trimstart@1.0.1","MIT","https://github.com/es-shims/String.prototype.trimStart" +"string.prototype.trimend@1.0.3","MIT","https://github.com/es-shims/String.prototype.trimEnd" +"string.prototype.trimstart@1.0.3","MIT","https://github.com/es-shims/String.prototype.trimStart" "string_decoder@1.1.1","MIT","https://github.com/nodejs/string_decoder" "string_decoder@1.3.0","MIT","https://github.com/nodejs/string_decoder" "stringify-object@3.3.0","BSD-2-Clause","https://github.com/yeoman/stringify-object" @@ -1350,33 +1381,31 @@ "strip-ansi@4.0.0","MIT","https://github.com/chalk/strip-ansi" "strip-ansi@5.2.0","MIT","https://github.com/chalk/strip-ansi" "strip-ansi@6.0.0","MIT","https://github.com/chalk/strip-ansi" -"strip-bom@3.0.0","MIT","https://github.com/sindresorhus/strip-bom" "strip-eof@1.0.0","MIT","https://github.com/sindresorhus/strip-eof" "strip-final-newline@2.0.0","MIT","https://github.com/sindresorhus/strip-final-newline" -"style-loader@1.1.3","MIT","https://github.com/webpack-contrib/style-loader" +"style-loader@1.2.1","MIT","https://github.com/webpack-contrib/style-loader" "stylehacks@4.0.3","MIT","https://github.com/cssnano/cssnano" "stylus-loader@3.0.2","MIT","https://github.com/shama/stylus-loader" -"stylus@0.54.7","MIT","https://github.com/stylus/stylus" +"stylus@0.54.8","MIT","https://github.com/stylus/stylus" "supports-color@2.0.0","MIT","https://github.com/chalk/supports-color" "supports-color@4.5.0","MIT","https://github.com/chalk/supports-color" "supports-color@5.5.0","MIT","https://github.com/chalk/supports-color" "supports-color@6.1.0","MIT","https://github.com/chalk/supports-color" -"supports-color@7.1.0","MIT","https://github.com/chalk/supports-color" "supports-color@7.2.0","MIT","https://github.com/chalk/supports-color" "svgo@1.3.2","MIT","https://github.com/svg/svgo" "symbol-observable@1.2.0","MIT","https://github.com/blesh/symbol-observable" "tapable@1.1.3","MIT","https://github.com/webpack/tapable" "tar@4.4.13","ISC","https://github.com/npm/node-tar" -"tar@6.0.2","ISC","https://github.com/npm/node-tar" -"terser-webpack-plugin@1.4.4","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" -"terser-webpack-plugin@3.0.3","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" -"terser@4.6.10","BSD-2-Clause","https://github.com/terser/terser" +"tar@6.0.5","ISC","https://github.com/npm/node-tar" +"terser-webpack-plugin@1.4.5","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" +"terser-webpack-plugin@4.1.0","MIT","https://github.com/webpack-contrib/terser-webpack-plugin" "terser@4.8.0","BSD-2-Clause","https://github.com/terser/terser" +"terser@5.3.0","BSD-2-Clause","https://github.com/terser/terser" "throttleit@1.0.0","MIT","https://github.com/component/throttle" "through2@2.0.5","MIT","https://github.com/rvagg/through2" "through@2.3.8","MIT","https://github.com/dominictarr/through" "thunky@1.1.0","MIT","https://github.com/mafintosh/thunky" -"timers-browserify@2.0.11","MIT","https://github.com/jryans/timers-browserify" +"timers-browserify@2.0.12","MIT","https://github.com/jryans/timers-browserify" "timsort@0.3.0","MIT","https://github.com/mziccard/node-timsort" "tiny-emitter@2.1.0","MIT","https://github.com/scottcorgan/tiny-emitter" "tmp@0.0.33","MIT","https://github.com/raszi/node-tmp" @@ -1391,16 +1420,20 @@ "toidentifier@1.0.0","MIT","https://github.com/component/toidentifier" "tough-cookie@2.4.3","BSD-3-Clause","https://github.com/salesforce/tough-cookie" "tough-cookie@2.5.0","BSD-3-Clause","https://github.com/salesforce/tough-cookie" +"tr46@2.0.2","MIT","https://github.com/jsdom/tr46" "tree-kill@1.2.2","MIT","https://github.com/pkrumins/node-tree-kill" "treeify@1.1.0","MIT","https://github.com/notatestuser/treeify" "trim-right@1.0.1","MIT","https://github.com/sindresorhus/trim-right" "ts-loader@5.4.5","MIT","https://github.com/TypeStrong/ts-loader" "ts-md5@1.2.6","MIT","https://github.com/cotag/ts-md5" "ts-node@8.4.1","MIT","https://github.com/TypeStrong/ts-node" -"tslib@1.11.1","Apache-2.0","https://github.com/Microsoft/tslib" -"tslib@1.13.0","0BSD","https://github.com/Microsoft/tslib" +"ts-pnp@1.2.0","MIT","https://github.com/arcanis/ts-pnp" +"tslib@1.14.1","0BSD","https://github.com/Microsoft/tslib" +"tslib@2.0.1","0BSD","https://github.com/Microsoft/tslib" +"tslib@2.0.3","0BSD","https://github.com/Microsoft/tslib" "tslint-config-prettier@1.18.0","MIT","https://github.com/prettier/tslint-config-prettier" -"tslint@5.20.1","Apache-2.0","https://github.com/palantir/tslint" +"tslint@6.1.3","Apache-2.0","https://github.com/palantir/tslint" +"tsutils-etc@1.3.2","MIT","https://github.com/cartant/tsutils-etc" "tsutils@2.29.0","MIT","https://github.com/ajafff/tsutils" "tsutils@3.17.1","MIT","https://github.com/ajafff/tsutils" "tty-browserify@0.0.0","MIT","https://github.com/substack/tty-browserify" @@ -1409,11 +1442,13 @@ "type-fest@0.11.0","(MIT OR CC0-1.0)","https://github.com/sindresorhus/type-fest" "type-fest@0.6.0","(MIT OR CC0-1.0)","https://github.com/sindresorhus/type-fest" "type-is@1.6.18","MIT","https://github.com/jshttp/type-is" +"type@1.2.0","ISC","https://github.com/medikoo/type" +"type@2.1.0","ISC","https://github.com/medikoo/type" "typedarray@0.0.6","MIT","https://github.com/substack/typedarray" -"typescript@3.6.5","Apache-2.0","https://github.com/Microsoft/TypeScript" -"typescript@3.8.3","Apache-2.0","https://github.com/Microsoft/TypeScript" +"typescript@3.9.7","Apache-2.0","https://github.com/Microsoft/TypeScript" +"typescript@4.0.2","Apache-2.0","https://github.com/Microsoft/TypeScript" +"typescript@4.0.5","Apache-2.0","https://github.com/Microsoft/TypeScript" "ua-parser-js@0.7.21","MIT","https://github.com/faisalman/ua-parser-js" -"uglify-js@3.6.0","BSD-2-Clause","https://github.com/mishoo/UglifyJS2" "unicode-canonical-property-names-ecmascript@1.0.4","MIT","https://github.com/mathiasbynens/unicode-canonical-property-names-ecmascript" "unicode-match-property-ecmascript@1.0.4","MIT","https://github.com/mathiasbynens/unicode-match-property-ecmascript" "unicode-match-property-value-ecmascript@1.1.0","MIT","https://github.com/mathiasbynens/unicode-match-property-value-ecmascript" @@ -1424,7 +1459,7 @@ "uniqs@2.0.0","MIT","https://github.com/fgnass/uniqs" "unique-filename@1.1.1","ISC","https://github.com/iarna/unique-filename" "unique-slug@2.0.2","ISC","https://github.com/iarna/unique-slug" -"universal-analytics@0.4.20","MIT","https://github.com/peaksandpies/universal-analytics" +"universal-analytics@0.4.23","MIT","https://github.com/peaksandpies/universal-analytics" "universalify@0.1.2","MIT","https://github.com/RyanZim/universalify" "universalify@1.0.0","MIT","https://github.com/RyanZim/universalify" "unpipe@1.0.0","MIT","https://github.com/stream-utils/unpipe" @@ -1445,8 +1480,8 @@ "util@0.11.1","MIT","https://github.com/defunctzombie/node-util" "utils-merge@1.0.1","MIT","https://github.com/jaredhanson/utils-merge" "uuid@3.4.0","MIT","https://github.com/uuidjs/uuid" -"uuid@7.0.2","MIT","https://github.com/uuidjs/uuid" "uuid@7.0.3","MIT","https://github.com/uuidjs/uuid" +"uuid@8.3.0","MIT","https://github.com/uuidjs/uuid" "validate-npm-package-license@3.0.3","Apache-2.0","https://github.com/kemitchell/validate-npm-package-license.js" "validate-npm-package-name@3.0.0","ISC","https://github.com/npm/validate-npm-package-name" "vary@1.1.2","MIT","https://github.com/jshttp/vary" @@ -1454,38 +1489,38 @@ "verror@1.10.0","MIT","https://github.com/davepacheco/node-verror" "vm-browserify@1.1.2","MIT","https://github.com/substack/vm-browserify" "void-elements@2.0.1","MIT","https://github.com/hemanth/void-elements" -"watchpack-chokidar2@2.0.0","MIT","https://github.com/webpack/watchpack" -"watchpack@1.7.2","MIT","https://github.com/webpack/watchpack" +"watchpack-chokidar2@2.0.1","MIT","https://github.com/webpack/watchpack" +"watchpack@1.7.5","MIT","https://github.com/webpack/watchpack" "wbuf@1.7.3","MIT","https://github.com/indutny/wbuf" "wcwidth@1.0.1","MIT","https://github.com/timoxley/wcwidth" +"webidl-conversions@6.1.0","BSD-2-Clause","https://github.com/jsdom/webidl-conversions" "webpack-dev-middleware@3.7.2","MIT","https://github.com/webpack/webpack-dev-middleware" "webpack-dev-server@3.11.0","MIT","https://github.com/webpack/webpack-dev-server" "webpack-log@2.0.0","MIT","https://github.com/webpack-contrib/webpack-log" "webpack-merge@4.2.2","MIT","https://github.com/survivejs/webpack-merge" "webpack-sources@1.4.3","MIT","https://github.com/webpack/webpack-sources" -"webpack-subresource-integrity@1.4.0","MIT","https://github.com/waysact/webpack-subresource-integrity" -"webpack@4.42.0","MIT","https://github.com/webpack/webpack" +"webpack-subresource-integrity@1.4.1","MIT","https://github.com/waysact/webpack-subresource-integrity" +"webpack@4.44.1","MIT","https://github.com/webpack/webpack" "websocket-driver@0.6.5","MIT","https://github.com/faye/websocket-driver-node" "websocket-extensions@0.1.4","Apache-2.0","https://github.com/faye/websocket-extensions-node" +"whatwg-mimetype@2.3.0","MIT","https://github.com/jsdom/whatwg-mimetype" +"whatwg-url@8.4.0","MIT","https://github.com/jsdom/whatwg-url" "when@3.6.4","MIT","https://github.com/cujojs/when" "which-module@2.0.0","ISC","https://github.com/nexdrew/which-module" "which@1.3.0","ISC","https://github.com/isaacs/node-which" "which@1.3.1","ISC","https://github.com/isaacs/node-which" "which@2.0.2","ISC","https://github.com/isaacs/node-which" "wide-align@1.1.3","ISC","https://github.com/iarna/wide-align" -"wordwrap@1.0.0","MIT","https://github.com/substack/node-wordwrap" "worker-farm@1.7.0","MIT","https://github.com/rvagg/node-worker-farm" -"worker-plugin@4.0.3","Apache-2.0","https://github.com/GoogleChromeLabs/worker-plugin" +"worker-plugin@5.0.0","Apache-2.0","https://github.com/GoogleChromeLabs/worker-plugin" "wrap-ansi@3.0.1","MIT","https://github.com/chalk/wrap-ansi" "wrap-ansi@5.1.0","MIT","https://github.com/chalk/wrap-ansi" "wrap-ansi@6.2.0","MIT","https://github.com/chalk/wrap-ansi" "wrappy@1.0.2","ISC","https://github.com/npm/wrappy" -"ws@6.1.4","MIT","https://github.com/websockets/ws" "ws@6.2.1","MIT","https://github.com/websockets/ws" -"ws@7.3.1","MIT","https://github.com/websockets/ws" +"ws@7.4.2","MIT","https://github.com/websockets/ws" "xhr2@0.2.0","MIT","https://github.com/pwnall/node-xhr2" "xmlhttprequest-ssl@1.5.5","MIT","https://github.com/mjwwit/node-XMLHttpRequest" -"xregexp@4.0.0","MIT","https://github.com/slevithan/xregexp" "xtend@4.0.2","MIT","https://github.com/Raynos/xtend" "y18n@4.0.0","ISC","https://github.com/yargs/y18n" "yallist@3.1.1","ISC","https://github.com/isaacs/yallist" @@ -1498,4 +1533,5 @@ "yauzl@2.10.0","MIT","https://github.com/thejoshwolfe/yauzl" "yeast@0.1.2","MIT","https://github.com/unshiftio/yeast" "yn@3.1.1","MIT","https://github.com/sindresorhus/yn" +"yocto-queue@0.1.0","MIT","https://github.com/sindresorhus/yocto-queue" "zone.js@0.10.3","MIT","https://github.com/angular/angular" From 5942713d65c96f6b5306d1e848d0e63dd365f338 Mon Sep 17 00:00:00 2001 From: Richard-Hansen <36607471+Richard-Hansen@users.noreply.github.com> Date: Thu, 4 Feb 2021 13:58:15 -0500 Subject: [PATCH 025/119] Feature/3968/hosted workflow file naming (#1145) Allows adding multiple files to a hosted workflow/tool. dockstore/dockstore#3968 Hosted files will have equal absolute and relative paths (we don't provide a 'directory structure' that one can navigate when creating hosted files). Updated the file edit component to now more correctly pass the absolute path of the sourcefile instead of the relative path to related components and functions. Currently, this doesn't impact functionality, but supports future compatibility if the handling of hosted files change, as relative paths may be affected. --- cypress/integration/group1/hostedWorkflows.ts | 43 +++++++++++++++++++ .../code-editor-list.component.html | 24 ++++++----- .../code-editor-list.component.ts | 10 +++++ 3 files changed, 67 insertions(+), 10 deletions(-) diff --git a/cypress/integration/group1/hostedWorkflows.ts b/cypress/integration/group1/hostedWorkflows.ts index 2a52db423e..623868be34 100644 --- a/cypress/integration/group1/hostedWorkflows.ts +++ b/cypress/integration/group1/hostedWorkflows.ts @@ -36,6 +36,9 @@ describe('Dockstore hosted workflows', () => { goToUnexpandedSidebarEntry('dockstore.org/A', /hosted/); } + // using an ugly name to flex workflow naming functionality a bit + const NEW_WORKFLOW_NAME = 'new_Hosted-workflow-8_part-2'; + // Ensure tabs are correct for the hosted workflow, try adding a version describe('Should be able to register a hosted workflow and add files to it', () => { it('Register the workflow', () => { @@ -146,5 +149,45 @@ describe('Dockstore hosted workflows', () => { goToTab('Files'); cy.contains('/Dockstore.wdl').should('be.visible'); }); + it('Create a new hosted workflow', () => { + cy.get('#registerWorkflowButton').should('be.visible').should('be.enabled').click(); + cy.get('#3-register-workflow-option').should('be.visible').click(); + cy.contains('button', 'Next').click(); + cy.get('#hostedWorkflowRepository').type(NEW_WORKFLOW_NAME); + cy.contains('button', 'Register Workflow').click(); + }); + it('Add files to hosted workflow', () => { + // navigate to workflow + cy.get('.mat-expanded'); + cy.contains('dockstore.org/user_A').click(); + cy.contains('a', NEW_WORKFLOW_NAME).click(); + + // Check content of the info tab + cy.contains('Mode: HOSTED'); + + // Add a new version with 3 descriptors + goToTab('Files'); + cy.get('#editFilesButton').click(); + + // there should be no descriptors files + cy.get('app-code-editor').should('have.length', 0); + + // add first file. This will be the primary descriptor, so we wont need to give it a custom name + cy.contains('Add File').click(); + + // add a bunch of new files + for (let i = 0; i < 3; i++) { + cy.contains('Add File').click(); + cy.wait(100); // focus is pulled to the content box of the editor shortly after adding a file, wait for this to occur + cy.get('.editor-file-name').last().type(`{selectall}{backspace}/${i}.cwl{enter}`); + } + + // save as a new version + cy.get('#saveNewVersionButton').click(); + cy.wait(1000); // have to wait for the response from the webservice, otherwise you may get a false positive + + // should have 4 descriptors. + cy.get('app-code-editor').should('have.length', 4); + }); }); }); diff --git a/src/app/shared/code-editor-list/code-editor-list.component.html b/src/app/shared/code-editor-list/code-editor-list.component.html index 137d82556f..39e018d514 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.html +++ b/src/app/shared/code-editor-list/code-editor-list.component.html @@ -4,19 +4,22 @@
    -
    +
    - - {{ sourcefile.path }} + + {{ sourcefile.absolutePath }} @@ -25,7 +28,7 @@ class="delete-editor-file mr-2" color="warn" (click)="deleteFile(i)" - *ngIf="editing && !isPrimaryDescriptor(sourcefile?.path) && !isDockerFile(sourcefile?.path)" + *ngIf="editing && !isPrimaryDescriptor(sourcefile?.absolutePath) && !isDockerFile(sourcefile?.absolutePath)" matTooltip="Delete the file" > delete @@ -38,8 +41,9 @@ *ngIf="published$ | async; else unpublishedDownloadLink" download [href]="sourcefile | publicFileDownload: entrypath:selectedVersion:descriptorType:entryType" + [download]="sourcefile?.absolutePath | privateFilePath" type="button" - matTooltip="Download {{ sourcefile?.path }}" + matTooltip="Download {{ sourcefile?.absolutePath }}" > save_alt @@ -49,9 +53,9 @@ color="secondary" class="mr-2 link-button" [href]="sourcefile?.content | privateFileDownload" - [download]="sourcefile?.path | privateFilePath" + [download]="sourcefile?.absolutePath | privateFilePath" type="button" - matTooltip="Download {{ sourcefile?.path }}" + matTooltip="Download {{ sourcefile?.absolutePath }}" > save_alt @@ -72,7 +76,7 @@     diff --git a/src/app/shared/code-editor-list/code-editor-list.component.ts b/src/app/shared/code-editor-list/code-editor-list.component.ts index 1382740f18..c0ee6df7d1 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.ts +++ b/src/app/shared/code-editor-list/code-editor-list.component.ts @@ -93,4 +93,14 @@ export class CodeEditorListComponent { const descriptorType = this.descriptorType; return CodeEditorListService.showSourcefile(type, fileType, descriptorType); } + + /** + * Updates the absolute and relative paths for a sourcefile. + * @param newPath {string} the new path to the sourcefile + * @param index {number} index of a SourceFile object in the sourcefiles array + */ + updateSourceFilePath(newPath: string, index: number) { + this.sourcefiles[index].absolutePath = newPath; + this.sourcefiles[index].path = newPath; + } } From 7afcd4f3d268892bd3e6a9f06ec4cd9e314ad440 Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Tue, 9 Feb 2021 09:05:24 -0800 Subject: [PATCH 026/119] Seab 1632/tool tester logs smoke test (#1150) * https://ucsc-cgl.atlassian.net/browse/SEAB-1632 - check for tooltester logs in production smoke test Co-authored-by: latfariha --- .../manualTests/basic-enduser-prod-only.ts | 23 +++++++++++++++++++ package.json | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 cypress/integration/manualTests/basic-enduser-prod-only.ts diff --git a/cypress/integration/manualTests/basic-enduser-prod-only.ts b/cypress/integration/manualTests/basic-enduser-prod-only.ts new file mode 100644 index 0000000000..1731965cc9 --- /dev/null +++ b/cypress/integration/manualTests/basic-enduser-prod-only.ts @@ -0,0 +1,23 @@ +describe('Test existence of Logs', () => { + it('Find Logs in Workflows', () => { + cy.visit('/workflows/github.com/DataBiosphere/topmed-workflows/UM_variant_caller_wdl:1.32.0?tab=info'); + cy.get('[data-cy=verificationLogsDialog]').click(); + + cy.contains('.mat-card-title', 'Verification Information'); + cy.get('.mat-table') + .first() + .within(() => { + cy.get('.mat-row').should('have.length.of.at.least', 1); + cy.contains('Dockstore CLI'); + }); + + cy.contains('.mat-card-title', 'Logs'); + cy.get('.mat-table') + .eq(1) + .within(() => { + cy.get('.mat-row').should('have.length.of.at.least', 3); + cy.contains('variant-caller/variant-caller-wdl/topmed_freeze3_calling.json'); + cy.contains('View FULL log'); + }); + }); +}); diff --git a/package.json b/package.json index 120c9dc4fb..14f854eb30 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "postinstall": "ngcc", "test-dev-no-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", "test-staging-no-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", - "test-prod-no-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts\"", + "test-prod-no-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/monitor.ts,cypress/integration/manualTests/basic-enduser.ts,cypress/integration/manualTests/search.ts,cypress/integration/manualTests/basic-enduser-prod-only.ts\"", "test-dev-auth": "npx cypress run --record --reporter junit -c baseUrl=https://dev.dockstore.net -s \"cypress/integration/manualTests/auth-tests.ts\"", "test-staging-auth": "npx cypress run -c baseUrl=https://staging.dockstore.org -s \"cypress/integration/manualTests/auth-tests.ts\"", "test-prod-auth": "npx cypress run -c baseUrl=https://dockstore.org -s \"cypress/integration/manualTests/auth-tests.ts\"" From 4318e60c684339ed5a640697a602c4d3ad0dc026 Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Wed, 10 Feb 2021 11:53:53 -0500 Subject: [PATCH 027/119] Footer Reimplementation (#1149) * new images * footer reimplemented, still need the svg image of ucsc * removed the affiliation list on homepage, cleaned up some code * spacing fixes * broad white svg * added snackbar for displaying Copied, added alt attribute for two pngs on homepage for SEO * adjusted flex spacing * Update THIRD-PARTY-LICENSES.csv * Update THIRD-PARTY-LICENSES.csv * fixed unit test failure: "NullInjectorError: No provider for MatSnackBar" * Update footer.component.css * px to rem * loading twitter widget with a time out * footer styling fixes * styling update * copy build info border color --- src/app/footer/footer.component.css | 60 +- src/app/footer/footer.component.html | 334 +++++++----- src/app/footer/footer.component.spec.ts | 3 +- src/app/footer/footer.component.ts | 20 +- .../home-logged-out/home.component.html | 7 +- src/app/shared/dockstore.model.ts | 1 + src/app/sponsors/sponsor.model.ts | 4 + src/app/sponsors/sponsors.component.html | 13 - src/app/sponsors/sponsors.component.ts | 2 - src/app/sponsors/sponsors.service.ts | 12 - .../sponsors/non-coloured/broad-gray.svg | 371 +++++++++++++ .../images/sponsors/non-coloured/broad1.svg | 179 ++++++ .../sponsors/non-coloured/collaboratory.svg | 1 + .../images/sponsors/non-coloured/ga.svg | 516 ++++++++++++++++++ .../images/sponsors/non-coloured/oicr.svg | 1 + .../images/sponsors/non-coloured/ucsc.png | Bin 0 -> 44971 bytes src/ds-style-fix.scss | 4 +- src/styles.scss | 13 +- 18 files changed, 1356 insertions(+), 185 deletions(-) create mode 100644 src/assets/images/sponsors/non-coloured/broad-gray.svg create mode 100644 src/assets/images/sponsors/non-coloured/broad1.svg create mode 100644 src/assets/images/sponsors/non-coloured/collaboratory.svg create mode 100644 src/assets/images/sponsors/non-coloured/ga.svg create mode 100644 src/assets/images/sponsors/non-coloured/oicr.svg create mode 100644 src/assets/images/sponsors/non-coloured/ucsc.png diff --git a/src/app/footer/footer.component.css b/src/app/footer/footer.component.css index 5561961fdf..9a35bb4ba2 100644 --- a/src/app/footer/footer.component.css +++ b/src/app/footer/footer.component.css @@ -17,18 +17,68 @@ .container-fluid, a { background-color: #21335b; - color: white; + color: #e8eaf6; } .container-fluid { - padding-top: 20px; + padding-top: 2rem; } -.container-fluid, ul { list-style: none; } -.footer-list li:first-child { - font-weight: bold; +/* the title of each column */ +.title { + /* used for making the text semi-bold */ + text-shadow: 0 0 0 #c5cae9; + color: #c5cae9; + text-transform: uppercase; + padding: 1rem 0; +} + +.sponsor-img { + height: 60px; + vertical-align: middle; +} + +hr { + border: 1px solid #e8eaf6 80%; +} + +@media only screen and (min-width: 80rem) { + hr { + margin-bottom: 0; + } +} + +li a { + /* gives more space for link to be clicked on */ + padding: 1rem 0; +} + +/* button for "copy build info" */ +.mat-stroked-button { + border: #a4a8be 1px solid; + margin-top: 1rem; + padding: 0 0.45rem; +} + +/* very last row of the footer */ +.bottom-footer { + justify-content: center; + align-items: center; + display: flex; +} + +.footer-link:link { + text-decoration: underline; +} + +.footer-link:hover { + color: white; +} + +.dockstore-support { + text-align: center; } diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 006e792a48..2700c05566 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -16,151 +16,215 @@
    - -
    +
    -
    - - Support for Dockstore is provided by grants from Genome Canada, the National Institutes of Health, and the Province of - Ontario. - +
    +
    +
    +
    + ©{{ year }} OICR +  ·  + + Terms of Service + +  ·  + + Privacy Policy + +
    +
    + + Support for Dockstore + is provided by grants from Genome Canada, the National Institutes of Health, and the Province of Ontario. + +
    +
    diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts index 42d997b7d7..e062803184 100644 --- a/src/app/footer/footer.component.spec.ts +++ b/src/app/footer/footer.component.spec.ts @@ -16,6 +16,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterTestingModule } from '@angular/router/testing'; import { MetadataService } from '../metadata/metadata.service'; import { GA4GHService } from './../shared/swagger/api/gA4GH.service'; @@ -32,7 +33,7 @@ describe('FooterComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [FooterComponent, GitTagPipe], - imports: [RouterTestingModule, MatIconModule], + imports: [RouterTestingModule, MatIconModule, MatSnackBarModule], providers: [MetadataService, { provide: GA4GHService, useClass: GA4GHStubService }], }).compileComponents(); }) diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts index 84943852cd..7bdf9ddcb3 100644 --- a/src/app/footer/footer.component.ts +++ b/src/app/footer/footer.component.ts @@ -15,10 +15,12 @@ */ import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { takeUntil } from 'rxjs/operators'; import { MetadataService } from '../metadata/metadata.service'; import { Base } from '../shared/base'; +import { Sponsor } from '../sponsors/sponsor.model'; import { Dockstore } from './../shared/dockstore.model'; import { Metadata } from './../shared/swagger/model/metadata'; import { FooterService } from './footer.service'; @@ -27,7 +29,7 @@ import { versions } from './versions'; @Component({ selector: 'app-footer', templateUrl: './footer.component.html', - styleUrls: ['./footer.component.css'], + styleUrls: ['./footer.component.css'] }) export class FooterComponent extends Base implements OnInit { version: string; @@ -37,6 +39,13 @@ export class FooterComponent extends Base implements OnInit { Dockstore = Dockstore; year: number; content: string; + public sponsors: Sponsor[] = [ + new Sponsor('collaboratory.svg', new URL('https://www.cancercollaboratory.org/')), + new Sponsor('oicr.svg', new URL('https://oicr.on.ca/')), + new Sponsor('broad1.svg', new URL('https://www.broadinstitute.org/')), + new Sponsor('ga.svg', new URL('https://genomicsandhealth.org/')), + new Sponsor('ucsc.png', new URL('https://ucscgenomics.soe.ucsc.edu/')), + ]; /** * API Status codes that can indicate the web service is down @@ -49,10 +58,17 @@ export class FooterComponent extends Base implements OnInit { */ private readonly WEBSERVICE_DOWN_STATUS_CODES = [0, 404, 502, 504]; - constructor(private metadataService: MetadataService, private footerService: FooterService) { + constructor(private metadataService: MetadataService, private footerService: FooterService, private matSnackBar: MatSnackBar) { super(); } + openSnackBar() { + this.matSnackBar.open('Copied!', '', { + duration: 500, + panelClass: 'custom_copy_snack_bar', + }); + } + ngOnInit() { this.year = new Date().getFullYear(); this.tag = versions.tag; diff --git a/src/app/home-page/home-logged-out/home.component.html b/src/app/home-page/home-logged-out/home.component.html index d86f06f1d0..ebd43b61a1 100644 --- a/src/app/home-page/home-logged-out/home.component.html +++ b/src/app/home-page/home-logged-out/home.component.html @@ -70,8 +70,8 @@

    - - + ship + truck
    @@ -211,9 +211,6 @@

    Join the discussion

    Discourse open_in_new
    - -

    And

    -
    diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index 5e52b59d48..63b5b59dbc 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -77,6 +77,7 @@ export class Dockstore { static GITHUB_APP_INSTALLATION_URL = 'will be filled in by configuration.service'; + static DOCKSTORE_REPO = 'https://github.com/dockstore/dockstore'; static DOCUMENTATION_URL = 'https://docs.dockstore.org'; static FEATURED_CONTENT_URL = 'will be filled in by configuration.service'; diff --git a/src/app/sponsors/sponsor.model.ts b/src/app/sponsors/sponsor.model.ts index f609730464..8878d37c82 100644 --- a/src/app/sponsors/sponsor.model.ts +++ b/src/app/sponsors/sponsor.model.ts @@ -16,13 +16,17 @@ export class Sponsor { private static colouredPath = '../assets/images/sponsors/coloured/'; + private static nonColouredPath = '../assets/images/sponsors/non-coloured/'; public current: string; + public nonColouredCurrent: string; public coloured: string; public url: URL; constructor(image: string, url: URL) { this.current = Sponsor.colouredPath + image; + // used for "in affiliation with" logos in the footer + this.nonColouredCurrent = Sponsor.nonColouredPath + image; this.url = url; } } diff --git a/src/app/sponsors/sponsors.component.html b/src/app/sponsors/sponsors.component.html index bc1482e117..d5df41fd45 100644 --- a/src/app/sponsors/sponsors.component.html +++ b/src/app/sponsors/sponsors.component.html @@ -14,19 +14,6 @@ ~ limitations under the License. -->
    -
    -
    In Affiliation With
    -
    - -
    -
    - - - - -
    -
    -
    Workflow Languages

    diff --git a/src/app/sponsors/sponsors.component.ts b/src/app/sponsors/sponsors.component.ts index d635fc4b55..5c3bab595e 100644 --- a/src/app/sponsors/sponsors.component.ts +++ b/src/app/sponsors/sponsors.component.ts @@ -33,7 +33,6 @@ import { SponsorsService } from './sponsors.service'; }) export class SponsorsComponent extends Base implements OnInit { public user$: Observable; - public sponsors: Sponsor[]; public partners: Sponsor[]; public languages: Sponsor[]; public isHomePage = false; @@ -52,7 +51,6 @@ export class SponsorsComponent extends Base implements OnInit { ngOnInit() { // Initialize sponsors and partners - this.sponsors = this.sponsorsService.getSponsors(); this.partners = this.sponsorsService.getPartners(); this.languages = this.sponsorsService.getLanguages(); diff --git a/src/app/sponsors/sponsors.service.ts b/src/app/sponsors/sponsors.service.ts index dc424d8040..468355c6ad 100644 --- a/src/app/sponsors/sponsors.service.ts +++ b/src/app/sponsors/sponsors.service.ts @@ -19,14 +19,6 @@ import { Sponsor } from './sponsor.model'; @Injectable() export class SponsorsService { - // TODO: UCSC logo is technically different than the one linked to - private sponsors: Sponsor[] = [ - new Sponsor('collaboratory.png', new URL('https://www.cancercollaboratory.org/')), - new Sponsor('oicr.png', new URL('https://oicr.on.ca/')), - new Sponsor('ga4gh.png', new URL('https://genomicsandhealth.org/')), - new Sponsor('ucsc.png', new URL('https://ucscgenomics.soe.ucsc.edu/')), - ]; - private languages: Sponsor[] = [ new Sponsor('cwl.png', new URL('https://www.commonwl.org')), new Sponsor('wdl.png', new URL('http://openwdl.org')), @@ -39,10 +31,6 @@ export class SponsorsService { new Sponsor('terra.png', new URL('https://terra.bio')), ]; - getSponsors(): Sponsor[] { - return this.sponsors; - } - getPartners(): Sponsor[] { return this.partners; } diff --git a/src/assets/images/sponsors/non-coloured/broad-gray.svg b/src/assets/images/sponsors/non-coloured/broad-gray.svg new file mode 100644 index 0000000000..c1eb4e7510 --- /dev/null +++ b/src/assets/images/sponsors/non-coloured/broad-gray.svg @@ -0,0 +1,371 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/assets/images/sponsors/non-coloured/broad1.svg b/src/assets/images/sponsors/non-coloured/broad1.svg new file mode 100644 index 0000000000..51fb5d4e99 --- /dev/null +++ b/src/assets/images/sponsors/non-coloured/broad1.svg @@ -0,0 +1,179 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/sponsors/non-coloured/collaboratory.svg b/src/assets/images/sponsors/non-coloured/collaboratory.svg new file mode 100644 index 0000000000..6463901646 --- /dev/null +++ b/src/assets/images/sponsors/non-coloured/collaboratory.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/ga.svg b/src/assets/images/sponsors/non-coloured/ga.svg new file mode 100644 index 0000000000..d58ce29571 --- /dev/null +++ b/src/assets/images/sponsors/non-coloured/ga.svg @@ -0,0 +1,516 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/sponsors/non-coloured/oicr.svg b/src/assets/images/sponsors/non-coloured/oicr.svg new file mode 100644 index 0000000000..98244f790d --- /dev/null +++ b/src/assets/images/sponsors/non-coloured/oicr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/ucsc.png b/src/assets/images/sponsors/non-coloured/ucsc.png new file mode 100644 index 0000000000000000000000000000000000000000..6aa5364c1a01aa9905f60d428a297efbed017fda GIT binary patch literal 44971 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 B3nc&m literal 0 HcmV?d00001 diff --git a/src/ds-style-fix.scss b/src/ds-style-fix.scss index d74fe1772e..f201e9fb72 100644 --- a/src/ds-style-fix.scss +++ b/src/ds-style-fix.scss @@ -686,8 +686,8 @@ div.modal form { text-decoration: none; } -.footer-list > li { - margin: 0px !important; +.footer-list li { + margin: 0 0 0.6rem 0 !important; } @media (max-width: 992px) { diff --git a/src/styles.scss b/src/styles.scss index 1abd2b481a..b0d9587487 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1171,14 +1171,6 @@ body { height: 52px; } -.footer-link:link { - text-decoration: none; -} - -.footer-link:hover { - text-decoration: underline; -} - .my-entry-button-group { margin-bottom: 5px; } @@ -1287,3 +1279,8 @@ mat-tab-group.no-pagination { flex-direction: column; } } + +.custom_copy_snack_bar { + min-width: 0 !important; + background-color: #5c5c5c !important; +} From 9a99962c9094db04d01637412f625d816461a6cb Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 11 Feb 2021 14:01:50 -0500 Subject: [PATCH 028/119] Feature/broken styles (#1154) * styling bugs fixed !important is needed since it needs to override the default style for some angular material elements * workflow and tools have two columns hidden when screen size is small --- .../version-modal/version-modal.component.css | 6 ++++++ .../version-modal/version-modal.component.html | 2 +- src/app/container/versions/versions.component.html | 2 +- src/app/containers/list/list.component.html | 12 ++++++------ src/app/navbar/navbar.component.css | 4 ---- src/app/navbar/navbar.component.html | 6 +++--- src/app/shared/styles/entry-table.scss | 4 ---- src/app/workflows/list/list.component.html | 8 ++++---- src/ds-style-fix.scss | 5 +++++ 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/app/container/version-modal/version-modal.component.css b/src/app/container/version-modal/version-modal.component.css index f9b3ebf702..9ff53f2dc2 100644 --- a/src/app/container/version-modal/version-modal.component.css +++ b/src/app/container/version-modal/version-modal.component.css @@ -13,3 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#file_copy { + font-size: initial; + transform: scale(1.3); + height: fit-content; +} diff --git a/src/app/container/version-modal/version-modal.component.html b/src/app/container/version-modal/version-modal.component.html index eb96fa0fe8..3e5c7d81e8 100644 --- a/src/app/container/version-modal/version-modal.component.html +++ b/src/app/container/version-modal/version-modal.component.html @@ -394,7 +394,7 @@

    {{ TagEditorMode[mode] }} Version Tag

    />
    diff --git a/src/app/container/versions/versions.component.html b/src/app/container/versions/versions.component.html index 28c9edcc19..b613e66fe5 100644 --- a/src/app/container/versions/versions.component.html +++ b/src/app/container/versions/versions.component.html @@ -44,7 +44,7 @@ > - + Default Name - + {{ @@ -38,17 +38,17 @@ - Verified - + Verified + check - Stars - {{ tool?.starredUsers.length === 0 ? '' : tool?.starredUsers.length }} + Stars + + {{ tool?.starredUsers.length === 0 ? '' : tool?.starredUsers.length }} star_rate diff --git a/src/app/navbar/navbar.component.css b/src/app/navbar/navbar.component.css index 808d741aaa..b976a7b5e0 100644 --- a/src/app/navbar/navbar.component.css +++ b/src/app/navbar/navbar.component.css @@ -58,7 +58,3 @@ a:focus { mat-menu { padding-right: 10px; } - -.icon-sm { - width: 25%; -} diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index 06b457ba48..6fbf39278d 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -87,9 +87,9 @@
    - Search - Organizations - Docs + Search + Organizations + Docs
    diff --git a/src/app/shared/styles/entry-table.scss b/src/app/shared/styles/entry-table.scss index e3bda6dbb3..820e7b7f15 100644 --- a/src/app/shared/styles/entry-table.scss +++ b/src/app/shared/styles/entry-table.scss @@ -34,10 +34,6 @@ align-items: center; } -.mat-column-author { - flex: 0 0 180px; -} - .mat-column-name { word-break: break-word; } diff --git a/src/app/workflows/list/list.component.html b/src/app/workflows/list/list.component.html index e2ee453f68..5142dc6585 100644 --- a/src/app/workflows/list/list.component.html +++ b/src/app/workflows/list/list.component.html @@ -35,16 +35,16 @@ - Verified - + Verified + done - Stars - + Stars + {{ workflow?.starredUsers.length === 0 ? '' : workflow?.starredUsers.length }} star_rate diff --git a/src/ds-style-fix.scss b/src/ds-style-fix.scss index f201e9fb72..253cdd02cf 100644 --- a/src/ds-style-fix.scss +++ b/src/ds-style-fix.scss @@ -753,6 +753,11 @@ div.modal form { margin: 2px !important; } +.mat-chip-list-wrapper { + display: inline-flex !important; + margin: auto !important; +} + .mat-drawer-container { z-index: unset !important; background-color: #fff !important; From a2800a142158a7cf6c56dcad8b2252227c20544f Mon Sep 17 00:00:00 2001 From: "imgbot[bot]" <31301654+imgbot[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 15:21:36 -0500 Subject: [PATCH 029/119] [ImgBot] Optimize images (#1153) *Total -- 151.02kb -> 127.14kb (15.81%) /src/assets/images/sponsors/non-coloured/ucsc.png -- 43.92kb -> 28.85kb (34.31%) /src/assets/images/dockstore/tag-cloud.svg -- 1.78kb -> 1.29kb (27.81%) /src/assets/images/thirdparty/cavatica.png -- 4.94kb -> 3.77kb (23.8%) /src/assets/images/sponsors/non-coloured/broad1.svg -- 9.28kb -> 7.42kb (20.06%) /src/assets/images/sponsors/non-coloured/ga.svg -- 26.43kb -> 22.88kb (13.43%) /src/assets/svg/Dockstore-logo-horizontal-white.svg -- 4.95kb -> 4.65kb (6.15%) /src/assets/images/sponsors/non-coloured/broad-gray.svg -- 24.78kb -> 23.36kb (5.71%) /src/assets/images/sponsors/non-coloured/oicr.svg -- 20.66kb -> 20.66kb (0.01%) /src/assets/images/sponsors/non-coloured/collaboratory.svg -- 14.27kb -> 14.27kb (0.01%) Signed-off-by: ImgBotApp Co-authored-by: ImgBotApp --- src/assets/images/dockstore/tag-cloud.svg | 24 +- .../sponsors/non-coloured/broad-gray.svg | 372 +------------ .../images/sponsors/non-coloured/broad1.svg | 180 +----- .../sponsors/non-coloured/collaboratory.svg | 2 +- .../images/sponsors/non-coloured/ga.svg | 517 +----------------- .../images/sponsors/non-coloured/oicr.svg | 2 +- .../images/sponsors/non-coloured/ucsc.png | Bin 44971 -> 29543 bytes src/assets/images/thirdparty/cavatica.png | Bin 5062 -> 3857 bytes .../svg/Dockstore-logo-horizontal-white.svg | 63 +-- 9 files changed, 7 insertions(+), 1153 deletions(-) diff --git a/src/assets/images/dockstore/tag-cloud.svg b/src/assets/images/dockstore/tag-cloud.svg index 64677053e5..036d715fa5 100644 --- a/src/assets/images/dockstore/tag-cloud.svg +++ b/src/assets/images/dockstore/tag-cloud.svg @@ -1,23 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/broad-gray.svg b/src/assets/images/sponsors/non-coloured/broad-gray.svg index c1eb4e7510..622f5a634d 100644 --- a/src/assets/images/sponsors/non-coloured/broad-gray.svg +++ b/src/assets/images/sponsors/non-coloured/broad-gray.svg @@ -1,371 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/broad1.svg b/src/assets/images/sponsors/non-coloured/broad1.svg index 51fb5d4e99..13407e6490 100644 --- a/src/assets/images/sponsors/non-coloured/broad1.svg +++ b/src/assets/images/sponsors/non-coloured/broad1.svg @@ -1,179 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/collaboratory.svg b/src/assets/images/sponsors/non-coloured/collaboratory.svg index 6463901646..c3720d6031 100644 --- a/src/assets/images/sponsors/non-coloured/collaboratory.svg +++ b/src/assets/images/sponsors/non-coloured/collaboratory.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/ga.svg b/src/assets/images/sponsors/non-coloured/ga.svg index d58ce29571..9f10aed8bf 100644 --- a/src/assets/images/sponsors/non-coloured/ga.svg +++ b/src/assets/images/sponsors/non-coloured/ga.svg @@ -1,516 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/oicr.svg b/src/assets/images/sponsors/non-coloured/oicr.svg index 98244f790d..0edd4d3a6a 100644 --- a/src/assets/images/sponsors/non-coloured/oicr.svg +++ b/src/assets/images/sponsors/non-coloured/oicr.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/sponsors/non-coloured/ucsc.png b/src/assets/images/sponsors/non-coloured/ucsc.png index 6aa5364c1a01aa9905f60d428a297efbed017fda..1427e7cdff601fc470aea3a6b6c2e4cec01eef99 100644 GIT binary patch literal 29543 zcmdpe`9IWq8@Cp1P9z~&D*HAZDZ7*`GsZ4kV<|#nM$904%PIR{j6t?ysH|Csv9&Q- zr^ap!Wo>9o_880a<#gZoInVPSJo>?l_+HoNTHn|EbA3gdn;ITJcIFrx8{2URSkID; z?I4YfZJ+UxL%?@-%-h?6PX|4&np|aLD^K9qyu}WDea;nZX~M=9EXl_9;4e0|4d7c3 zzO%9U|H;NSdy|b#BaMxX|6V51LJRnhLoQH5J+__Qf6p6VCIjEu=i_I3eIGeD@EIGM zZxTfB>h=4>jK;tbC;hDEoUK`04h-dQOQ@S4s2B{e*0Z>7epMy_&oA@n0VPS+L<7tL zIwy{Ouuu2M3m&6$=O3Ora`eSPT`-v0n7YPH@EBkFHaW7Ep012+4=bHpAvzmnvpPek zk<*>&b@Nui%Ygj<4?jM|MfS*0* zxdUeTcqCIz;B~~7wT*ySsgEAd@rpIkMK7aC)gvZK+gB<550NWjkPqUZB;h%UMp^ow z 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 literal 44971 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 B3nc&m diff --git a/src/assets/images/thirdparty/cavatica.png b/src/assets/images/thirdparty/cavatica.png index be0a9be945e292d0e3bc30c97e7edc93e11845b3..42a138f01b63d87ffa69429bac3592ba485ff37d 100644 GIT binary patch literal 3857 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 literal 5062 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 diff --git a/src/assets/svg/Dockstore-logo-horizontal-white.svg b/src/assets/svg/Dockstore-logo-horizontal-white.svg index ed87190c87..2c6ce1ff05 100644 --- a/src/assets/svg/Dockstore-logo-horizontal-white.svg +++ b/src/assets/svg/Dockstore-logo-horizontal-white.svg @@ -1,62 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file From 643c82afb1fbbf89b7981bec2f6508a917a6cd92 Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 18 Feb 2021 10:59:45 -0500 Subject: [PATCH 030/119] created more data-cy IDs used for footer links (#1157) --- cypress/integration/manualTests/monitor.ts | 4 +++- src/app/footer/footer.component.html | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cypress/integration/manualTests/monitor.ts b/cypress/integration/manualTests/monitor.ts index 683f5482ca..c539f7d5fd 100644 --- a/cypress/integration/manualTests/monitor.ts +++ b/cypress/integration/manualTests/monitor.ts @@ -17,13 +17,15 @@ function checkExternalLink(selector: string, url: string): void { const selectorLinkTuples = [ ['[data-cy=register-button]', '/login'], ['[data-cy=homepage-organizations-button]', '/organizations'], + ['[data-cy=footer-organizations-link]', '/organizations'], ['[data-cy=homepage-search-link]', '/search'], + ['[data-cy=footer-search-link]', '/search'], ]; const externalLinkTuples = [ ['[data-cy=homepage-discuss-link]', 'discuss.dockstore.org'], ['[data-cy=footer-api-link]', '/static/swagger-ui/index.html'], - ['[data-cy=footer-about-link]', '/dockstore-introduction.html'], + ['[data-cy=footer-documentation-link]', '/dockstore-introduction.html'], ]; before(() => { diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 2700c05566..1d760acce5 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -24,18 +24,24 @@
  • - + Explore
  • - + Organizations
  • - + About
    • @@ -43,7 +49,7 @@
  • - + The Team
    • @@ -53,7 +59,6 @@ target="_blank" rel="noopener noreferrer" class="footer-link" - data-cy="footer-about-link" > Roadmap @@ -112,6 +117,7 @@ target="_blank" rel="noopener noreferrer" class="footer-link" + data-cy="footer-documentation-link" > Documentation From 4187f5064a952382ff0e8ae3d305ac231b9b43ae Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Fri, 19 Feb 2021 17:04:39 -0500 Subject: [PATCH 031/119] Feature/4009/copy snackbar (#1158) * snackbar directive added * snackbar displays copied when button clicked --- src/app/app.module.ts | 2 ++ src/app/container/container.component.html | 1 + .../descriptors/descriptors.component.html | 2 +- .../container/info-tab/info-tab.component.html | 4 ++-- .../paramfiles/paramfiles.component.html | 2 +- .../version-modal/version-modal.component.html | 2 +- .../entry-file-tab.component.html | 2 +- src/app/footer/footer.component.html | 2 +- src/app/footer/footer.component.ts | 12 ++---------- .../accounts/external/accounts.component.html | 2 ++ .../downloadcliclient.component.html | 1 + src/app/search/search.component.html | 1 + src/app/search/search.module.ts | 2 ++ .../code-editor-list.component.html | 1 + src/app/shared/entry/entry.module.ts | 2 ++ src/app/shared/modules/container.module.ts | 2 ++ src/app/shared/modules/snackbar.module.ts | 8 ++++++++ src/app/shared/modules/workflow.module.ts | 2 ++ src/app/shared/snackbar.directive.ts | 17 +++++++++++++++++ .../descriptors/descriptors.component.html | 2 +- .../workflow/info-tab/info-tab.component.html | 2 +- .../paramfiles/paramfiles.component.html | 2 +- 22 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 src/app/shared/modules/snackbar.module.ts create mode 100644 src/app/shared/snackbar.directive.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 86a227c100..63c5dd6a93 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -81,6 +81,7 @@ import { ListContainersModule } from './shared/modules/list-containers.module'; import { ListWorkflowsModule } from './shared/modules/list-workflows.module'; import { CustomMaterialModule } from './shared/modules/material.module'; import { OrderByModule } from './shared/modules/orderby.module'; +import { SnackbarModule } from './shared/modules/snackbar.module'; import { ApiModule as ApiModule2 } from './shared/openapi/api.module'; import { GA4GHV20Service } from './shared/openapi/api/gA4GHV20.service'; import { PagenumberService } from './shared/pagenumber.service'; @@ -178,6 +179,7 @@ export function configurationServiceFactory(configurationService: ConfigurationS RequestsModule, HomePageModule, HttpClientModule, + SnackbarModule, ], providers: [ AccountsService, diff --git a/src/app/container/container.component.html b/src/app/container/container.component.html index 9ab0ce3887..507d648d15 100644 --- a/src/app/container/container.component.html +++ b/src/app/container/container.component.html @@ -290,6 +290,7 @@

    Docker Pull Command

    type="button" [cdkCopyToClipboard]="dockerPullCmd" (cbOnSuccess)="toolCopyBtnClick('docker_pull_command')" + appSnackbar > file_copy diff --git a/src/app/container/descriptors/descriptors.component.html b/src/app/container/descriptors/descriptors.component.html index ef23a805ad..c715daa648 100644 --- a/src/app/container/descriptors/descriptors.component.html +++ b/src/app/container/descriptors/descriptors.component.html @@ -80,7 +80,7 @@ save_alt -
    diff --git a/src/app/container/info-tab/info-tab.component.html b/src/app/container/info-tab/info-tab.component.html index e4b80eb36e..d76fa77e02 100644 --- a/src/app/container/info-tab/info-tab.component.html +++ b/src/app/container/info-tab/info-tab.component.html @@ -51,7 +51,7 @@ {{ tool?.tool_path }} - @@ -60,7 +60,7 @@ {{ tool?.tool_path }} - diff --git a/src/app/container/paramfiles/paramfiles.component.html b/src/app/container/paramfiles/paramfiles.component.html index 5859c573bd..f6e9c102c9 100644 --- a/src/app/container/paramfiles/paramfiles.component.html +++ b/src/app/container/paramfiles/paramfiles.component.html @@ -82,7 +82,7 @@ save_alt -
    diff --git a/src/app/container/version-modal/version-modal.component.html b/src/app/container/version-modal/version-modal.component.html index 3e5c7d81e8..37ee40b897 100644 --- a/src/app/container/version-modal/version-modal.component.html +++ b/src/app/container/version-modal/version-modal.component.html @@ -393,7 +393,7 @@

    {{ TagEditorMode[mode] }} Version Tag

    disabled /> - diff --git a/src/app/entry/entry-file-tab/entry-file-tab.component.html b/src/app/entry/entry-file-tab/entry-file-tab.component.html index ba82cb89a4..b6b263cbf4 100644 --- a/src/app/entry/entry-file-tab/entry-file-tab.component.html +++ b/src/app/entry/entry-file-tab/entry-file-tab.component.html @@ -48,7 +48,7 @@ save_alt - diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 1d760acce5..d60785251e 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -101,7 +101,7 @@
  • - diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts index 7bdf9ddcb3..059d2213c9 100644 --- a/src/app/footer/footer.component.ts +++ b/src/app/footer/footer.component.ts @@ -15,7 +15,6 @@ */ import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; -import { MatSnackBar } from '@angular/material/snack-bar'; import { takeUntil } from 'rxjs/operators'; import { MetadataService } from '../metadata/metadata.service'; @@ -29,7 +28,7 @@ import { versions } from './versions'; @Component({ selector: 'app-footer', templateUrl: './footer.component.html', - styleUrls: ['./footer.component.css'] + styleUrls: ['./footer.component.css'], }) export class FooterComponent extends Base implements OnInit { version: string; @@ -58,17 +57,10 @@ export class FooterComponent extends Base implements OnInit { */ private readonly WEBSERVICE_DOWN_STATUS_CODES = [0, 404, 502, 504]; - constructor(private metadataService: MetadataService, private footerService: FooterService, private matSnackBar: MatSnackBar) { + constructor(private metadataService: MetadataService, private footerService: FooterService) { super(); } - openSnackBar() { - this.matSnackBar.open('Copied!', '', { - duration: 500, - panelClass: 'custom_copy_snack_bar', - }); - } - ngOnInit() { this.year = new Date().getFullYear(); this.tag = versions.tag; diff --git a/src/app/loginComponents/accounts/external/accounts.component.html b/src/app/loginComponents/accounts/external/accounts.component.html index 352e64185c..1c418b3f58 100644 --- a/src/app/loginComponents/accounts/external/accounts.component.html +++ b/src/app/loginComponents/accounts/external/accounts.component.html @@ -38,6 +38,7 @@

    Dockstore Account

    [cdkCopyToClipboard]="dockstoreToken" (cbOnSuccess)="isCopied1 = true" matTooltip="Copy Token" + appSnackbar > file_copy @@ -83,6 +84,7 @@

    color="secondary" [cdkCopyToClipboard]="row.source | getTokenContent: tokens" (cbOnSuccess)="isCopied1 = true" + appSnackbar > file_copy diff --git a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.html b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.html index 10be1c331a..4e4c8c60f9 100644 --- a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.html +++ b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.html @@ -27,6 +27,7 @@ type="button" [cdkCopyToClipboard]="inputTarget" (cbOnSuccess)="isCopied2 = true" + appSnackbar > file_copy diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html index 7c2ab10621..a277111973 100644 --- a/src/app/search/search.component.html +++ b/src/app/search/search.component.html @@ -173,6 +173,7 @@ type="button" [cdkCopyToClipboard]="shortUrl$ | async" (cbOnSuccess)="isCopied = true" + appSnackbar > file_copy diff --git a/src/app/search/search.module.ts b/src/app/search/search.module.ts index f9bb09c47a..196d9982d5 100644 --- a/src/app/search/search.module.ts +++ b/src/app/search/search.module.ts @@ -27,6 +27,7 @@ import { TagCloudModule } from 'angular-tag-cloud-module'; import { RefreshAlertModule } from '../shared/alert/alert.module'; import { HeaderModule } from '../shared/modules/header.module'; import { CustomMaterialModule } from '../shared/modules/material.module'; +import { SnackbarModule } from '../shared/modules/snackbar.module'; import { PipeModule } from '../shared/pipe/pipe.module'; import { PrivateIconModule } from '../shared/private-icon/private-icon.module'; import { AdvancedSearchComponent } from './advancedsearch/advancedsearch.component'; @@ -65,6 +66,7 @@ import { SearchService } from './state/search.service'; RefreshAlertModule, FlexLayoutModule, MdePopoverModule, + SnackbarModule, ], providers: [SearchService, QueryBuilderService], exports: [SearchComponent], diff --git a/src/app/shared/code-editor-list/code-editor-list.component.html b/src/app/shared/code-editor-list/code-editor-list.component.html index 39e018d514..d4ca655ac0 100644 --- a/src/app/shared/code-editor-list/code-editor-list.component.html +++ b/src/app/shared/code-editor-list/code-editor-list.component.html @@ -67,6 +67,7 @@ class="mr-2" matTooltip="Copy to clipboard" [cdkCopyToClipboard]="sourcefile?.content" + appSnackbar > file_copy diff --git a/src/app/shared/entry/entry.module.ts b/src/app/shared/entry/entry.module.ts index 598a764829..cddb25e993 100644 --- a/src/app/shared/entry/entry.module.ts +++ b/src/app/shared/entry/entry.module.ts @@ -31,6 +31,7 @@ import { CodeEditorComponent } from '../code-editor/code-editor.component'; import { EntryActionsService } from '../entry-actions/entry-actions.service'; import { PublicFileDownloadPipe } from '../entry/public-file-download.pipe'; import { CustomMaterialModule } from '../modules/material.module'; +import { SnackbarModule } from '../modules/snackbar.module'; import { CommitUrlPipe } from './commit-url.pipe'; import { InfoTabCheckerWorkflowPathComponent } from './info-tab-checker-workflow-path/info-tab-checker-workflow-path.component'; import { LaunchCheckerWorkflowComponent } from './launch-checker-workflow/launch-checker-workflow.component'; @@ -55,6 +56,7 @@ import { VersionProviderUrlPipe } from './versionProviderUrl.pipe'; RouterModule, ReactiveFormsModule, RefreshAlertModule, + SnackbarModule, ], declarations: [ InfoTabCheckerWorkflowPathComponent, diff --git a/src/app/shared/modules/container.module.ts b/src/app/shared/modules/container.module.ts index b2e5543137..df5726d2a8 100644 --- a/src/app/shared/modules/container.module.ts +++ b/src/app/shared/modules/container.module.ts @@ -56,6 +56,7 @@ import { HeaderModule } from './header.module'; import { ListContainersModule } from './list-containers.module'; import { MarkdownWrapperModule } from './markdown-wrapper.module'; import { SelectModule } from './select.module'; +import { SnackbarModule } from './snackbar.module'; @NgModule({ declarations: [ @@ -91,6 +92,7 @@ import { SelectModule } from './select.module'; FlexLayoutModule, MarkdownModule, MarkdownWrapperModule, + SnackbarModule, ], providers: [ EmailService, diff --git a/src/app/shared/modules/snackbar.module.ts b/src/app/shared/modules/snackbar.module.ts new file mode 100644 index 0000000000..f7ccfd82bd --- /dev/null +++ b/src/app/shared/modules/snackbar.module.ts @@ -0,0 +1,8 @@ +import { NgModule } from '@angular/core'; +import { SnackbarDirective } from '../snackbar.directive'; + +@NgModule({ + declarations: [SnackbarDirective], + exports: [SnackbarDirective], +}) +export class SnackbarModule {} diff --git a/src/app/shared/modules/workflow.module.ts b/src/app/shared/modules/workflow.module.ts index 8819953dfa..757bc2181a 100644 --- a/src/app/shared/modules/workflow.module.ts +++ b/src/app/shared/modules/workflow.module.ts @@ -58,6 +58,7 @@ import { EntryModule } from './../entry/entry.module'; import { CustomMaterialModule } from './../modules/material.module'; import { RefreshService } from './../refresh.service'; import { MarkdownWrapperModule } from './markdown-wrapper.module'; +import { SnackbarModule } from './snackbar.module'; @NgModule({ declarations: [ @@ -97,6 +98,7 @@ import { MarkdownWrapperModule } from './markdown-wrapper.module'; MarkdownModule, RefreshAlertModule, MarkdownWrapperModule, + SnackbarModule, ], providers: [ DateService, diff --git a/src/app/shared/snackbar.directive.ts b/src/app/shared/snackbar.directive.ts new file mode 100644 index 0000000000..d3d84468a1 --- /dev/null +++ b/src/app/shared/snackbar.directive.ts @@ -0,0 +1,17 @@ +import { Directive, HostListener } from '@angular/core'; +import { MatSnackBar } from '@angular/material/snack-bar'; + +@Directive({ + selector: '[appSnackbar]', +}) +export class SnackbarDirective { + constructor(private matSnackBar: MatSnackBar) {} + + @HostListener('click') + onClick() { + this.matSnackBar.open('Copied!', '', { + duration: 1000, + panelClass: 'custom_copy_snack_bar', + }); + } +} diff --git a/src/app/workflow/descriptors/descriptors.component.html b/src/app/workflow/descriptors/descriptors.component.html index d9abfc3973..3b8f80e42d 100644 --- a/src/app/workflow/descriptors/descriptors.component.html +++ b/src/app/workflow/descriptors/descriptors.component.html @@ -56,7 +56,7 @@ save_alt -

    • diff --git a/src/app/workflow/info-tab/info-tab.component.html b/src/app/workflow/info-tab/info-tab.component.html index aff61cf010..a43713ad73 100644 --- a/src/app/workflow/info-tab/info-tab.component.html +++ b/src/app/workflow/info-tab/info-tab.component.html @@ -54,7 +54,7 @@
  • TRS: #{{ entryType$ | async }}/{{ workflow?.full_workflow_path }} -
    • diff --git a/src/app/workflow/paramfiles/paramfiles.component.html b/src/app/workflow/paramfiles/paramfiles.component.html index 0b2a84fa68..ce658fb93d 100644 --- a/src/app/workflow/paramfiles/paramfiles.component.html +++ b/src/app/workflow/paramfiles/paramfiles.component.html @@ -64,7 +64,7 @@ save_alt -
    From 45c637356b7db1da6b229f0e042df4706ad3adcd Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Mon, 22 Feb 2021 09:07:42 -0800 Subject: [PATCH 032/119] 4040/launch with nextflow tower (#1156) * launch with nextflow tower dockstore/dockstore#4040 --- src/app/shared/dockstore.model.ts | 1 + .../launch-third-party.component.html | 28 +++++++++++++++++- .../images/thirdparty/nextflow-icon.png | Bin 0 -> 10838 bytes 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/thirdparty/nextflow-icon.png diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index 63b5b59dbc..0fe115dfa5 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -37,6 +37,7 @@ export class Dockstore { static BD_CATALYST_SEVEN_BRIDGES_IMPORT_URL = 'https://sb.biodatacatalyst.nhlbi.nih.gov/integration/trs/import'; static BD_CATALYST_TERRA_IMPORT_URL = 'https://terra.biodatacatalyst.nhlbi.nih.gov/#import-tool/dockstore'; static CAVATICA_IMPORT_URL = 'https://cavatica.sbgenomics.com/integration/trs/import'; + static NEXTFLOW_TOWER_IMPORT_URL = 'https://tower.nf/launch'; static GITHUB_CLIENT_ID = 'will be filled in by configuration.service'; static GITHUB_AUTH_URL = 'https://github.com/login/oauth/authorize'; diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index 4453086842..b685fbb2bf 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -1,4 +1,7 @@ -
    +

    Launch with

    @@ -107,6 +110,29 @@

    Launch with

    > Cavatica
    +
    diff --git a/src/assets/images/thirdparty/nextflow-icon.png b/src/assets/images/thirdparty/nextflow-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c170f328ff6d4da7bee6160c2ec4775faf0db58e GIT binary patch literal 10838 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 BId=d6 literal 0 HcmV?d00001 From b7a996facaf3500a6b35056dc629c0f09bfaf56a Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Mon, 22 Feb 2021 22:26:39 -0500 Subject: [PATCH 033/119] Fix for text search (#1151) * Fix for text search * Don't match substring in non-paths --- src/app/search/query-builder.service.ts | 33 ++++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/app/search/query-builder.service.ts b/src/app/search/query-builder.service.ts index 817b91a9ed..8cdbc16ab0 100644 --- a/src/app/search/query-builder.service.ts +++ b/src/app/search/query-builder.service.ts @@ -179,7 +179,7 @@ export class QueryBuilderService { appendQuery(body: any, values: string, oldAdvancedSearchObject: AdvancedSearchObject, searchTerm: boolean): any { const advancedSearchObject = { ...oldAdvancedSearchObject }; if (values.toString().length > 0) { - this.searchEverything(body, values); + body = this.searchEverything(body, values); } else { body = body.query('match_all', {}); } @@ -198,22 +198,25 @@ export class QueryBuilderService { /** * Appends search-everything filter to the query * Currently searches sourcefiles, description, labels, author, and path - * @param {*} body The original body - * @param {string} searchString the search string - * @memberof QueryBuilderService + * Some requirements: + * 1. Need to be able to match substring (ex. "chicken pot pie" should match "pot") + * 2. Need to be able to handle slashes (ex. "beef/stew" should match "beef/stew") + * Wildcard is used for #1 + * The paths use keyword instead of string because #2 wouldn't work otherwise + * + * @param body Body from the Bodybuilder package which will be mutated + * @param searchString The string entered into the basic search bar by the user */ - searchEverything(body: any, searchString: string): void { - body = body.filter('bool', (filter) => + private searchEverything(body: bodybuilder.Bodybuilder, searchString: string): bodybuilder.Bodybuilder { + return body.filter('bool', (filter) => filter - .orFilter('bool', (workflowVersionsFileContent) => - workflowVersionsFileContent.filter('match_phrase', 'workflowVersions.sourceFiles.content', searchString) - ) - .orFilter('bool', (tagsFileContent) => tagsFileContent.filter('match_phrase', 'tags.sourceFiles.content', searchString)) - .orFilter('bool', (descriptionFilter) => descriptionFilter.filter('match_phrase', 'description', searchString)) - .orFilter('bool', (labelsFilter) => labelsFilter.filter('match_phrase', 'labels', searchString)) - .orFilter('bool', (authorFilter) => authorFilter.filter('match_phrase', 'author', searchString)) - .orFilter('bool', (pathFilter) => pathFilter.filter('match_phrase', 'tool_path', searchString)) - .orFilter('bool', (pathFilter) => pathFilter.filter('match_phrase', 'full_workflow_path', searchString)) + .orFilter('wildcard', { 'full_workflow_path.keyword': { value: '*' + searchString + '*', case_insensitive: true } }) + .orFilter('wildcard', { 'tool_path.keyword': { value: '*' + searchString + '*', case_insensitive: true } }) + .orFilter('match_phrase', 'workflowVersions.sourceFiles.content', searchString) + .orFilter('match_phrase', 'tags.sourceFiles.content', searchString) + .orFilter('match_phrase', 'description', searchString) + .orFilter('match_phrase', 'labels', searchString) + .orFilter('match_phrase', 'author', searchString) ); } From 342b59a3cc742b11bf8134ce5000e0644bacd234 Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Tue, 23 Feb 2021 10:07:25 -0500 Subject: [PATCH 034/119] Feature/organization collection index (#1159) * new icons * reimplementation done without completing the organization header * one column organization members * added cy.wait for integration testing purposes * removed lines from organization.ts due to removing images from organization.component * styles recovered * hide name when screen size is small * param name changed * alt attribute added * get rid of unnecessary subscriptions and outputs * clean up css * maintainer view edit buttons styling update * pipe map observable --- cypress/integration/group2/organizations.ts | 4 - src/app/app.component.css | 4 - .../collection/collection.component.html | 2 +- .../collection/collection.component.scss | 4 + .../collections/collections.component.html | 61 ++++---- .../collections/collections.component.scss | 26 ++++ .../organization-members.component.html | 38 ++--- .../organization-members.component.scss | 30 +++- .../organization/organization.component.html | 141 ++++++++++-------- .../organization/organization.component.scss | 28 +++- .../organization/organization.component.ts | 11 +- .../organizations.component.html | 7 +- src/assets/svg/collections.svg | 21 +++ src/assets/svg/organization.svg | 15 ++ src/styles.css | 8 +- src/styles.scss | 7 +- 16 files changed, 270 insertions(+), 137 deletions(-) create mode 100644 src/assets/svg/collections.svg create mode 100644 src/assets/svg/organization.svg diff --git a/cypress/integration/group2/organizations.ts b/cypress/integration/group2/organizations.ts index a4d9e85b0d..2bd01e353b 100644 --- a/cypress/integration/group2/organizations.ts +++ b/cypress/integration/group2/organizations.ts @@ -75,7 +75,6 @@ describe('Dockstore Organizations', () => { cy.contains('Basement'); cy.contains('asdf@asdf.ca'); cy.contains('No collections found'); - cy.get('.orgLogo').should('have.attr', 'src').should('include', '../../../assets/images/dockstore/PlaceholderLC.png'); }); it('be able to edit an unapproved organization', () => { cy.get('#editOrgInfo').should('be.visible').click(); @@ -113,9 +112,6 @@ describe('Dockstore Organizations', () => { cy.contains('https://www.google.com'); cy.contains('UCSC Basement'); cy.contains('asdf@asdf.com'); - cy.get('.orgLogo') - .should('have.attr', 'src') - .should('include', 'https://www.gravatar.com/avatar/000?d=' + imageURL); }); it('have request shown on homepage', () => { diff --git a/src/app/app.component.css b/src/app/app.component.css index 37d85ce4fa..21aafbf186 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -18,7 +18,3 @@ font-display: swap; src: url('../assets/fonts/Gotham-BookItalic.otf') format('opentype'); } - -* { - font-family: 'Gotham'; -} diff --git a/src/app/organizations/collection/collection.component.html b/src/app/organizations/collection/collection.component.html index 36833482cc..dbcedcd3b2 100644 --- a/src/app/organizations/collection/collection.component.html +++ b/src/app/organizations/collection/collection.component.html @@ -40,7 +40,7 @@
    - +
    diff --git a/src/app/organizations/collection/collection.component.scss b/src/app/organizations/collection/collection.component.scss index e69de29bb2..b3a96ff9e3 100644 --- a/src/app/organizations/collection/collection.component.scss +++ b/src/app/organizations/collection/collection.component.scss @@ -0,0 +1,4 @@ +.orgLogo { + max-height: 150px; + max-width: 200px; +} diff --git a/src/app/organizations/collections/collections.component.html b/src/app/organizations/collections/collections.component.html index c8f732e2a0..d4b221dbc3 100644 --- a/src/app/organizations/collections/collections.component.html +++ b/src/app/organizations/collections/collections.component.html @@ -18,38 +18,41 @@ info No collections found.
    -
    - -
    - diff --git a/src/app/organizations/collections/collections.component.scss b/src/app/organizations/collections/collections.component.scss index 05c0d946ce..bf5e0e2e5b 100644 --- a/src/app/organizations/collections/collections.component.scss +++ b/src/app/organizations/collections/collections.component.scss @@ -1,3 +1,29 @@ .mat-action-row { border: 0; } + +.view-button { + background: #397a84; + color: white; + font-size: 12px; + padding: 0.5rem 1rem; +} + +hr { + margin: 0.5rem 0; + border: 1px solid #dfe0e2; +} + +.mat-card-title, +.mat-card-subtitle, +h4 { + color: #151c3d; +} + +.mat-card-title { + font-size: 1.7rem; +} + +.mat-card-subtitle { + font-size: 1.4rem; +} diff --git a/src/app/organizations/organization-members/organization-members.component.html b/src/app/organizations/organization-members/organization-members.component.html index 82cd018faa..f6be1ba369 100644 --- a/src/app/organizations/organization-members/organization-members.component.html +++ b/src/app/organizations/organization-members/organization-members.component.html @@ -14,26 +14,28 @@ limitations under the License. --> -
    +
    - -
    -
    - - - - {{ organizationUser.user?.username }} - {{ organizationUser.role | titlecase }} - - ORCID + +
    +
    + + +
    +
    +
    {{ organizationUser.user?.username }}
    + {{ organizationUser.role | titlecase }} +
    + +
    ORCID
    {{ organizationUser.user?.orcid }} - - +     +
    diff --git a/src/app/organizations/organization-members/organization-members.component.scss b/src/app/organizations/organization-members/organization-members.component.scss index 19d59769b5..47202549bb 100644 --- a/src/app/organizations/organization-members/organization-members.component.scss +++ b/src/app/organizations/organization-members/organization-members.component.scss @@ -3,8 +3,13 @@ } .mat-card-avatar { - height: 90px !important; - width: 90px !important; + height: 50px !important; + width: 50px !important; +} + +.orcid { + font-size: 12px; + line-height: none; } .mat-action-row { @@ -16,3 +21,24 @@ width: 1.4rem; vertical-align: sub; } + +.mat-standard-chip { + font-size: 1.1rem; + border-radius: 1rem; + padding: none; +} + +a { + text-decoration: underline; +} + +.role-display { + background: #e0e0e0; + border-radius: 1rem; + padding: 0.5rem 0.7rem; + font-size: 1.3rem; +} + +* { + color: #151c3d; +} diff --git a/src/app/organizations/organization/organization.component.html b/src/app/organizations/organization/organization.component.html index 24a8128d36..0b3fcf4344 100644 --- a/src/app/organizations/organization/organization.component.html +++ b/src/app/organizations/organization/organization.component.html @@ -14,8 +14,14 @@ limitations under the License. --> - people - Organizations +
    +
    + organization icon + Organizations + / + {{ (organization$ | async)?.displayName }} +
    +
    Organization not found
    @@ -24,7 +30,7 @@

    {{ org.displayName }}

    -
    +
    {{ org.displayName }} accounts page. - -
    -
    - +
    +
    +
    +
    +

    {{ org.displayName }}

    + {{ org.topic }} +
    -
    - - -

    {{ org.displayName }}

    -     - - {{ org.topic }} - -     +
    +
    - -
    - - email - {{ org.email }} - - - link - {{ org?.link }} - - - location_on - {{ org.location }} - -
    - -
    - +
    -
    +
    - + + +
    + collections icon + Collections + {{ collectionsLength$ | async }} +
    +     - + + +
    + people + Members + {{ (organizationMembersQuery.sortedOrganizationMembers$ | async).length }} +
    +     - + + +
    + update + Updates + {{ (eventsQuery.organizationEvents$ | async).length }} +
    +
    - -
    -
    -
    Select edit to add a markdown description
    -
    This organization does not have a description
    +
    +
    +

    About the Organization

    +
    +
    +
    Select edit to add a markdown description
    +
    This organization does not have a description
    +
    +
    - +
    +
    + + link + {{ org?.link }} + + + location_on + {{ org.location }} +
    - +
    diff --git a/src/app/organizations/organization/organization.component.scss b/src/app/organizations/organization/organization.component.scss index b3a96ff9e3..a593007ffa 100644 --- a/src/app/organizations/organization/organization.component.scss +++ b/src/app/organizations/organization/organization.component.scss @@ -1,4 +1,26 @@ -.orgLogo { - max-height: 150px; - max-width: 200px; +.side-icons { + color: #397a84; +} + +.mat-tab-group { + color: #3f51b5; +} + +.tab-icons { + color: #7887cb; +} + +.tab-display { + border-radius: 0.5rem; + padding: 0.5rem; + font-size: 1.3rem; + background-color: #e0e0e0; +} + +.category-text { + text-decoration: underline; +} + +.name { + color: #151c3d; } diff --git a/src/app/organizations/organization/organization.component.ts b/src/app/organizations/organization/organization.component.ts index eb07ad6101..38b8bb56c6 100644 --- a/src/app/organizations/organization/organization.component.ts +++ b/src/app/organizations/organization/organization.component.ts @@ -28,6 +28,10 @@ import { OrganizationService } from '../state/organization.service'; // tslint:disable-next-line: max-line-length import { UpdateOrganizationOrCollectionDescriptionComponent } from './update-organization-description/update-organization-description.component'; +import { CollectionsQuery } from '../state/collections.query'; +import { EventsQuery } from '../state/events.query'; +import { OrganizationMembersQuery } from '../state/organization-members.query'; + @Component({ selector: 'organization', templateUrl: './organization.component.html', @@ -35,6 +39,7 @@ import { UpdateOrganizationOrCollectionDescriptionComponent } from './update-org }) export class OrganizationComponent implements OnInit { public organizationStarGazersClicked = false; + collectionsLength$: Observable; organization$: Observable; loading$: Observable; @@ -51,7 +56,10 @@ export class OrganizationComponent implements OnInit { private orgschemaService: OrgSchemaService, private matDialog: MatDialog, private activatedRoute: ActivatedRoute, - private userQuery: UserQuery + private userQuery: UserQuery, + public organizationMembersQuery: OrganizationMembersQuery, + public collectionsQuery: CollectionsQuery, + public eventsQuery: EventsQuery ) {} ngOnInit() { @@ -64,6 +72,7 @@ export class OrganizationComponent implements OnInit { this.isAdmin$ = this.userQuery.isAdmin$; this.isCurator$ = this.userQuery.isCurator$; this.schema$ = this.organization$.pipe(map((organization) => this.orgschemaService.getSchema(organization))); + this.collectionsLength$ = this.collectionsQuery.collections$.pipe(map((collections) => Object.keys(collections).length)); } /** diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index 8db325752e..cf0e95ed2a 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -14,8 +14,10 @@ limitations under the License. --> - people - Organizations +
    + organization icon + Organizations +
    +
    + + info This collection has no associated entries. To add an entry, navigate to the public page of the tool or + workflow you want to add and select `Add to collection` - -
    +
    - - info This collection has no associated entries. To add an entry, navigate to the public page of the tool or - workflow you want to add and select `Add to collection` - -
    +

    Workflows & Tools

    - - - -

    - + + +
    +
    + workflow icon + tool icon +
    {{ entry.entryPath + (entry.versionName ? ':' + entry.versionName : '') }} - -
    - - Last updated {{ entry.dbUpdateDate | date }} - - - - - - +

    +
    +
    + + + +
    +
    + +
    +
    + Last updated {{ entry.dbUpdateDate | date }} + + + +
    - -
    +
    +
    +
    +

    About the Collection

    + +
    Select edit to add a markdown description
    This collection does not have a description
    -
    - +
    diff --git a/src/app/organizations/collection/collection.component.scss b/src/app/organizations/collection/collection.component.scss index b3a96ff9e3..51a5381b80 100644 --- a/src/app/organizations/collection/collection.component.scss +++ b/src/app/organizations/collection/collection.component.scss @@ -1,4 +1,36 @@ .orgLogo { - max-height: 150px; + max-height: 100px; max-width: 200px; } + +.view-button { + background: #397a84; + color: white; + font-size: 12px; + padding: 0.5rem 1rem; +} + +hr { + margin: 0.5rem 0; + border: 1px solid #dfe0e2; +} + +.h5:hover { + text-decoration: underline; +} + +.mat-card-title { + font-size: 1.7rem; +} + +.update-time { + font-size: 12px; +} + +.collection-name { + color: #3f51b5; +} + +.org-name { + color: #151c3d; +} diff --git a/src/app/organizations/organization/organization.component.html b/src/app/organizations/organization/organization.component.html index 0b3fcf4344..76a8f30a5f 100644 --- a/src/app/organizations/organization/organization.component.html +++ b/src/app/organizations/organization/organization.component.html @@ -84,8 +84,7 @@

    {{ org.displayName }}

    >
    - -
    + diff --git a/src/assets/svg/tool.svg b/src/assets/svg/tool.svg new file mode 100644 index 0000000000..93781d45d0 --- /dev/null +++ b/src/assets/svg/tool.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/svg/workflow.svg b/src/assets/svg/workflow.svg new file mode 100644 index 0000000000..4d36eea942 --- /dev/null +++ b/src/assets/svg/workflow.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/styles.scss b/src/styles.scss index 35ac6c8d9d..3319c8f8bb 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -749,7 +749,7 @@ code { h5, .h5 { font-size: 16px; - color: #21335b; + color: #151c3d; font-weight: normal; } From cc24dfc2e366cb639141fcbef44383ed6d3b425b Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:56:10 -0500 Subject: [PATCH 037/119] Feature/4051/UI bugs (#1162) * word break and fxflex adjusted * preview tag styling adjusted * responsive styling of add button * word break --- src/app/container/container.component.html | 1 + .../current-collections.component.html | 4 +++- .../search-workflow-table.component.html | 8 +++++--- src/app/workflow/workflow.component.html | 1 + src/ds-style-fix.scss | 5 ++++- src/styles.scss | 1 + 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/app/container/container.component.html b/src/app/container/container.component.html index 507d648d15..60e5dba1d9 100644 --- a/src/app/container/container.component.html +++ b/src/app/container/container.component.html @@ -266,6 +266,7 @@

    Recent Versions

    {{ sortedVersion.name }} {{ sortedVersion.last_built | date }} diff --git a/src/app/entry/current-collections/current-collections.component.html b/src/app/entry/current-collections/current-collections.component.html index 6e175760a2..35ae7b4649 100644 --- a/src/app/entry/current-collections/current-collections.component.html +++ b/src/app/entry/current-collections/current-collections.component.html @@ -39,7 +39,9 @@

    Collections

    (click)="addEntryToCollection()" id="addToolToCollectionButton" > - addAdd to my collection + add + Add to my collection + Add to mine
    diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.html b/src/app/search/search-workflow-table/search-workflow-table.component.html index 0959247d3f..2e4297e6a4 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.html +++ b/src/app/search/search-workflow-table/search-workflow-table.component.html @@ -33,8 +33,10 @@ {{ workflow?.author || 'n/a' }} - Format - + Format +
    {{ workflow?.descriptorType | uppercase }}
    @@ -42,7 +44,7 @@     Project Links - + diff --git a/src/app/workflow/workflow.component.html b/src/app/workflow/workflow.component.html index 2a195fe796..5e6dafb27c 100644 --- a/src/app/workflow/workflow.component.html +++ b/src/app/workflow/workflow.component.html @@ -395,6 +395,7 @@

    Recent Versions

    {{ sortedVersion.name }} {{ sortedVersion.last_modified | date }} diff --git a/src/ds-style-fix.scss b/src/ds-style-fix.scss index 253cdd02cf..a20be580b9 100644 --- a/src/ds-style-fix.scss +++ b/src/ds-style-fix.scss @@ -295,7 +295,6 @@ div.panel-container-label.selected { clear: both; overflow: hidden; white-space: nowrap; - overflow: hidden; text-overflow: ellipsis; span { font-size: 14px; @@ -735,6 +734,10 @@ div.modal form { padding-bottom: 2px; } +.panel-body-anchor { + word-break: break-word; +} + .funding-img { position: absolute; transform: translate(-50%, -50%); diff --git a/src/styles.scss b/src/styles.scss index 3319c8f8bb..fe8c2c7be7 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -52,6 +52,7 @@ $material-design-icons-font-directory-path: '~material-design-icons-iconfont/dis text-align: center; text-transform: uppercase; font-size: 1rem; + padding: 0 0.5rem; } /* General Layout */ From 0b85de369e3f821de7768d6f9b836e4060c1f724 Mon Sep 17 00:00:00 2001 From: Richard-Hansen <36607471+Richard-Hansen@users.noreply.github.com> Date: Fri, 26 Feb 2021 18:04:42 -0500 Subject: [PATCH 038/119] Feature/3729/multiple account error messages (#1163) Auth 409 errors link to documentation on snackbar. dockstore/dockstore#3729 --- src/app/loginComponents/auth/auth.component.ts | 10 +++++++++- src/app/shared/alert/state/alert.service.ts | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/app/loginComponents/auth/auth.component.ts b/src/app/loginComponents/auth/auth.component.ts index edd7cabb97..12a38654d2 100644 --- a/src/app/loginComponents/auth/auth.component.ts +++ b/src/app/loginComponents/auth/auth.component.ts @@ -88,7 +88,15 @@ export class AuthComponent extends Base implements OnInit { }, (error) => { this.router.navigate([`${prevPage}`]); - this.alertService.detailedSnackBarError(error); + if (error.status === 409) { + this.alertService.detailedSnackBarErrorWithLink( + error, + 'Docs', + 'https://docs.dockstore.org/en/latest/faq.html#what-is-the-difference-between-logging-in-with-github-or-logging-in-with-google' + ); + } else { + this.alertService.detailedSnackBarError(error); + } } ); } diff --git a/src/app/shared/alert/state/alert.service.ts b/src/app/shared/alert/state/alert.service.ts index 41622f0cb8..9cef7af8f0 100644 --- a/src/app/shared/alert/state/alert.service.ts +++ b/src/app/shared/alert/state/alert.service.ts @@ -111,6 +111,24 @@ export class AlertService { this.matSnackBar.open(detailedError); } + /** + * + * Handles HTTP error responses that shows a detailed message in the matSnackBar and provides and action button + * that links to an external site (such as the documentation) + * + * @param error {HttpErrorResponse} error The HttpErrorResponse return by the failed Http call + * @param actionButtonText {string} The text of the action button + * @param link {link} The link that will open in a new tab + */ + public detailedSnackBarErrorWithLink(error: HttpErrorResponse, actionButtonText: string, link: string) { + this.clearEverything(); + const detailedError: string = AlertService.getDetailedErrorMessage(error); + this.matSnackBar + .open(detailedError, actionButtonText, { duration: 10000 }) + .onAction() + .subscribe(() => window.open(link, '_blank')); + } + /** * Handles error HTTP response and show matSnackBar * From 22372a6f5d025862ea51cab9c41ccf74986eb4f9 Mon Sep 17 00:00:00 2001 From: Nina Zhao <50606789+nrzhao4@users.noreply.github.com> Date: Wed, 3 Mar 2021 13:39:35 -0500 Subject: [PATCH 039/119] Feature/2073/seperate tools and workflows tab (#1127) * separate tab and facet functionality * moved tab group to search.component * tabs moved above table * added import to test * remove unused observables * linting * lint imports * lint * click tools tab in cypress test * flaky cypress test * There is only one query size * Fix * Random fixes * Remove all traces of _index as a facet * Remove a comment * Fix linking + add extra comments * Adjust test * Fix lgtm Co-authored-by: Gary Luu --- .../immutableDatabaseTests/elasticsearch.ts | 2 +- .../immutableDatabaseTests/searchTable.ts | 2 +- src/app/search/query-builder.service.ts | 8 +- .../search-results.component.html | 124 ++++++++---------- .../search-results.component.scss | 8 +- .../search-results.component.ts | 12 +- .../search-workflow-table.component.scss | 4 + src/app/search/search.component.html | 23 ++++ src/app/search/search.component.scss | 8 ++ src/app/search/search.component.spec.ts | 3 +- src/app/search/search.component.ts | 82 +++++++----- src/app/search/state/search.query.ts | 30 ----- src/app/search/state/search.service.ts | 26 ++-- src/assets/images/dockstore/tool.svg | 9 ++ src/assets/images/dockstore/workflow.svg | 9 ++ 15 files changed, 187 insertions(+), 163 deletions(-) create mode 100644 src/assets/images/dockstore/tool.svg create mode 100644 src/assets/images/dockstore/workflow.svg diff --git a/cypress/integration/immutableDatabaseTests/elasticsearch.ts b/cypress/integration/immutableDatabaseTests/elasticsearch.ts index daecd34e8d..d4c36d8d59 100644 --- a/cypress/integration/immutableDatabaseTests/elasticsearch.ts +++ b/cypress/integration/immutableDatabaseTests/elasticsearch.ts @@ -18,6 +18,6 @@ describe('elasticsearch from logged-out homepage', () => { it('Should be able to search entries for using text', () => { cy.visit('/'); cy.get('#searchBar').should('have.attr', 'placeholder', 'Search...').type('asdf{enter}'); - cy.url().should('eq', Cypress.config().baseUrl + '/search?search=asdf'); + cy.url().should('eq', Cypress.config().baseUrl + '/search?entryType=workflows&search=asdf'); }); }); diff --git a/cypress/integration/immutableDatabaseTests/searchTable.ts b/cypress/integration/immutableDatabaseTests/searchTable.ts index 2d74f5d16b..47603706af 100644 --- a/cypress/integration/immutableDatabaseTests/searchTable.ts +++ b/cypress/integration/immutableDatabaseTests/searchTable.ts @@ -394,7 +394,7 @@ describe('search table items per page', () => { cy.visit('/search'); cy.get('#mat-select-0 ').click(); cy.get('#mat-option-1 ').click(); - cy.contains('a', 'garyluu/dockstore-cgpmap/cgpmap-cramOut').click(); + cy.contains('A/l').click(); cy.get('.flex-toolbar ').contains(' Search ').click(); cy.get('.mat-select-value-text ').contains('20'); }); diff --git a/src/app/search/query-builder.service.ts b/src/app/search/query-builder.service.ts index 8cdbc16ab0..4a779d7a20 100644 --- a/src/app/search/query-builder.service.ts +++ b/src/app/search/query-builder.service.ts @@ -49,11 +49,13 @@ export class QueryBuilderService { searchTerm: boolean, bucketStubs: any, filters: any, - sortModeMap: any + sortModeMap: any, + index: 'workflows' | 'tools' ): string { const count = this.getNumberOfFilters(filters); let sidebarBody = bodybuilder().size(query_size); sidebarBody = this.excludeContent(sidebarBody); + sidebarBody = sidebarBody.query('match', '_index', index); sidebarBody = this.appendQuery(sidebarBody, values, advancedSearchObject, searchTerm); sidebarBody = this.appendAggregations(count, sidebarBody, bucketStubs, filters, sortModeMap); const builtSideBarBody = sidebarBody.build(); @@ -98,10 +100,12 @@ export class QueryBuilderService { values: string, advancedSearchObject: AdvancedSearchObject, searchTerm: boolean, - filters: any + filters: any, + index: 'tools' | 'workflows' ): string { let tableBody = bodybuilder().size(query_size); tableBody = this.sourceOptions(tableBody); + tableBody = tableBody.query('match', '_index', index); tableBody = this.appendQuery(tableBody, values, advancedSearchObject, searchTerm); tableBody = this.appendFilter(tableBody, null, filters); const builtTableBody = tableBody.build(); diff --git a/src/app/search/search-results/search-results.component.html b/src/app/search/search-results/search-results.component.html index 5069a48d48..e41a36c01c 100644 --- a/src/app/search/search-results/search-results.component.html +++ b/src/app/search/search-results/search-results.component.html @@ -13,86 +13,70 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - - Tools - -
    -
    -
    - -

    A Tool uses a single container and performs a single action or step that is outlined by a descriptor

    -     -
    - -
    - - +
    + +
    + +
    -
    - + +
    +
    - - - - Workflows - -
    -
    -
    - -

    A Workflow can use multiple containers and executes multiple actions or steps, outlined by one or more descriptors

    -     -
    - -
    - - +
    + +
    + +
    -
    - - + +
    +
    diff --git a/src/app/search/search-results/search-results.component.scss b/src/app/search/search-results/search-results.component.scss index 21709cdc23..685481b83b 100644 --- a/src/app/search/search-results/search-results.component.scss +++ b/src/app/search/search-results/search-results.component.scss @@ -14,17 +14,13 @@ * limitations under the License. */ -mat-tab-group.homeComponent { - border: 0.0625rem solid #cfd1d7; - border-bottom-right-radius: 1rem; - border-bottom-left-radius: 1rem; -} - .mat-tab-content { display: block; background-color: #fff; margin: 1rem 1rem 2rem; padding: 0.8rem; + border: 0.0625rem solid #cfd1d7; + border-radius: 0.3rem; } .tag-cloud-dropdown { diff --git a/src/app/search/search-results/search-results.component.ts b/src/app/search/search-results/search-results.component.ts index de9b760725..d6827b8d9d 100644 --- a/src/app/search/search-results/search-results.component.ts +++ b/src/app/search/search-results/search-results.component.ts @@ -17,7 +17,6 @@ import { Component, OnInit } from '@angular/core'; import { CloudData, CloudOptions } from 'angular-tag-cloud-module'; import { ExtendedGA4GHService } from 'app/shared/openapi'; import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; import { Base } from '../../shared/base'; import { QueryBuilderService } from '../query-builder.service'; import { SearchQuery } from '../state/search.query'; @@ -29,7 +28,6 @@ import { SearchService } from '../state/search.service'; styleUrls: ['./search-results.component.scss'], }) export class SearchResultsComponent extends Base implements OnInit { - public activeToolTab$: Observable; public noToolHits$: Observable; public noWorkflowHits$: Observable; public showWorkflowTagCloud$: Observable; @@ -50,7 +48,6 @@ export class SearchResultsComponent extends Base implements OnInit { private extendedGA4GHService: ExtendedGA4GHService ) { super(); - this.activeToolTab$ = this.searchQuery.activeToolTab$; this.noWorkflowHits$ = this.searchQuery.noWorkflowHits$; this.noToolHits$ = this.searchQuery.noToolHits$; this.showToolTagCloud$ = this.searchQuery.showToolTagCloud$; @@ -60,11 +57,6 @@ export class SearchResultsComponent extends Base implements OnInit { ngOnInit() { this.createTagCloud('tool'); this.createTagCloud('workflow'); - this.selectedIndex$ = this.searchQuery.activeToolTab$.pipe( - map((activeToolTab) => { - return { active: activeToolTab }; - }) - ); } createTagCloud(type: string) { @@ -120,8 +112,8 @@ export class SearchResultsComponent extends Base implements OnInit { this.searchService.toSaveSearch$.next(true); } - saveTabIndex(tab) { - this.searchService.saveCurrentTab(tab.index); + getTabIndex() { + return this.searchQuery.getValue().currentTabIndex; } tagClicked(clicked: CloudData) { diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.scss b/src/app/search/search-workflow-table/search-workflow-table.component.scss index fb5f87965e..07c416269d 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.scss +++ b/src/app/search/search-workflow-table/search-workflow-table.component.scss @@ -10,3 +10,7 @@ .mat-column-projectLinks { max-width: 105px; } + +td.mat-cell { + border-bottom-style: none; +} diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html index a277111973..531597424f 100644 --- a/src/app/search/search.component.html +++ b/src/app/search/search.component.html @@ -18,6 +18,29 @@ search Search + + + + + Workflows + +
    +     + + + + Tools + +
    +     +     +
    diff --git a/src/app/search/search.component.scss b/src/app/search/search.component.scss index c16c5f9f93..a205d7f9fb 100644 --- a/src/app/search/search.component.scss +++ b/src/app/search/search.component.scss @@ -14,6 +14,14 @@ * limitations under the License. */ +mat-tab-group.homeComponent { + margin: 0.5rem 5rem; +} + +::ng-deep .mat-tab-list .mat-tab-labels .mat-tab-label-active { + color: #151c3d; +} + .sidebar { position: fixed; top: 0; diff --git a/src/app/search/search.component.spec.ts b/src/app/search/search.component.spec.ts index c1ca568f87..48c0495311 100644 --- a/src/app/search/search.component.spec.ts +++ b/src/app/search/search.component.spec.ts @@ -16,6 +16,7 @@ import { ClipboardModule } from '@angular/cdk/clipboard'; import { Component } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { MdePopoverModule } from '@material-extended/mde'; @@ -59,7 +60,7 @@ describe('SearchComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [SearchComponent, MapFriendlyValuesPipe, HeaderComponent, BasicSearchComponent, SearchResultsComponent], - imports: [CustomMaterialModule, ClipboardModule, FontAwesomeModule, RouterTestingModule, MdePopoverModule], + imports: [BrowserAnimationsModule, CustomMaterialModule, ClipboardModule, FontAwesomeModule, RouterTestingModule, MdePopoverModule], providers: [ { provide: SearchService, useClass: SearchStubService }, { provide: QueryBuilderService, useClass: QueryBuilderStubService }, diff --git a/src/app/search/search.component.ts b/src/app/search/search.component.ts index 71f37a4cce..ca4dd21c27 100644 --- a/src/app/search/search.component.ts +++ b/src/app/search/search.component.ts @@ -31,12 +31,24 @@ import { SearchQuery } from './state/search.query'; import { Hit, SearchService } from './state/search.service'; /** - * There are a total of 5 calls per search. - * 2 calls are from the tag cloud (1 for tool, 1 for workflow) - * 1 calls are for the sidebar bucket count - * 1 call for the autocomplete - * 1 call for the actual results * + * In general, the search works like this: + * There's the "view" which is what the user clicks which includes facet checkboxes and tab (tools/workflows), etc + * This causes some weird combination of the URL and/or Akita store and/or Angular global service to update + * The URL change causes the URL to be parsed again which sets the state once more before triggering a new set of ES query + * + * Additional notes: + * The URL is gospel so that that users with links will always work. + * The only time the ES queries are performed is after the URL is parsed + * + * Some manual tests: + * 1. Go to the home page and then click search and make sure there's 5 calls (2 tag cloud, 1 sidebar, 1 autocomplete, 1 table results) + * 2. Switch to a different tab and there should be 2 calls (1 for sidebar, 1 for table results). + * 3. Refresh page, should be 5 calls in total (same as 1.) + * + * TODO: + * Test #1 from above currently fails because this.advancedSearchQuery.advancedSearch$ and this.searchQuery.searchText$ subscriptions + * each triggers a parseParam which then causes the 2 more ES queries to get triggered * @export * @class SearchComponent * @implements {OnInit} @@ -61,6 +73,7 @@ export class SearchComponent implements OnInit, OnDestroy { public aNDNoSplitFilterText$: Observable; public oRFilterText$: Observable; public nOTFilterText$: Observable; + public selectedIndex$: Observable; /** current set of search results * TODO: this stores all results, but the real implementation should limit results * and paginate to be scalable @@ -69,10 +82,8 @@ export class SearchComponent implements OnInit, OnDestroy { private setFilter = false; public hits: Hit[]; - // Possibly 100 workflows and 100 tools (extra +1 is used to see if there are > 200 results) - // Set to 201 if searching both queries - public readonly query_size = 101; - public readonly query_size_full = 201; + // extra +1 is used to see if there are > 200 results + public readonly query_size = 201; searchTerm = false; /** a map from a field (like _type or author) in elastic search to specific values for that field (tool, workflow) and how many @@ -129,6 +140,7 @@ export class SearchComponent implements OnInit, OnDestroy { this.shortUrl$ = this.searchQuery.shortUrl$; this.filterKeys$ = this.searchQuery.filterKeys$; this.suggestTerm$ = this.searchQuery.suggestTerm$; + this.selectedIndex$ = this.searchQuery.savedTabIndex$; // Initialize mappings this.bucketStubs = this.searchService.initializeCommonBucketStubs(); this.friendlyNames = this.searchService.initializeFriendlyNames(); @@ -150,7 +162,7 @@ export class SearchComponent implements OnInit, OnDestroy { this.hasAdvancedSearchText$ = this.advancedSearchQuery.hasAdvancedSearchText$; this.values$ = this.searchQuery.searchText$; this.basicSearchText$ = this.searchQuery.basicSearchText$; - this.activatedRoute.queryParams.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => this.parseParams()); + this.activatedRoute.queryParams.pipe(distinctUntilChanged(), takeUntil(this.ngUnsubscribe)).subscribe(() => this.parseParams()); this.searchService.toSaveSearch$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((toSaveSearch) => { if (toSaveSearch) { this.saveSearchFilter(); @@ -179,6 +191,11 @@ export class SearchComponent implements OnInit, OnDestroy { this.hasFacetAutoCompleteTerms$ = this.searchQuery.hasFacetAutoCompleteTerms$; } + saveTabIndex(tab) { + this.searchService.saveCurrentTab(tab.index); + this.updatePermalink(); + } + /** * Applies parameters from the permalink to the search */ @@ -202,6 +219,8 @@ export class SearchComponent implements OnInit, OnDestroy { categoryValue = decodeURIComponent(categoryValue); newFilters = this.searchService.updateFiltersFromParameter(key, categoryValue, newFilters); }); + } else if (key === 'entryType') { + this.searchService.saveCurrentTab(SearchService.convertEntryTypeToTabIndex(value[0])); } else if (key === 'search') { this.searchTerm = true; this.searchService.setSearchText(value[0]); @@ -275,6 +294,7 @@ export class SearchComponent implements OnInit, OnDestroy { setupOrderBuckets() { this.entryOrder.forEach((value, key) => { if (value.Items.size > 0 || value.SelectedItems.size > 0) { + // skip the Entry Type bucket, which is only aggregated for filtering results between tabs this.orderedBuckets.set(key, value); } }); @@ -343,6 +363,7 @@ export class SearchComponent implements OnInit, OnDestroy { searchValues: values, advancedSearchObject: advancedSearchObject, searchTerm: this.searchTerm, + entryType: SearchService.convertTabIndexToEntryType(this.searchQuery.getValue().currentTabIndex), }; const linkArray = this.searchService.createPermalinks(searchInfo); this.searchService.handleLink(linkArray); @@ -353,40 +374,35 @@ export class SearchComponent implements OnInit, OnDestroy { * =============================================== */ - // Called when any change to the search is made to update the results + // Called from one place which is only when the URL has parsed and query non-result state has been set updateQuery() { + const tabIndex = SearchService.convertTabIndexToEntryType(this.searchQuery.getValue().currentTabIndex); // Separating into 2 queries otherwise the queries interfere with each other (filter applied before aggregation) // The first query handles the aggregation and is used to update the sidebar buckets // The second query updates the result table const advancedSearchObject = this.advancedSearchQuery.getValue().advancedSearch; const values = this.advancedSearchQuery.getValue().searchText; const sideBarQuery = this.queryBuilderService.getSidebarQuery( - this.query_size_full, + this.query_size, values, advancedSearchObject, this.searchTerm, this.bucketStubs, this.filters, - this.sortModeMap + this.sortModeMap, + tabIndex ); - if (!values && this.filters.size === 0) { - const toolsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'tools'); - const workflowsQuery = this.queryBuilderService.getResultSingleIndexQuery(this.query_size, 'workflows'); - this.resetEntryOrder(); - this.updateSideBar(sideBarQuery); - this.updateResultsTableSeparately(toolsQuery, workflowsQuery); - } else { - const tableQuery = this.queryBuilderService.getResultQuery( - this.query_size_full, - values, - advancedSearchObject, - this.searchTerm, - this.filters - ); - this.resetEntryOrder(); - this.updateSideBar(sideBarQuery); - this.updateResultsTable(tableQuery); - } + const tableQuery = this.queryBuilderService.getResultQuery( + this.query_size, + values, + advancedSearchObject, + this.searchTerm, + this.filters, + tabIndex + ); + this.resetEntryOrder(); + this.updateSideBar(sideBarQuery); + this.updateResultsTable(tableQuery); } updateSideBar(value: string) { @@ -411,7 +427,7 @@ export class SearchComponent implements OnInit, OnDestroy { this.extendedGA4GHService.toolsIndexSearch(value).subscribe( (hits: any) => { this.hits = hits.hits.hits; - const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); + const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size); const searchText = this.searchQuery.getValue().searchText; this.searchService.setHits(filteredHits[0], filteredHits[1]); if (searchText.length > 0 && hits) { @@ -441,7 +457,7 @@ export class SearchComponent implements OnInit, OnDestroy { const toolHits = results[0].hits.hits; const workflowHits = results[1].hits.hits; this.hits = toolHits.concat(workflowHits); - const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size_full); + const filteredHits: [Array, Array] = this.searchService.filterEntry(this.hits, this.query_size); this.searchService.setHits(filteredHits[0], filteredHits[1]); }); } diff --git a/src/app/search/state/search.query.ts b/src/app/search/state/search.query.ts index fc5d001edc..ca7597da07 100644 --- a/src/app/search/state/search.query.ts +++ b/src/app/search/state/search.query.ts @@ -22,9 +22,6 @@ export class SearchQuery extends Query { ) ); public savedTabIndex$: Observable = this.select((state) => state.currentTabIndex); - public activeToolTab$: Observable = combineLatest([this.tools$, this.workflows$]).pipe( - map(([tools, workflows]) => this.setTabActive(tools, workflows)) - ); public noToolHits$: Observable = this.tools$.pipe(map((tools: Array) => this.haveNoHits(tools))); public noWorkflowHits$: Observable = this.workflows$.pipe(map((workflows: Array) => this.haveNoHits(workflows))); public searchText$: Observable = this.select((state) => state.searchText); @@ -53,33 +50,6 @@ export class SearchQuery extends Query { super(store); } - /** - * This handles the which tab (tool or workflow) is set to active based on hits. - * The default is tool if both have hits - * - * @memberof SearchResultsComponent - */ - private readonly TOOLS_TAB_INDEX = 0; - private readonly WORKFLOWS_TAB_INDEX = 1; - setTabActive(tools: Array, workflows: Array): number { - if (!tools || !workflows) { - return this.TOOLS_TAB_INDEX; - } - const param = this.route.snapshot.queryParams['_index']; - - if (tools.length === 0 && workflows.length > 0) { - return this.WORKFLOWS_TAB_INDEX; - } else if (workflows.length === 0 && tools.length > 0) { - return this.TOOLS_TAB_INDEX; - } else if (workflows.length === 0 && param === 'workflow') { - return this.WORKFLOWS_TAB_INDEX; - } else if (workflows.length > 0 && tools.length > 0) { - return this.getValue().currentTabIndex; - } else { - return this.TOOLS_TAB_INDEX; - } - } - haveNoHits(object: Array): boolean { return !object || object.length === 0; } diff --git a/src/app/search/state/search.service.ts b/src/app/search/state/search.service.ts index d2d0dde8d4..d861c762f8 100644 --- a/src/app/search/state/search.service.ts +++ b/src/app/search/state/search.service.ts @@ -57,6 +57,8 @@ export enum SearchFields { @Injectable() export class SearchService { + private static readonly WORKFLOWS_TAB_INDEX = 0; + private static readonly TOOLS_TAB_INDEX = 1; private searchInfoSource = new BehaviorSubject(null); public toSaveSearch$ = new BehaviorSubject(false); public searchTerm$ = new BehaviorSubject(false); @@ -69,7 +71,7 @@ export class SearchService { * @private * @memberof SearchService */ - public exclusiveFilters = ['verified', 'private_access', '_index', 'has_checker']; + public exclusiveFilters = ['verified', 'private_access', 'has_checker']; constructor( private searchStore: SearchStore, private searchQuery: SearchQuery, @@ -79,6 +81,14 @@ export class SearchService { private extendedGA4GHService: ExtendedGA4GHService ) {} + static convertTabIndexToEntryType(index: number): 'tools' | 'workflows' { + return index === this.WORKFLOWS_TAB_INDEX ? 'workflows' : 'tools'; + } + + static convertEntryTypeToTabIndex(entryType: string): number { + return entryType === 'workflows' ? this.WORKFLOWS_TAB_INDEX : this.TOOLS_TAB_INDEX; + } + /** * Return a negative number if a sorts before b, positive if b sorts before a, and 0 if they are the same, * comparing based on the given attribute and direction @@ -326,6 +336,7 @@ export class SearchService { httpParams = httpParams.append(key, subBucket); }); }); + httpParams = httpParams.append('entryType', searchInfo.entryType); if (searchInfo.searchValues) { httpParams = httpParams.append('search', searchInfo.searchValues); } else { @@ -472,7 +483,6 @@ export class SearchService { // Initialization Functions initializeCommonBucketStubs() { return new Map([ - ['Entry Type', '_index'], ['Language', 'descriptorType'], ['Registry', 'registry'], ['Source Control', 'source_control_provider.keyword'], @@ -492,20 +502,19 @@ export class SearchService { initializeFriendlyNames() { return new Map([ - ['_index', 'Entry Type'], ['descriptorType', 'Language'], - ['registry', 'Tool: Registry'], - ['source_control_provider.keyword', 'Workflow: Source Control'], - ['private_access', 'Tool: Private Access'], // Workflow has no counterpart + ['registry', 'Registry'], + ['source_control_provider.keyword', 'Source Control'], + ['private_access', 'Private Access'], ['verified', 'Verified'], ['author', 'Author'], - ['namespace', 'Tool: Namespace'], + ['namespace', 'Namespace'], ['labels.value.keyword', 'Labels'], ['input_file_formats.value.keyword', 'Input File Formats'], ['output_file_formats.value.keyword', 'Output File Formats'], [SearchFields.VERIFIED_SOURCE, 'Verified Source'], ['has_checker', 'Has Checker Workflows'], - ['organization', 'Workflow: Organization'], + ['organization', 'Organization'], ['verified_platforms.keyword', 'Verified Platforms'], ]); } @@ -528,7 +537,6 @@ export class SearchService { initializeEntryOrder() { return new Map([ - ['_index', new SubBucket()], ['descriptorType', new SubBucket()], ['author', new SubBucket()], ['registry', new SubBucket()], diff --git a/src/assets/images/dockstore/tool.svg b/src/assets/images/dockstore/tool.svg new file mode 100644 index 0000000000..93781d45d0 --- /dev/null +++ b/src/assets/images/dockstore/tool.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/dockstore/workflow.svg b/src/assets/images/dockstore/workflow.svg new file mode 100644 index 0000000000..4f14cb7661 --- /dev/null +++ b/src/assets/images/dockstore/workflow.svg @@ -0,0 +1,9 @@ + + + + + + + + + From 35aec35e3f8732914b18afdcd9cc238e28c4d89b Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 4 Mar 2021 17:39:09 -0500 Subject: [PATCH 040/119] Feature/footer modifications (#1165) * new icons and minor styling modifications * update img directory * revert to using mat-icon for rss logo --- src/app/footer/footer.component.html | 36 +++++++++--------- .../images/dockstore/github-mark-light.png | Bin 802 -> 0 bytes src/assets/images/dockstore/github.svg | 17 +++++++++ src/assets/images/dockstore/gitter.png | Bin 332 -> 0 bytes src/assets/images/dockstore/gitter.svg | 17 +++++++++ .../images/dockstore/twitter-logo-white.png | Bin 2323 -> 0 bytes src/assets/images/dockstore/twitter.svg | 17 +++++++++ src/styles.scss | 4 +- 8 files changed, 71 insertions(+), 20 deletions(-) delete mode 100644 src/assets/images/dockstore/github-mark-light.png create mode 100644 src/assets/images/dockstore/github.svg delete mode 100644 src/assets/images/dockstore/gitter.png create mode 100644 src/assets/images/dockstore/gitter.svg delete mode 100644 src/assets/images/dockstore/twitter-logo-white.png create mode 100644 src/assets/images/dockstore/twitter.svg diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index d60785251e..ea71dee7a3 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -149,28 +149,27 @@ @@ -225,7 +225,7 @@ Privacy Policy
    -
    +
    Support for Dockstore is provided by grants from Genome Canada, the National Institutes of Health, and the Province of Ontario. diff --git a/src/assets/images/dockstore/github-mark-light.png b/src/assets/images/dockstore/github-mark-light.png deleted file mode 100644 index 98808c3058123b22bf2de6d5020ab27612f05c84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-G$+Qd;gjJKpuOE zr>`sfV|Hc%W9fN2_um7`vwFHXhIkyGI(5IdvZKiH_&o=rG&&ts%}$kWyU4+{D53Cw zvx3&U&g-!cWjk8y8+w)t4oLWb6Mb&08Hp_3gF4!z};b8CQMMvT|RvnU4eg3nJPkckFN-&3*S-Ib@ zK8vDDmF>N)2B}-3c^%?vlMg&uJYQ_Ho$i;}Tjc{@)yM{fEL6PTyY%;jAaOxO@6gsX zB}QYfSXFJE6$j*vCN}WwpPKBbvEpIOl30OfQx+?z=>~kwyL4b)kbSJsyt5C?ro{^6 z^*)chQgUh|WB58xX1OG0ITHuo7k#PkugQy^yHa2!mJnrmuEp2XMqM(~zi6Gz>_bbQ z?^)~0bj{|M=fb(_{u$GA7VK<~?f=$U<`}`AFtxCb@xv*;&rg0XS!R34ylaoy)%LHy zGT%I9U9qv_=t`?hPG*k{?}OvwUgU~Q5mh%ilU^L+W;)uWOSCZKro6ddvBe$XErP}Y%F*LI>HMBCc)HX1%GBEI6IZp>gLvDUbW?Cg~ z4K`oYCIB@^f@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJedkgxD1}IelF{r5}E+y C_Cdk` diff --git a/src/assets/images/dockstore/github.svg b/src/assets/images/dockstore/github.svg new file mode 100644 index 0000000000..88f800501c --- /dev/null +++ b/src/assets/images/dockstore/github.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/dockstore/gitter.png b/src/assets/images/dockstore/gitter.png deleted file mode 100644 index 810f2b6a3349a36b235149ae22da624cf2704747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-mSQK*5Dp-y;YjHK@;M7UB8wRq zm<2$Xal-vYtAK)%C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6d{^mK6y z$!L6gBao}vK)^LHc-Mc~sZNFQkNsN{l+IjH+1FP6Psr_&vXsnp*7_4??uAv|t&QLL zMAOK4b=;guuYU>3O?>p_>g%+19ISzE0;VjMpJXns&B}5*{=P0r_V~}3jSlUzW$F8t({Qy x82e5LNPhb8r_TF}3%1@7^mi`FzueMjcCl#nZ` + + + + + + + + + + + + + + + + diff --git a/src/assets/images/dockstore/twitter-logo-white.png b/src/assets/images/dockstore/twitter-logo-white.png deleted file mode 100644 index bab872e09e9db4f9073e4e8aba82051eb354142b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2323 zcmbVOdo7heP-D}wimK+7&1+p^?x5Y@}WTmSf}^zMI!Bvf(*PY*|k9h6;~ z2Kw z2@**WS49PY@^{)aJK(%+#$s%Us@Ry6QT_dsyJDn4rTnNH?v z5xo6pp6bro6VAL;yLpBLI`AD1GurWm#%r}%$!Uy;(L@+oydkZP9iCs)-qU#>rN7gA zik3K}OyZ-U$hyg(tI)#sI}MkT8-<1*ahh6joDbj`Evv=2S^P3~WxA}{{rZQ$jom{$ z%C+st@D|x2VVvQ4LvsA^uH$=kQ!o$OXNWzrzBue>pdVT&W~*FQAHd2Mg4bi;D{F#_ zWrI4RGm$7h0#8#D)Ms|VXsb&D57u5sy~XSWzhbFjx@oIuw(_gquw8{BhoUd}+U)T( zRwIRS3mTa3;Y#SViPfomRF?1JV70UVDBPx<~i@&8FVYbSahBNXL?Fzun{Dmb%`@|Pv z(v7WGqmbwfQ~Oa-#gHhQq-}R8ZSf~(+r>OB(?ByGg?_BV)34SWYL$u0#8+QTo%o-sdjO=dD_${NR&8G1c>rUsj9N?h0xaT+Hvg8?$1& z*V31ZyjZ5Hx(H^~J=>XS6t!b4^ZkKG(L({t=B#MO6KCZ`VvY>Py2yxZQl%_Mottx~ z^{FKZTpk<_xQDos!_d(CRCG08MbYa`?qbBa{{pxX?fxXwWr`BFb2$l+l>aFvk zN>?_KjErqlGfvT;(yVA=hK7{E&KL!a=caThpj#R(?WlP7_jMmUu7X*OI_AEp`A~t1 z+2*#FyUM=usA`){P}>NVaL}h>othSVf+Q*?hT--|L0H!NiqgdJ;O3noGf=G~o;4!3mr2OTb0PE6vC-g6GWUp>;e+KKkTTA@{#NXhky`e9TIEgq5DvswaH8L_ zcW67xmY(K`1`kHRzFeu7>e@V4z;V_}#|9k-hhKCaPu^HMvX!j%){m21b@Qk1rm&vb za0GrZx2t5=t!l&lY4@3q99M#;*_5ENfttxEah@{TRcv6U%&U`d{B8A~*Iyv9*;(eO z_QAi4X6!%i|B=h%Ouc;s5oR^TZSIh?kbyX2TyKANl2sV8d@3NGgoS8L$ zs+*YL)VPZ&ZhpiI+1100e?7WrITn>o~ zwk8;;8HctEMPsIF{Z1dI3XPKLqnykzGhDqk0-1l<($+_6v7U%hc=+32soWEF$ZBSaq zVAy_U?Q)7hTpDFLfA9h&vq>`D#UJ`)AYryvA6qNE;LiO)< zNx!dn#kMhYdU=gs=Dl08NYII@MlG3Du~0L=HJ8(dRub0m-^OY09jPa&=njqKO*zv? z6E+EnviR)q z#5X?W9P^LqG5H`+%yHgu`KJRJlXO_ZjJm7F<9{pFlFtw{J-yqO6EEEPN+nP(9(s5| z)HyO*Zt+|{IkzsG`%(kHnLe-w@Am$_|Av2PnZR7bIuKwNS%}^4N0!gfqayvN1RRxU zjSnNr6JP>ISQ)`BjNqm|2y<&Qgf+s-5DvG7!`(~setG@>1msY{g<#tM7ufvNmwz+B uAHOzuhXzw4aA8Eife?C@2u71}=ZIcJ9DzpZCjR + + + + + + + + + + + + + + + + diff --git a/src/styles.scss b/src/styles.scss index fe8c2c7be7..52b90a2859 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -398,8 +398,8 @@ img.site-icons-medium { } img.site-icons-tab { - width: 24px; - height: 24px; + width: 16px; + height: 16px; } #homeSearch { From d414e01add54290a3a5318ab35843023ba7cb20f Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Thu, 4 Mar 2021 16:45:01 -0800 Subject: [PATCH 041/119] add nextflow install instructions (#1167) * add nextflow install instructions dockstore/dockstore#3679 --- .../downloadcliclient/downloadcliclient.component.ts | 3 +++ src/app/shared/launch.service.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts index c420ed3fae..ec5e60de81 100644 --- a/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts +++ b/src/app/loginComponents/onboarding/downloadcliclient/downloadcliclient.component.ts @@ -166,6 +166,9 @@ pip3 install -r requirements.txt $ cwltool --version /usr/local/bin/cwltool ${this.cwltoolVersion} \`\`\` + +#### Part 5 - Install Nextflow (Optional) +The Dockstore CLI does not run Nextflow workflows. Users can run them directly by using the Nextflow command line tool. For installation instructions, follow [Nextflow's documentation](https://github.com/nextflow-io/nextflow#download-the-package) `; } } diff --git a/src/app/shared/launch.service.ts b/src/app/shared/launch.service.ts index ba5e32223d..dee0d0957d 100644 --- a/src/app/shared/launch.service.ts +++ b/src/app/shared/launch.service.ts @@ -73,7 +73,7 @@ export abstract class LaunchService { * @param versionName The ToolVersion's name */ getNextflowNativeLaunchString(workflowPath: string, versionName: string) { - return `nextflow run http://${workflowPath} -r ${versionName}`; + return `nextflow run https://${workflowPath} -r ${versionName}`; } /** From 2effa9163e15a8843c10f04d07b3eb3880af1560 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Fri, 5 Mar 2021 12:59:17 -0500 Subject: [PATCH 042/119] Fix tests + tab change filter reset (#1169) * Fix tests + tab change filter reset * Remove wait --- .../integration/manualTests/basic-enduser.ts | 15 ++++++----- cypress/integration/manualTests/search.ts | 26 +++++++++---------- .../search-results.component.html | 4 +-- src/app/search/search.component.ts | 6 +++-- src/app/search/state/search.service.ts | 11 ++++++++ 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/cypress/integration/manualTests/basic-enduser.ts b/cypress/integration/manualTests/basic-enduser.ts index 8449741b22..2b540354c0 100644 --- a/cypress/integration/manualTests/basic-enduser.ts +++ b/cypress/integration/manualTests/basic-enduser.ts @@ -100,14 +100,14 @@ describe('Test logged out home page', () => { it('home page search bar works', () => { cy.visit('/'); cy.get('input[id=searchBar]').type('test{enter}'); - cy.url().should('include', '/search?search=test'); + cy.url().should('include', '/search?entryType=workflows&search=test'); }); }); describe('Test search page functionality', () => { it('displays tools', () => { cy.visit('/search'); - cy.get('[data-cy=toolNames]').should('have.length.of.at.least', 1); + cy.get('[data-cy=workflowColumn]').should('have.length.of.at.least', 1); }); it('has working tag cloud', () => { cy.get('[data-cy=tagCloud]').should('not.exist'); @@ -118,7 +118,7 @@ describe('Test search page functionality', () => { }); it('searches', () => { cy.get('[data-cy=basic-search]').type('topmed{enter}'); - cy.url().should('contain', '/search?search=topmed'); + cy.url().should('contain', '/search?entryType=workflows&search=topmed'); }); it('filters and unfilters by facets', () => { cy.visit('/search'); @@ -126,9 +126,11 @@ describe('Test search page functionality', () => { cy.get('[data-cy=descriptorType]').each(($el, index, $list) => { cy.wrap($el).contains('NFL'); }); - cy.url().should('contain', 'search?descriptorType=NFL&searchMode=files'); + cy.url().should('contain', 'descriptorType=NFL'); + cy.url().should('contain', 'searchMode=files'); cy.contains('mat-checkbox', 'Nextflow').click(); - cy.url().should('contain', 'search?searchMode=files'); + cy.url().should('not.contain', 'descriptorType=NF'); + cy.url().should('contain', 'searchMode=files'); }); }); @@ -136,8 +138,7 @@ describe('Test workflow page functionality', () => { it('find a WDL workflow', () => { cy.visit('/search'); cy.contains('.mat-tab-label', 'Workflows'); - cy.get('[data-cy=toolNames]').should('have.length.of.at.least', 1); - goToTab('Workflows'); + cy.get('[data-cy=workflowColumn]').should('have.length.of.at.least', 1); // click twice to sort by descriptor type descending so WDL is at the top cy.get('[data-cy=descriptorTypeHeader]').click().click(); diff --git a/cypress/integration/manualTests/search.ts b/cypress/integration/manualTests/search.ts index 71c056bcd1..438920b3c8 100644 --- a/cypress/integration/manualTests/search.ts +++ b/cypress/integration/manualTests/search.ts @@ -9,20 +9,20 @@ describe('Admin UI', () => { cy.url().should('include', '/search'); }); it('should be able to select facet', () => { - cy.get('mat-checkbox').parent().contains('workflow').click(); - cy.contains('the Entry Type is workflow'); - cy.url().should('include', '/search?_index=workflow'); + cy.get('mat-checkbox').parent().contains('WDL').click(); + cy.contains('the Language is WDL'); + cy.url().should('include', '/search?descriptorType=WDL'); }); it('should be able to handle the back button', () => { cy.go('back'); - cy.url().should('not.include', '/search?_index=workflow'); - cy.contains('the Entry Type is workflow').should('not.exist'); + cy.url().should('not.include', '/search?descriptorType=WDL'); + cy.contains('the Language is WDL').should('not.exist'); }); it('should be able to use basic search box and have suggestions', () => { cy.get('[data-cy=basic-search]').type('dockstore_d'); cy.contains(' Sorry, no matches found for dockstore_d'); cy.contains('Do you mean: dockstore?'); - cy.url().should('include', '/search?search=dockstore_'); + cy.url().should('include', 'search=dockstore_'); }); it('should reset filters', () => { @@ -32,24 +32,24 @@ describe('Admin UI', () => { it('should remember paginator setting', () => { cy.contains('Items per page'); - cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('[data-cy=search-workflow-table-paginator]').within(() => { cy.get('.mat-paginator-range-label').contains('10 of'); }); - cy.get('[data-cy=search-tool-table-paginator]').contains(10).should('be.visible').click(); + cy.get('[data-cy=search-workflow-table-paginator]').contains(10).should('be.visible').click(); cy.get('mat-option').contains(20).click(); - cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('[data-cy=search-workflow-table-paginator]').within(() => { cy.get('.mat-paginator-navigation-next').click(); }); - cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('[data-cy=search-workflow-table-paginator]').within(() => { cy.get('.mat-paginator-range-label').contains('40 of'); }); - cy.get('[data-cy=search-tool-table-paginator]').contains(20); + cy.get('[data-cy=search-workflow-table-paginator]').contains(20); cy.get('a').contains('Organizations').click(); cy.go('back'); - cy.get('[data-cy=search-tool-table-paginator]').within(() => { + cy.get('[data-cy=search-workflow-table-paginator]').within(() => { cy.get('.mat-paginator-range-label').contains('40 of'); }); - cy.get('[data-cy=search-tool-table-paginator]').contains(20); + cy.get('[data-cy=search-workflow-table-paginator]').contains(20); cy.contains('pancancer/pcawg-dkfz-workflow').should('not.exist'); }); it('should have basic search and advanced search mutually exclusive', () => { diff --git a/src/app/search/search-results/search-results.component.html b/src/app/search/search-results/search-results.component.html index e41a36c01c..81947969b7 100644 --- a/src/app/search/search-results/search-results.component.html +++ b/src/app/search/search-results/search-results.component.html @@ -30,7 +30,7 @@
    -
    +
    -
    +
    Date: Fri, 5 Mar 2021 13:15:56 -0500 Subject: [PATCH 043/119] Feature/update schema and icons (#1166) * new svg for headers * new svg and file * workflows and tools page theme changed * title wrapping and new svg * reverse title styling * Revert a part of commit 1396368 "title wrapping and new svg" * delete private icon css * Feature/2073/seperate tools and workflows tab (#1127) * separate tab and facet functionality * moved tab group to search.component * tabs moved above table * added import to test * remove unused observables * linting * lint imports * lint * click tools tab in cypress test * flaky cypress test * There is only one query size * Fix * Random fixes * Remove all traces of _index as a facet * Remove a comment * Fix linking + add extra comments * Adjust test * Fix lgtm Co-authored-by: Gary Luu * default tags and navbar styling * new svg for headers * new svg and file * workflows and tools page theme changed * title wrapping and new svg * reverse title styling * Revert a part of commit 1396368 "title wrapping and new svg" * delete private icon css * default tags and navbar styling * search-facet colors updated * alt attribute added Co-authored-by: Nina Zhao <50606789+nrzhao4@users.noreply.github.com> Co-authored-by: Gary Luu --- src/app/container/container.component.html | 43 +++++--- .../versions/versions.component.html | 11 +- src/app/containers/containers.component.html | 2 +- .../mytools/my-tool/my-tool.component.html | 11 +- .../my-workflow/my-workflow.component.html | 13 ++- src/app/navbar/navbar.component.css | 4 + src/app/navbar/navbar.component.html | 101 ++++++++++++------ src/app/navbar/navbar.component.ts | 5 + .../collection/collection.component.html | 4 +- .../collections/collections.component.html | 2 +- .../organization/organization.component.html | 6 +- .../organization/organization.component.scss | 4 - .../organizations.component.html | 2 +- .../basic-search/basic-search.component.html | 6 +- .../basic-search/basic-search.component.scss | 4 + .../search-results.component.ts | 1 + src/app/search/search.component.html | 15 ++- src/app/search/search.component.scss | 9 +- src/app/shared/entry.ts | 6 +- .../private-icon/private-icon.component.css | 3 - .../private-icon/private-icon.component.ts | 1 - .../workflow/info-tab/info-tab.component.css | 4 + .../workflow/versions/versions.component.html | 17 +-- src/app/workflow/workflow.component.html | 34 +++--- src/app/workflows/workflows.component.html | 2 +- src/assets/images/dockstore/workflow.svg | 9 -- .../svg/main-nav/icons-navigation-about.svg | 19 ++++ .../main-nav/icons-navigation-dashboard.svg | 19 ++++ .../svg/main-nav/icons-navigation-docs.svg | 17 +++ .../svg/main-nav/icons-navigation-forum.svg | 17 +++ .../icons-navigation-organization.svg | 17 +++ .../svg/main-nav/icons-navigation-search.svg | 17 +++ src/assets/svg/service-circle.svg | 33 ++++++ src/assets/svg/{ => sub-nav}/collections.svg | 0 src/assets/svg/{ => sub-nav}/organization.svg | 0 src/assets/svg/sub-nav/services.svg | 13 +++ .../dockstore => svg/sub-nav}/tool.svg | 0 src/assets/svg/{ => sub-nav}/workflow.svg | 0 src/assets/svg/tool-circle.svg | 29 +++++ src/assets/svg/tool.svg | 9 -- src/assets/svg/workflow-circle.svg | 29 +++++ src/ds-style-fix.scss | 16 ++- src/styles.scss | 29 ++++- 43 files changed, 454 insertions(+), 129 deletions(-) delete mode 100644 src/app/shared/private-icon/private-icon.component.css delete mode 100644 src/assets/images/dockstore/workflow.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-about.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-dashboard.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-docs.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-forum.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-organization.svg create mode 100644 src/assets/svg/main-nav/icons-navigation-search.svg create mode 100644 src/assets/svg/service-circle.svg rename src/assets/svg/{ => sub-nav}/collections.svg (100%) rename src/assets/svg/{ => sub-nav}/organization.svg (100%) create mode 100644 src/assets/svg/sub-nav/services.svg rename src/assets/{images/dockstore => svg/sub-nav}/tool.svg (100%) rename src/assets/svg/{ => sub-nav}/workflow.svg (100%) create mode 100644 src/assets/svg/tool-circle.svg delete mode 100644 src/assets/svg/tool.svg create mode 100644 src/assets/svg/workflow-circle.svg diff --git a/src/app/container/container.component.html b/src/app/container/container.component.html index 60e5dba1d9..42469b23b0 100644 --- a/src/app/container/container.component.html +++ b/src/app/container/container.component.html @@ -42,20 +42,30 @@
    -
    +
    -
    -

    - - - done - +
    +

    + + + tool icon + + + + - - + + {{ tool?.tool_path }}:{{ selectedVersion?.name }} + + + + done + Verified + + + - {{ tool?.tool_path }}:{{ selectedVersion?.name }}

    @@ -71,7 +81,7 @@

    >

    -
    +
    - {{ label }} + {{ + label + }} @@ -148,13 +160,14 @@

    -
    +
    @@ -259,7 +272,7 @@

    Recent Versions

    - + done diff --git a/src/app/container/versions/versions.component.html b/src/app/container/versions/versions.component.html index b613e66fe5..4780b47d71 100644 --- a/src/app/container/versions/versions.component.html +++ b/src/app/container/versions/versions.component.html @@ -45,7 +45,16 @@ - Default + + + Default + + - {{ entryPageTitle$ | async | titlecase }} + site icon {{ entryPageTitle$ | async | titlecase }}

    diff --git a/src/app/mytools/my-tool/my-tool.component.html b/src/app/mytools/my-tool/my-tool.component.html index 93c212d1be..03831f7073 100644 --- a/src/app/mytools/my-tool/my-tool.component.html +++ b/src/app/mytools/my-tool/my-tool.component.html @@ -14,10 +14,13 @@ ~ limitations under the License. --> - - {{ myEntryPageTitle$ | async | titlecase }} + + + tool icon + {{ myEntryPageTitle$ | async | titlecase }} +
    diff --git a/src/app/myworkflows/my-workflow/my-workflow.component.html b/src/app/myworkflows/my-workflow/my-workflow.component.html index 60828bf2e4..44f8033d7c 100644 --- a/src/app/myworkflows/my-workflow/my-workflow.component.html +++ b/src/app/myworkflows/my-workflow/my-workflow.component.html @@ -19,10 +19,15 @@ chevron_left chevron_right -  {{ myEntryPageTitle$ | async | titlecase }}  -
    preview
    +
    + workflow icon + {{ myEntryPageTitle$ | async | titlecase }} +
    +
    + service icon + {{ myEntryPageTitle$ | async | titlecase }} + preview +
    diff --git a/src/app/navbar/navbar.component.css b/src/app/navbar/navbar.component.css index b976a7b5e0..268692ca40 100644 --- a/src/app/navbar/navbar.component.css +++ b/src/app/navbar/navbar.component.css @@ -58,3 +58,7 @@ a:focus { mat-menu { padding-right: 10px; } + +.icons { + filter: grayscale(100%); +} diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index 6fbf39278d..c4ead48b94 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -21,55 +21,94 @@ dockstore logo - Search + Search - Organizations + + Organizations - Docs + Docs - Forum + Forum Login - -  My Tools - - -  My Workflows - - -  My Services + + + - + + + - inputLog out +
    diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts index e6abea02a0..b715050668 100644 --- a/src/app/navbar/navbar.component.ts +++ b/src/app/navbar/navbar.component.ts @@ -41,6 +41,7 @@ export class NavbarComponent extends Logout implements OnInit { protected ngUnsubscribe: Subject<{}> = new Subject(); private readonly currentTOSVersion: User.TosversionEnum = currentTOSVersion; private readonly currentPrivacyPolicyVersion: User.PrivacyPolicyVersionEnum = currentPrivacyPolicyVersion; + public activeItem: string; constructor( private pagenumberService: PagenumberService, @@ -85,4 +86,8 @@ export class NavbarComponent extends Logout implements OnInit { logOutUsersWithoutCurrentTOS() { this.logout('/session-expired'); } + + setActiveItem(name: string) { + this.activeItem = name; + } } diff --git a/src/app/organizations/collection/collection.component.html b/src/app/organizations/collection/collection.component.html index 1371c78403..982aa90760 100644 --- a/src/app/organizations/collection/collection.component.html +++ b/src/app/organizations/collection/collection.component.html @@ -85,8 +85,8 @@

    Workflows & Tools

    >
    - workflow icon - tool icon + workflow icon + tool icon
    {{ entry.entryPath + (entry.versionName ? ':' + entry.versionName : '') }}
    diff --git a/src/app/organizations/collections/collections.component.html b/src/app/organizations/collections/collections.component.html index d4b221dbc3..ad4b6fd81c 100644 --- a/src/app/organizations/collections/collections.component.html +++ b/src/app/organizations/collections/collections.component.html @@ -25,7 +25,7 @@
    - collections icon + collections icon

    {{ collection.value.displayName }}

     {{ collection.value.topic }} diff --git a/src/app/organizations/organization/organization.component.html b/src/app/organizations/organization/organization.component.html index 76a8f30a5f..efe0b3b9f8 100644 --- a/src/app/organizations/organization/organization.component.html +++ b/src/app/organizations/organization/organization.component.html @@ -16,7 +16,7 @@
    - organization icon + organization icon Organizations / {{ (organization$ | async)?.displayName }} @@ -94,11 +94,11 @@

    {{ org.displayName }}

    - +
    - collections icon + collections icon Collections {{ collectionsLength$ | async }}
    diff --git a/src/app/organizations/organization/organization.component.scss b/src/app/organizations/organization/organization.component.scss index a593007ffa..cfeb2671ce 100644 --- a/src/app/organizations/organization/organization.component.scss +++ b/src/app/organizations/organization/organization.component.scss @@ -2,10 +2,6 @@ color: #397a84; } -.mat-tab-group { - color: #3f51b5; -} - .tab-icons { color: #7887cb; } diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index cf0e95ed2a..e128ae29b0 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -15,7 +15,7 @@ -->
    - organization icon + organization icon Organizations
    diff --git a/src/app/search/basic-search/basic-search.component.html b/src/app/search/basic-search/basic-search.component.html index 13806ce121..ef9920eaad 100644 --- a/src/app/search/basic-search/basic-search.component.html +++ b/src/app/search/basic-search/basic-search.component.html @@ -1,6 +1,6 @@ Search - + {{ option }} - + Open Advanced Search diff --git a/src/app/search/basic-search/basic-search.component.scss b/src/app/search/basic-search/basic-search.component.scss index cb631dbf19..aaa6265289 100644 --- a/src/app/search/basic-search/basic-search.component.scss +++ b/src/app/search/basic-search/basic-search.component.scss @@ -3,3 +3,7 @@ input[type='text']:focus, textarea:focus { border: none; } + +.form-field { + display: inherit; +} diff --git a/src/app/search/search-results/search-results.component.ts b/src/app/search/search-results/search-results.component.ts index d6827b8d9d..85b6860a8c 100644 --- a/src/app/search/search-results/search-results.component.ts +++ b/src/app/search/search-results/search-results.component.ts @@ -33,6 +33,7 @@ export class SearchResultsComponent extends Base implements OnInit { public showWorkflowTagCloud$: Observable; public showToolTagCloud$: Observable; public selectedIndex$: Observable; + public selectedTab: number; toolTagCloudData: Array; workflowTagCloudData: Array; options: CloudOptions = { diff --git a/src/app/search/search.component.html b/src/app/search/search.component.html index 531597424f..b74c734829 100644 --- a/src/app/search/search.component.html +++ b/src/app/search/search.component.html @@ -24,17 +24,18 @@ mat-align-tabs="center" [selectedIndex]="selectedIndex$ | async" (selectedTabChange)="saveTabIndex($event)" + [ngClass]="(selectedIndex$ | async) === 0 ? 'workflow-tab-group' : 'tool-tab-group'" > - + workflow icon Workflows
    - + tool icon Tools
    @@ -134,7 +135,10 @@
    {{ orderedBuckets.get(key).Items.get(subBucket) }} -
    +
    @@ -152,7 +156,10 @@
    {{ orderedBuckets.get(key).Items.get(subBucket) }} -
    +
    diff --git a/src/app/search/search.component.scss b/src/app/search/search.component.scss index a205d7f9fb..3cb42836e9 100644 --- a/src/app/search/search.component.scss +++ b/src/app/search/search.component.scss @@ -172,8 +172,13 @@ mat-tab-group.homeComponent { padding-right: 0; } -.histogram { - background-color: #dddddd; +.workflow-histogram { + background-color: #d2fbf0; + min-height: 2rem; +} + +.tool-histogram { + background-color: #d0effd; min-height: 2rem; } diff --git a/src/app/shared/entry.ts b/src/app/shared/entry.ts index 5f0777c19b..4266a60438 100644 --- a/src/app/shared/entry.ts +++ b/src/app/shared/entry.ts @@ -70,6 +70,7 @@ export abstract class Entry implements OnInit, OnDestroy { protected ngUnsubscribe: Subject<{}> = new Subject(); protected selected = new FormControl(0); labelFormControl = new FormControl('', [Validators.pattern('^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$')]); + public verifiedLink: string; constructor( private trackLoginService: TrackLoginService, public providerService: ProviderService, @@ -104,6 +105,7 @@ export abstract class Entry implements OnInit, OnDestroy { this.sessionService.setPublicPage(this.isPublic()); this.sessionQuery.isPublic$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((publicPage) => (this.publicPage = publicPage)); this.trackLoginService.isLoggedIn$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((state) => (this.isLoggedIn = state)); + this.verifiedLink = this.dateService.getVerifiedLink(); } private parseURL(url: String): void { @@ -118,10 +120,6 @@ export abstract class Entry implements OnInit, OnDestroy { } } - getVerifiedLink(): string { - return this.dateService.getVerifiedLink(); - } - starGazersChange(): void { this.starGazersClicked = !this.starGazersClicked; } diff --git a/src/app/shared/private-icon/private-icon.component.css b/src/app/shared/private-icon/private-icon.component.css deleted file mode 100644 index ee78604ace..0000000000 --- a/src/app/shared/private-icon/private-icon.component.css +++ /dev/null @@ -1,3 +0,0 @@ -.no-underline { - text-decoration: none; -} diff --git a/src/app/shared/private-icon/private-icon.component.ts b/src/app/shared/private-icon/private-icon.component.ts index aaf06e06ed..6df28d77dc 100644 --- a/src/app/shared/private-icon/private-icon.component.ts +++ b/src/app/shared/private-icon/private-icon.component.ts @@ -4,7 +4,6 @@ import { Dockstore } from '../../shared/dockstore.model'; @Component({ selector: 'app-private-icon', templateUrl: './private-icon.component.html', - styleUrls: ['./private-icon.component.css'], }) export class PrivateIconComponent { // Change this link if necessary diff --git a/src/app/workflow/info-tab/info-tab.component.css b/src/app/workflow/info-tab/info-tab.component.css index f32a95b272..f60b1b78d1 100644 --- a/src/app/workflow/info-tab/info-tab.component.css +++ b/src/app/workflow/info-tab/info-tab.component.css @@ -17,3 +17,7 @@ .link-with-underline { text-decoration: underline; } + +a { + word-break: break-word; +} diff --git a/src/app/workflow/versions/versions.component.html b/src/app/workflow/versions/versions.component.html index 2eefafeb7f..d30fdbbdfb 100644 --- a/src/app/workflow/versions/versions.component.html +++ b/src/app/workflow/versions/versions.component.html @@ -44,13 +44,16 @@ > - - Default + + + Default + diff --git a/src/app/workflow/workflow.component.html b/src/app/workflow/workflow.component.html index 5e6dafb27c..fc7988cd24 100644 --- a/src/app/workflow/workflow.component.html +++ b/src/app/workflow/workflow.component.html @@ -42,21 +42,27 @@

    The workflow linked to could not be found!

    -
    +
    -
    +

    - - - done - - + workflow icon + + {{ title }}:{{ selectedVersion?.name }}:{{ selectedVersion?.name }} + + + + done + Verified + + +
    +
    - {{ label }} + {{ + label + }} @@ -154,10 +162,10 @@

    -
    +
    Recent Versions

    - + done diff --git a/src/app/workflows/workflows.component.html b/src/app/workflows/workflows.component.html index b060b07aa7..20cf471b67 100644 --- a/src/app/workflows/workflows.component.html +++ b/src/app/workflows/workflows.component.html @@ -15,7 +15,7 @@ -->

    - +  {{ entryPageTitle$ | async | titlecase }} 
    preview
    diff --git a/src/assets/images/dockstore/workflow.svg b/src/assets/images/dockstore/workflow.svg deleted file mode 100644 index 4f14cb7661..0000000000 --- a/src/assets/images/dockstore/workflow.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/svg/main-nav/icons-navigation-about.svg b/src/assets/svg/main-nav/icons-navigation-about.svg new file mode 100644 index 0000000000..65c78bd0c7 --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-about.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/main-nav/icons-navigation-dashboard.svg b/src/assets/svg/main-nav/icons-navigation-dashboard.svg new file mode 100644 index 0000000000..704eb78c26 --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-dashboard.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/main-nav/icons-navigation-docs.svg b/src/assets/svg/main-nav/icons-navigation-docs.svg new file mode 100644 index 0000000000..ba670a6d7d --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-docs.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/main-nav/icons-navigation-forum.svg b/src/assets/svg/main-nav/icons-navigation-forum.svg new file mode 100644 index 0000000000..e38465804c --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-forum.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/main-nav/icons-navigation-organization.svg b/src/assets/svg/main-nav/icons-navigation-organization.svg new file mode 100644 index 0000000000..37f3058c8a --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-organization.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/main-nav/icons-navigation-search.svg b/src/assets/svg/main-nav/icons-navigation-search.svg new file mode 100644 index 0000000000..f2e0b2e7fa --- /dev/null +++ b/src/assets/svg/main-nav/icons-navigation-search.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/service-circle.svg b/src/assets/svg/service-circle.svg new file mode 100644 index 0000000000..35c0f3dfa2 --- /dev/null +++ b/src/assets/svg/service-circle.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/collections.svg b/src/assets/svg/sub-nav/collections.svg similarity index 100% rename from src/assets/svg/collections.svg rename to src/assets/svg/sub-nav/collections.svg diff --git a/src/assets/svg/organization.svg b/src/assets/svg/sub-nav/organization.svg similarity index 100% rename from src/assets/svg/organization.svg rename to src/assets/svg/sub-nav/organization.svg diff --git a/src/assets/svg/sub-nav/services.svg b/src/assets/svg/sub-nav/services.svg new file mode 100644 index 0000000000..b39d780169 --- /dev/null +++ b/src/assets/svg/sub-nav/services.svg @@ -0,0 +1,13 @@ + + + + Group 17 + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/dockstore/tool.svg b/src/assets/svg/sub-nav/tool.svg similarity index 100% rename from src/assets/images/dockstore/tool.svg rename to src/assets/svg/sub-nav/tool.svg diff --git a/src/assets/svg/workflow.svg b/src/assets/svg/sub-nav/workflow.svg similarity index 100% rename from src/assets/svg/workflow.svg rename to src/assets/svg/sub-nav/workflow.svg diff --git a/src/assets/svg/tool-circle.svg b/src/assets/svg/tool-circle.svg new file mode 100644 index 0000000000..25bd88d545 --- /dev/null +++ b/src/assets/svg/tool-circle.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/tool.svg b/src/assets/svg/tool.svg deleted file mode 100644 index 93781d45d0..0000000000 --- a/src/assets/svg/tool.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/svg/workflow-circle.svg b/src/assets/svg/workflow-circle.svg new file mode 100644 index 0000000000..1036368cad --- /dev/null +++ b/src/assets/svg/workflow-circle.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ds-style-fix.scss b/src/ds-style-fix.scss index a20be580b9..12a4596e7f 100644 --- a/src/ds-style-fix.scss +++ b/src/ds-style-fix.scss @@ -187,9 +187,6 @@ table.hosted-tool-versions-grid { div.details-container { margin-bottom: 14px; } -div.ds-tabs { - border: solid 1px #cfd1d7; -} ul.nav-tabs { background-color: #ffffff; @@ -240,7 +237,6 @@ div.panel-container-label { color: #487980; padding: 0 10px; clear: both; - overflow: hidden; .container-name-oflw { width: 170px; white-space: nowrap; @@ -680,9 +676,17 @@ div.modal form { margin-bottom: 5px; } +.verified-check, .verified-check:hover, .verified-check:visited { text-decoration: none; + color: #151c3d; +} + +.verified-icon { + font-size: 1.5rem; + height: auto !important; + width: auto !important; } .footer-list li { @@ -729,6 +733,10 @@ div.modal form { color: #487980 !important; } +.ds-steelblue { + color: #4053b5; +} + .top-down-padding { padding-top: 2px; padding-bottom: 2px; diff --git a/src/styles.scss b/src/styles.scss index 52b90a2859..57364503d4 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -376,7 +376,8 @@ cite { } a { - color: #487980; + color: #3d7d86; + text-decoration: underline; } a.white-link { @@ -1196,6 +1197,32 @@ app-sidebar-accordion } } +.tool-tab-group.mat-primary .mat-ink-bar { + background: #29b6f6 !important; +} + +.workflow-tab-group.mat-primary .mat-ink-bar { + background: #26bfa5 !important; +} + +.organization-tab-group.mat-primary .mat-ink-bar { + background: #3f51b5 !important; +} + +.container-label-chip { + background: #d0effd !important; + text-decoration: none !important; + border-radius: 1rem !important; + font-size: 12px !important; +} + +.workflow-label-chip { + background: #d2fbf0 !important; + text-decoration: none !important; + border-radius: 1rem !important; + font-size: 12px !important; +} + // Make the dropdown at least the size of the default material dropdown. // Making the general width to grow to 50% of the parent width so that there's more room to display long file names // TODO: Ideally this should stretch to the length of the longest dropdown option. From 6b2d7e3fb51981dcb3944aab35c28c1c7d01a51e Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Tue, 9 Mar 2021 09:37:15 -0500 Subject: [PATCH 044/119] Github to GitHub (#1172) --- cypress/integration/manualTests/basic-enduser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/manualTests/basic-enduser.ts b/cypress/integration/manualTests/basic-enduser.ts index 2b540354c0..40206aa123 100644 --- a/cypress/integration/manualTests/basic-enduser.ts +++ b/cypress/integration/manualTests/basic-enduser.ts @@ -199,7 +199,7 @@ describe('Check organizations page', () => { describe('Check external links', () => { it('github, twitter, gitter, discuss links are correct', () => { cy.visit(''); - cy.contains('a', 'Github').should('have.attr', 'href', 'https://github.com/dockstore/dockstore'); + cy.contains('a', 'GitHub').should('have.attr', 'href', 'https://github.com/dockstore/dockstore'); cy.contains('a', '@DockstoreOrg').should('have.attr', 'href', 'https://twitter.com/DockstoreOrg'); cy.contains('a', 'Gitter').should('have.attr', 'href', 'https://gitter.im/ga4gh/dockstore'); cy.contains('a', 'Help Desk').should('have.attr', 'href', 'https://discuss.dockstore.org/t/opening-helpdesk-tickets/1506'); From 922fe9c4ea4266820b173700f227a093b92f02ab Mon Sep 17 00:00:00 2001 From: Walter Shands Date: Tue, 9 Mar 2021 07:09:21 -0800 Subject: [PATCH 045/119] incorporate Hotfix branch for release 2.7.4 (#1173) * Feature/2400/update tos (#1155) Added new TOS pdf, updated to TOS_VERSION_2 for the current version. Partner PR: dockstore/dockstore#4037. Original ticket: Seab-2400. Need to change CircleCI artifacts being used for tests before final merging of the hotfix. * test the new webservice 1.10.2 release (#1171) Co-authored-by: Richard-Hansen <36607471+Richard-Hansen@users.noreply.github.com> --- cypress/support/commands.ts | 6 ++++-- package.json | 2 +- scripts/generate-openapi-script.sh | 2 +- scripts/run-webservice-script.sh | 6 +++--- src/app/shared/constants.ts | 2 +- .../docs/Dockstore_Terms_of_Service.pdf | Bin 87895 -> 70930 bytes 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 5964c72bc7..d71e718f3d 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -48,7 +48,9 @@ export function resetDB() { before(() => { cy.exec('java -jar dockstore-webservice.jar db drop-all --confirm-delete-everything travisci/web.yml'); cy.exec('PGPASSWORD=dockstore psql -h localhost -f travisci/db_dump.sql webservice_test -U dockstore'); - cy.exec('java -jar dockstore-webservice.jar db migrate -i 1.5.0,1.6.0,1.7.0,alter_test_user_1.7.0,1.8.0,1.9.0,1.10.0 travisci/web.yml'); + cy.exec( + 'java -jar dockstore-webservice.jar db migrate -i 1.5.0,1.6.0,1.7.0,1.8.0,1.9.0,1.10.0,alter_test_user_1.10.2 travisci/web.yml' + ); }); } @@ -80,6 +82,6 @@ export function goToUnexpandedSidebarEntry(organization: string, repo: RegExp | export function approvePotatoMembership() { cy.exec( - "PGPASSWORD=dockstore psql -h localhost -c 'update organization_user set accepted=true where userid=2 and organizationid=1' webservice_test -U dockstore" + 'PGPASSWORD=dockstore psql -h localhost -c \'update organization_user set accepted=true where userid=2 and organizationid=1\' webservice_test -U dockstore' ); } diff --git a/package.json b/package.json index 14f854eb30..64bdcf9211 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "2.3.0", "license": "Apache License 2.0", "config": { - "webservice_version": "1.10.1" + "webservice_version": "1.10.2" }, "scripts": { "ng": "npx ng", diff --git a/scripts/generate-openapi-script.sh b/scripts/generate-openapi-script.sh index f67154081e..1f6163d437 100755 --- a/scripts/generate-openapi-script.sh +++ b/scripts/generate-openapi-script.sh @@ -11,7 +11,7 @@ GENERATOR_VERSION="4.3.0" # Uncomment this to use the actual Dockstore webservice release from the package.json BASE_PATH="https://raw.githubusercontent.com/dockstore/dockstore/$npm_package_config_webservice_version" # Uncomment this to use the CircleCI swagger/openapi instead -CIRCLE_CI_PATH="https://6704-33383826-gh.circle-artifacts.com/0/tmp/artifacts" +CIRCLE_CI_PATH="https://7397-33383826-gh.circle-artifacts.com/0/tmp/artifacts" # DOCKSTORE-2428 - demo how to add new workflow language, generate from local copy of swagger # Uncomment this to use your local copy of swagger instead # BASE_PATH="../dockstore" diff --git a/scripts/run-webservice-script.sh b/scripts/run-webservice-script.sh index a68dfe4a21..ae4192accc 100755 --- a/scripts/run-webservice-script.sh +++ b/scripts/run-webservice-script.sh @@ -4,9 +4,9 @@ set -o pipefail set -o nounset set -o xtrace # Uncomment this to use the actual Dockstore webservice from the package.json -JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" + JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" # Uncomment this to use the CircleCI jar -# JAR_PATH="https://6704-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.0-SNAPSHOT.jar" +#JAR_PATH="https://7397-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.10.2-SNAPSHOT.jar" wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH} chmod u+x dockstore-webservice.jar @@ -14,5 +14,5 @@ psql -h localhost -c "create user dockstore with password 'dockstore' createdb;" psql -h localhost -c "ALTER USER dockstore WITH superuser;" -U postgres psql -h localhost -c 'create database webservice_test with owner = dockstore;' -U postgres psql -h localhost -f travisci/db_dump.sql webservice_test -U postgres -java -jar dockstore-webservice.jar db migrate -i 1.5.0,1.6.0,1.7.0,add_service_1.7.0,alter_test_user_1.7.0,1.8.0,1.9.0,1.10.0 travisci/web.yml +java -jar dockstore-webservice.jar db migrate -i 1.5.0,1.6.0,1.7.0,add_service_1.7.0,1.8.0,1.9.0,1.10.0,alter_test_user_1.10.2 travisci/web.yml diff --git a/src/app/shared/constants.ts b/src/app/shared/constants.ts index c215a5df5c..92d52e71b2 100644 --- a/src/app/shared/constants.ts +++ b/src/app/shared/constants.ts @@ -33,7 +33,7 @@ export const servicesURLSegment = 'services'; export const toolsURLSegment = 'tools'; export const altAvatarImg = 'http://www.imcslc.ca/imc/includes/themes/imc/images/layout/img_placeholder_avatar.jpg'; export const devMode = false; -export const currentTOSVersion: User.TosversionEnum = User.TosversionEnum.TOSVERSION1; +export const currentTOSVersion: User.TosversionEnum = User.TosversionEnum.TOSVERSION2; export const currentPrivacyPolicyVersion: User.PrivacyPolicyVersionEnum = User.PrivacyPolicyVersionEnum.PRIVACYPOLICYVERSION25; export const dismissedLatestTOS = 'dismissedLatestTOS'; export const dismissedLatestPrivacyPolicy = 'dismissedLatestPrivacyPolicy'; diff --git a/src/assets/docs/Dockstore_Terms_of_Service.pdf b/src/assets/docs/Dockstore_Terms_of_Service.pdf index 6d4baba6872db4bd17e98f41df5e0b40d4b8d932..7e03800c20b8768e314bb687e945eff8807e01d5 100644 GIT binary patch literal 70930 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 literal 87895 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 Gmketsbn{U zH!4WWva{dPOQ+=rFrNW503ZSh5P?zZ{|Z1TmZ3<7g4h~>o^>D+1%SXO0?oG&hz1}8 zw-BiE&j|dBw*7wQ9oXw7$zm!S-ktSmYISedA$@B6?6E;Nila7Tho81&7ZbK@$~wZkuj{JuR@t5v`J(CWNWlBZhVc*rOR zA;ZOmMtl{KI>$_Q+xc+u-H8g{t557(bx0~BOX&3t;;R}2>pm-imq+&Jlq9HvivHrq z$ggR5j=l*FQmx}}9arxzAz7)s@qaw(WN*{boqi@dP6Sw)lk2eOEmL#WVbrbP%Q*L2 z%HDj%k)4UuS7V%@w2h(`@-FwYceJ*$qM!F#f`4Sr`jZ~CG>M{TlNO~M;GFDaP{)Iu z0LKrNG~ezEhy-?hc0uIreFa#Q-`1~+NJ)uw4J9El!2~Vc(ji?#cXtRVf|MX7B}j^Z zfP~T@snQAv2m&e{QUcb}t>a_^!*%`2JlBszD(<6{#nFJ9NXcg{_%>RqG%B2K@( zsJ>TG7}b_$aM(&k7%7~Nu)erFzpps+QCNwfadLZ5w2gUGJKH!{*3&CKyBejY%F#&} z?-6LD&=zC|`x)pL(+C5R`(`9pC+ucsl+R0@<&5Vw%)Mgk=p3$uFFv0^WJ3xDs7Li`JlT-1Ed`2%eIXm=*GvCtRte(v!f)5*wXCwt=2(iywgQBO#&5|*{obRn$u(>fq67tKI}gq_+v+lj7I z$_Dh#YTDAddhNw%`Eje^m#tqsr`EqBM^C90X3c*aJWU&v=&p_ED%T}s zUb8m5Ho=}C&zr`*l%_d>z(QQnfTv}~sgr#Hl-qylD&)_LNs8LXI$nIWqZrZCS3EKC} zal*D*#@dzMDrV%2RyNC|BLXTz8*XSa^V>L$Bume?bUvk+=!CcutQD6!sR2I|<(?8{ znnQ~m>?qeN@n+`R4sYlM*Aow|>F9~;6tQ(pb{OvxLkr+lA?F*fde5=NY#z8OS--3{ znxFGf(oW2Gpz@(BR#&Rd!W`&xH6e?0${=J*C-HIi^q2JbQ63#$y{Ft}Alc$IQ?6~Uk%7pW1xw|)Lg z{k%T*rp!UWz+N876#a(zXdzM^1EYCBc$zx>Oi26pRKqO4;-w#gf=&veFBc_f#SEUN zmyAG3A6HEOh}`{QIZv<&SDUZdOEA0bPN<+xmf<-;X7-4XCvHo?eoD4SXW0F-neQ_o z2GYGKPyZQv7A04swWk+I`@Wfunsve(SSwyMM2_>mcmKt!>dYCVv|ozwmMezitv{wKSj>ns zwaE%}e_yovjJXw;U#@b=5QzF)+@>9;%2 z=UFTD6{Iaf+i>5UQ-lXaC6GB1j4s_(+O5i~Q+YmXrWq7ZsT+CM8q$2%;v2Ki<)yv_ zZ))`bKk3r6Rz3GyAvCi%+%Kfi!b<*Qg5#zIDOFLPLiSaYl z_-TB`^rk1bM#ICYci-S^4I-Lvo^M&T4IHSZ>V_0wsEsjdZ@QyT0`J!0Qq}j%2Mejl zauM5nm3=ifl$cnavgQ3QG~$~IwC4i$TZ_r%@Z^2XPr1Gc6h^vpl4f-}0s1cKFMYn# zbY<^PXR3%7IcBTrlR5B4V2DxP@aC=emRNNgioCMdb&Vvv7^DA|WG8a{9Ntyz#QmCd z7OC=Gyv|JA{5ov1rveK&E*2^0eR6j$QVm!Vw;4or|$vVo6C;F&bUHh zXBDvT8H?;?w7jF8n=sr$+b?6_Glt)~vp;LJiMPJy-Zr{heZF&l>Y-Rva0~OcN{OdB zICs~um7q{L^_4DWJ64ZMcY99s*wWVrM$x<8xw+R#QyZPEb=`9hkfdQlkG^3G?9 zctxe9B2uB9H~B^t1$DFO2eD7fjD=lEz3=E^^?=o{SCQ$rdwma$A;(st@XKik$a*L( z!+1`#z-z4dI>a9_@Tyii^1<2ncK#XBRSP$^VoW%2?*w=cbGw~InLoJZ()z+w%4{gp z$XL11g)%4HRvCKFg1dGEujLcgV<>+!+fpqjH`YN^bd-Hq7_>YuzU=Putz>e0=B@c@ z=2_Gb1@1% zHM&Ba5k0IVTiCUz2>I?I;=Gn{kEV_Wc8 zZ|$LG8PE-(525Zgp0P1&I>D+;)8MqtDpq1kuG@Rjs{+%x8=6k9QoQ7~??iLW*LgN% z=V|C@TwscIkh^`MoK?cF$F&YsR?&3xKHaCMRvrED%&R$`Z8#s^Yl^L2dnuQ!=19dm zz_S9YbNFbS9ltDiFqc3c#Lf3+C1%!qS~TwJdh5-$3@$lxwtx`jqQ$-4kp(4 zxDZ|_2n;$(>Vm+!AS4{D4+6n-K~N+LNI)REAQ%jGcpW~$kLX7fApejD1cxJl94Nr| zE5-Md=chajp$kGFkVh913I!crN6!!l2nk3ZKL6z8{ly7r0il2rkGKJjL+;<4e@Xt* z!pF<|mv#gM0@#5-9ocbc3kVJd|GWd~UzQ#{Ll4UYuEYGp`(bHE{D(5Xu0za6`9BdJ zr4KDS(s`&CeCQ?!7%&qY4fU1^@By zm-rFwF!%8J@ctXpPmq7g{LcRe^}kUGKnaIjhc5UxE8q{if4lO?Wxw3|+vdZ(|3lUA zN16Y?`~PF=&@0F7{^i9#+Y2wi_N&Vtdi1!=&*y*S{8bZw)Bl?W{@pzP&~nuIfaZR9 z|E>MEKA@wWXdmD|J2oJ7*pmLx%FAGE`GT)Ps>(Ut|qS*DUIKH*;)d=S2TXFWKI>J z3bv-|U18+DgG33|fG1VvwA?$=ub_Mlyyy1dZ4Rlim(&aGnx@!-4HRmVDMiT_2l@K^ zMz1&T^9fgmDJLH6Q@35XEze6f(i>7(@JPopJx3>W=3q_$es`UH-0Duo@r!UJRgH_)#0#H+Ly$-rYAGLNKv{c*PzB98YdrH`4U1C zA8uG(N=`0#5rpeke-LD2Juyv8*S;6z-(yKHkyejqv}PLCFnMq3%{JAuXKV`?wTUlc zh_*oim|b0xg74r&wQs5ueCXE(&gk_{yA2x(Z}%etc?tWsE)JJ`b?T(D?$Mb^yfBmL z_oG0I^9)N)SR&yl*32#*Wy3j{jPqd5H7|@NM{bmp@U8W|{W6EI52feNW_6$4IiqYS zxvbmZy}9>cf=+8YmYYO!dNcT$k{b2YhXa%b1%XmYf8FB!qL6iGBP@KG19T#6b~w52EtSQ z$enbUQs3UVZW1$}SzM%U4Uz5Yetm^qqSAIzYA4D(PEqv@#8W6Z)b~~^qY3Xv+ya)N zAx`#3($*@PgfH53yi-&rBr57V2bmYT<&4GXBaL{)VhL%vo9UcG*;T#D&6JsBj4LBXm%K=v#TiOYZ3o2Q^U*I zSd58hQ_JpzS7u|m#0lqKYtLVk@qWH(wu3L@5Zm_rxuR5#aEneb>p9f{^Tq%t|~vi`xMVJd@{Q^aE_hRzHa zm-HuH0mUcORj%?}rb5=Xx-ZC#V!z!lcj0)%X+Qr7h9dn4^+ZHS*4QN^Gmb;TV{Qjf zX%4=L(Y&qE$tI!mgu?r+l=p)P%l(@XVpFou!|`3Z)nWHj?uB|To%0Ryf|v?Yan86r z(bsKj+raze7>vB0)KMQvqFGkrBEKz*Aw06QFfZIpTwIXXhlq`E8E0h?PySDnh1-AzDUb zxzPurgne<>WIR`BDd#QAMb{nuto@n`cjkv)C(d~f)|)NMaU};ltBe-LA2GwO7{-dW zE?*f`wPsaqr*umN{=ngCH7}l(>v{S9pTr0Y}oZ`lcv=v|XOSBYsE39M<;OBnA86N5%5_;Orfuy%8MN}j$ zzOIbxmGWi{C*)N2cz^eKoU(#9&wUEUI(0M1(6IX?l!~x-4pF#vX2>(p+P1tB63Jzs z(zvyZL(4nrSYE!yM*gH-Z^MkjF0%8&2abd!9n<+pN)h5f!3%w!TQ4V9EIB7!3yU5W z1zk68>MfAmVAV{Mt9$x3X^mt(i64E@ z6k;I@sc4y7y*e3aZ-2fk=70+ov|<+!V(#lO14`2)RNe6(Cj90I6T}`8^WH%f1#i1L z#aygW7O%|=V)p&KOXo#f9HJSo5)u8VDu{kBQszfeQ7h#+@9GQBK45M)m9Lhp(#PDo z^xE;3WoP?Th8T%!7XFJ#=6x00%MQ0+uG;M|(A>;u3b+LGO4`5k!)3>FCucQas*o{1 zaJH1x`>7vReYCGgNWhfBK4J6Rl>StEb3+J=<#*$aU5izhLAP`nGnkWO^m_I{03P8j z!gAJrW^19!3mdukH&?Np(}VDsao^JkvM%toyZWL+moLX;o?m)@9>bAoF<78C!e{F2 z4y0Ck{!T=#!ojPT&M#`zOkPwfz9)0Do*!CGS@jwu#*nJmvL3#pG>FW4;?X=_y}p;f zfN2{CmQ0A#DGS$=kXIe z2@P*QZJoxRPQI;TbBlZUf-rU?wjSY&zULUjZ4mFys8@Z_|td-rMceFe4eczAGC@!>klb42y7I zYbv;%tD9GK>ubxisfktEDJR<%r^ndeFhpx|`^yLVNv<6V;igIDANRsy<708}u8^AHS8^rg89NJ&C=$f@ zK;DqdpehGu+%}x4gvMTtRNK@TFMBT&EQ37gJ?;s-PHR#K@xnJ}yl>c2wXXG5_nXZ( zPyjN3@Q2d=_72t#Q9w$7%47)DL;Y1eB;Ithcyn~9A$9|)0eSaJ9jA*A80p9}h(Gi( zTS9r|;b|!`n%UGtb&nt1%3j4w3Y;cyfX4c@Ub`|WJ)>_h>EXiTG_J?%achy-UlA9K z;dZ_i1B@LYi3jU+s3x7Uo)E1x+TV&1E+eh)=9!}ZSaLJ5RkXjeiiFh_7i&sw&8sxR zbc{HiqKhj??mu9Xy)U0|`%z^jU*oMNezg z@SAT}m+OcHtq?7FdYsF7*9E10JrSGJ3uuvgk+0e!&)#xIz72Bl$(o!LEg_~A?8%X~ z!o&*V)$i*XyoYGH?Y59NKYH==!dvRx`OJFz!l((-S&g-}9YNFDr-p$_EC(BTn#A0J z%&EB!o1R(Cx}NE6*Eot$XPMoflEE%BBI)Fd!4i45Wpd$C4ZM|N+Rr_GQfft>wK^Uw z4vv&7i@4Pnr?;}IYiY&vAlANhCvcY(wvwwaeUyk~mzHcu{_w=AA|4s07hF^H@Zqbm zYrEg>p=A{p-ae7PTEALb^RUUbQiow3Uoolmt3kxxL5$nDoOb6EQav&3R;XW^f13Y; ziR=c0lCx>)mf0IrcJbK!QPIR%Yb@FwgEp5oz450!h1HaZm@{7wN=jNuTuc&f#f-jz zX+ZB1zDFhedLLU!fY?Xq+l(bIzFx{yOZnXAH#sJ){XIkPhK4kB!L}cte7dLW;5nt~ z!a*w|2DjT#($%^hKsxJ)UvrDInDL70Gi}~W2TS5_3M};0MBHdU(WUKPDfp}uD{$bh zpogS&R6t8k?7~YjZ_nh*W@qA)%W$2YQECa??Pg#! z%WM*}nx=mg`{jeJJC{pk3d|!|Bx*Hnb zP+DwqV8OnF`%Skl$G2}&M$!|Z@6O-y|?6Q+;!X~!ngWK>>#XY$PM!`k2r zTH1jXk-gTvcf#M_?=|=Yd?&7o*uo2yjYjF%UollT}#WJ zVfsO|?910x+e2cyS*R*eRN`!&ADmGS{ zLBbFb9&R4i04IL~1!Fpi1;vO*g7@x+>5IDB(?O_8yRUb=!YCqBRW->sb#oa|bVR?) zhckG|O8Ltfcw2u;YrZ#AAY#0X?&hN$*^r2!4|kg8;tF-s$I+K@`vo$y#t=etNW>210|2@Hlv4zG1^t_J+~e& zAdnsXGd8A+#$MY=APQRZz^;GX%Vj#sM6Y5cdla8-@uXbQf$W#@mg!vJHET zXoI(5C|s7%kUfp0Yj=n9nrS#M(Q6pf@wal5l6_hWi(#TuGsdTAg>e)G`>p|B)Ou4& z@h;zO}k#gQfhmq3luc4==!kcrwbIe znOp7lrmH3)BqknUloMURr3mr!*VCnyOl_E+b{Rcqgu*_rne_y_Q2w9@?xyf140Zcz z`}TDlJuI3od-MZ*K5lQ3;08alTaB4jokuUV#J$0p&AnQGpWY?fcwf5PH>@kMmNME0 zC)Z?Xm;JTCAh(XQBO;sv7CYAb(pcVgbOq+xTUcxkpeUlVt3DVL^+qbU$3$kH z?jau!bibMAPb_ea1H&ePdCi;REG=i0OuU&v~k9I3i zk7KiD@AkfP$e0abHSIkI%U)ud@M`Lft!~l8#YCww(L^(87P{y~Bee-(tHvmo;Tl@^ z=*y1Vgi@^=-N9w_?DY(Hb+09ij^ArRZ@;G%-5BGPeGv2Z^QQb+K8i=noJ8W7=V|P{ zz+a?TbBIdw#4v_)7QEPDB!Kv(Ui(I{2{ zXDYS~g&66VY$~}qnVL_p*1pxfVUR9W&$=IOBR`iyiAhmJocMk!#bN}T!;O$%Q2hD` zp9N6YFb>k^5zJnhIBI^1I^Ho=t=pJLX@Ss(Msfy^Z5rKb8y-w0>y!v9Bk&i6Xd3;v<6k z=JO5bfb!t-1nakqRi$g>#oJR|!l@pUY)uTcFIN4Mn-^3r-6vD8VYW0W^DC-i8h?#q ze&p#`NBPiPsw%)r7N4y%*c3~3*U63O+{HMj_*f4LpU*7o*1ZEN8#Uxsu5S3#U#C+j zYe+4}aoMEviL_qy>4>~Jzq%~WE~y|ca&gLY#jZpo*$TbnVW8u`v=^XEH-i_cR6%KsU*yXWTL7=tv9b{zwgO`t@J8>Cjlo}Ez@32B50(wFV+=tL)zOpx1OdBcvenR752Pbx3kz~=V1#pCntz&EZzOY+h(2bAQIX z50`W7>sOA@-A^V4JC3)tOCw9orS9M@^cRhq81G}`ci;3Q@>+Za4aYRvJ7@E%yw>mu zfld(JeXaDo*?xTmKYEi7szRLWU;XlKJbS7w>5L4Yj!BuGL~p4x&l70Qx@%HbY^B}p zX}^9)MJl;7i;!=ee5pP8q7-z|bQ9hZB5xd)pM zUC9XFq*o_OwYNL67C!`jXh#z+q{ieeZ?UPjDEg>ON;{Rtw#tCpoT)I+zH(bAzrAz6 zR&Q~RiZB>AwgFo@SwoeXJ28&#=~Q={`}OB8?u63UOF`XZV_q(Ngyt27)>=!oRGH}# zzBo`nScAQ~f2$U&fC|<~r}Ym7C8lQi(WBIfBoq$4f%VK z`kp5$u)SGYbr_7*&-`}v5Zl1+!>z3{8ENOeS&zL}sk2#K8SkfEdidSjV8IQY>3%bq zJ!0!O^Jv|-aBhf&_Hq;v7dO^Z)htoaQh8Y4z;NCf8Ijdmi;X^K%=BI4QDR*fKUsgt z`RhGK4Y+tg*a|-k3rjKSKhJ${2=nM7|0i$yBY(f?e{}wf_<67i1&)Gw5x^PepT{YO zXDq)D2-LkC(L9Q1S7S3{S7RPEHxt)Gg0`Z1U6G(V6&B=azWj#yl6gcxDm5H2Jb!YGU@=xk=ruPPz+O9*%pVzhL1b>!#a z@$m5A_JDCaI9u>Q`1tsEz)&72lndbCa`CcvHTLAPcVYUiK?3b!>TKocYUN-LI@D-v z;^5{g#K;KxrPuLqdhK1fj|}5Bb+F?BGI$`|FrGt2Jcp8h)AY-_zfn%rZD#tH$&PN$ zwnqk=new1*(ROHiR~JA%KNClMJb#z|Hw^{q=PyhDaDu0?BVZ-?$Vz~TU;L+;>JARJ!irX=&JHdP=B^+u z2WK-up5ys~e-Y3UzE6aC3~B&q0NW@Ya6 z-;w+q=f7K1fT@a#|9cnM+5Pr{q9VV9gQ?qL9m+}wySZ7J@xvq#NC_B(mkY)#F3H6U z5kqmI5D+LAR15+YmjI*SC`pMUn19M10tG0t_Aai*_NM56N88_IPXQ15A9&&Z50nA= zPa*%3m;d9g|G4X4^1#2u{GZnKA9wvr9{87-|I@nuHFy1-_JNf$uqym(sV)4Er8*EY zD#YjkEX4oG?t$-bI|2zS7e`xTFJO72Zslr=2Dv)Bp$|iY03Ao01_=Bx`scr;)NWpmHxg|68^6_fCBz`G#Cty`ZJ(OXrSskhA2_nnm`<^?SidiBZBXD|D zFD12r$lmr&bJi3-n`ObnYcet*3^+b1Cd*2rK+=nErj^4Pnko8z0{v{^^{VU|A6|!> ztX|0{YpMXn*EL5Q)m$oqRFifAU-=hov2%$dJLa}q~I zaqgyaHcyh9E7yD3`h-JPtFrdbO-abf0UK9{(e2fM}wgM4zfAYbh zFd$^|I1P28TsSWr2zNZjhd6}~br|w^j1Oq^Cun?pC(1y85ht)AfPKbsSp*z%0tW&K zIjN8Dq%0EHLm$%zfuNu#Xi&%reGmi!1-zl~2Q~--bqXJf_qZ((Bp`NN770ck#|A;d zz{lGL1c?A2uOlcFb{HJ{hb=%<=m|eV0e#1923pmLa-k?-ggUMdg@T-rMFGU)e0*T= zalC+GFdz)}c)RBX0%lLpfH2t;G$0`N1PutDJwXHF=}*w$r_g}#-4lF3l>Z6ZDSegq z6db_Ba6%S-3J&-wIDme1QuY)a@KbOch9Muf8GZ^5_$fHxr{F-Gf&+014#X)q5U1ck zoPq;!3J%06IDi1`6W9=^-~h&m6MV>1a3D{?fjk8V(C$y_I|T>aq?(eMz7$5iliE%v2&S-bg bkxe{@n_@LrJK$4RfYXj!jRY3vzpVaWHvsK; From ab84286a4f2270c272462edaad4b5e599f486030 Mon Sep 17 00:00:00 2001 From: Wendy Zhang <57231021+wendidy@users.noreply.github.com> Date: Thu, 11 Mar 2021 13:04:14 -0500 Subject: [PATCH 046/119] Added GitHub unique identifier (#1176) --- cypress/integration/manualTests/basic-enduser.ts | 2 +- src/app/footer/footer.component.html | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cypress/integration/manualTests/basic-enduser.ts b/cypress/integration/manualTests/basic-enduser.ts index 40206aa123..2285eaf2e5 100644 --- a/cypress/integration/manualTests/basic-enduser.ts +++ b/cypress/integration/manualTests/basic-enduser.ts @@ -199,7 +199,7 @@ describe('Check organizations page', () => { describe('Check external links', () => { it('github, twitter, gitter, discuss links are correct', () => { cy.visit(''); - cy.contains('a', 'GitHub').should('have.attr', 'href', 'https://github.com/dockstore/dockstore'); + cy.get('[data-cy=GitHubFooterLink]').should('have.attr', 'href', 'https://github.com/dockstore/dockstore'); cy.contains('a', '@DockstoreOrg').should('have.attr', 'href', 'https://twitter.com/DockstoreOrg'); cy.contains('a', 'Gitter').should('have.attr', 'href', 'https://gitter.im/ga4gh/dockstore'); cy.contains('a', 'Help Desk').should('have.attr', 'href', 'https://discuss.dockstore.org/t/opening-helpdesk-tickets/1506'); diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index ea71dee7a3..f0fabce42a 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -149,7 +149,14 @@

    [autoSetMeta]="false" >
    -
    -
    - + + + -
    -
    -

    Collections

    -
    - - - {{ collectionOrganizations.collectionDisplayName }} + + Collections + + + + - - -
    - -
    -
    + {{ collectionOrganizations.collectionDisplayName }} + + +
    + +
    + + diff --git a/src/app/funding/funding.component.html b/src/app/funding/funding.component.html index 31ffefbba3..6b66e2f9ef 100644 --- a/src/app/funding/funding.component.html +++ b/src/app/funding/funding.component.html @@ -13,23 +13,21 @@

    Funding

    Support for Dockstore is provided by grants from Genome Canada, the National Institutes of Health, and the Province of Ontario.

    -
    -
    -

    {{ funder.title }}

    + + + {{ funder.title }} + +
    + + +
    -
    -
    - - - -
    -
    -

    - {{ funder.content }} -

    -
    -
    -
    + +

    + {{ funder.content }} +

    +     +
    diff --git a/src/app/funding/funding.component.scss b/src/app/funding/funding.component.scss index e69de29bb2..d5542094bf 100644 --- a/src/app/funding/funding.component.scss +++ b/src/app/funding/funding.component.scss @@ -0,0 +1,18 @@ +.funding-img { + left: 50%; + top: 50%; + max-width: 350px; + padding: 10px; +} + +// Not used in most places because we don't have a similar min-height requirement where each card needs to be the same height +// This does not work if one of the funder's content exceeds 210px in any screen +mat-card-content p { + min-height: 210px; +} + +// Not used in most places because we don't images that can't be stretched +// This does not work if one of the funder's logo exceeds 150px height in any screen +.image-wrapper { + min-height: 150px; +} diff --git a/src/app/shared/entry/verified-by/verified-by.component.html b/src/app/shared/entry/verified-by/verified-by.component.html index 534a42677d..bd05e2b2b2 100644 --- a/src/app/shared/entry/verified-by/verified-by.component.html +++ b/src/app/shared/entry/verified-by/verified-by.component.html @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -
    -
    -

    Verification and Logs

    -
    -
    + + + Verification and Logs + +
    {{ version.name }} is verified with:
    @@ -30,5 +30,5 @@

    Verification and Logs

    More Info
    -
    -
    + + diff --git a/src/app/stargazers/stargazers.component.html b/src/app/stargazers/stargazers.component.html index fdab8c05d1..191aae4153 100644 --- a/src/app/stargazers/stargazers.component.html +++ b/src/app/stargazers/stargazers.component.html @@ -14,13 +14,20 @@ ~ limitations under the License. --> -

    Stargazers

    -
    - + + + Stargazers + + warning There are no stargazers for this {{ organization != null ? 'organization' : 'entry' }}. - -
    + + + + + + Stargazers +
    @@ -35,5 +42,5 @@
    -
    -
    + + diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index b685fbb2bf..631bdcd746 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -1,11 +1,8 @@ -
    -
    -

    Launch with

    -
    -
    + + + Launch with + +
    @@ -136,5 +133,5 @@

    Launch with

    -
    -
    + + diff --git a/src/app/workflow/workflow.component.html b/src/app/workflow/workflow.component.html index 5fed14c3c6..56af659b45 100644 --- a/src/app/workflow/workflow.component.html +++ b/src/app/workflow/workflow.component.html @@ -385,13 +385,13 @@

    -
    +
    -
    -
    -

    Recent Versions

    -
    -
    + + + Recent Versions + +

    @@ -412,13 +412,13 @@

    Recent Versions

     See all versions
    -
    -
    -
    -
    -

    Source Repositories

    -
    -
    + + + + + Source Repositories + +

    @@ -429,16 +429,16 @@

    Source Repositories

    -
    -
    + + -
    -
    -

    Sharing

    -
    -
    + + + Sharing + +
    Sharing [autoSetMeta]="false" >
    -
    -
    - + + + - people - Collections +
    +
    + organization icon + Organizations + / + {{ + (organization$ | async)?.displayName + }} + / + {{ (collection$ | async)?.displayName }} +
    +
    @@ -40,7 +50,7 @@
    - +

    @@ -82,7 +92,7 @@

    Workflows & Tools

    ]" class="no-underline" > -
    +
    workflow icon tool icon diff --git a/src/app/organizations/collection/collection.component.scss b/src/app/organizations/collection/collection.component.scss index 0a639bc5fe..80c1478875 100644 --- a/src/app/organizations/collection/collection.component.scss +++ b/src/app/organizations/collection/collection.component.scss @@ -1,9 +1,4 @@ -.orgLogo { - max-height: 100px; - max-width: 200px; -} - -.h5:hover { +h5:hover { text-decoration: underline; } diff --git a/src/app/organizations/organization/organization-starring/organization-starring.module.ts b/src/app/organizations/organization/organization-starring/organization-starring.module.ts index 14bf320556..4dc03faa01 100644 --- a/src/app/organizations/organization/organization-starring/organization-starring.module.ts +++ b/src/app/organizations/organization/organization-starring/organization-starring.module.ts @@ -16,13 +16,14 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { StarOrganizationService } from '../../../shared/star-organization.service'; import { OrganizationStarringComponent } from './organization-starring.component'; import { OrganizationStarringService } from './organization-starring.service'; @NgModule({ - imports: [CommonModule, MatIconModule], + imports: [CommonModule, MatIconModule, MatTooltipModule], declarations: [OrganizationStarringComponent], exports: [OrganizationStarringComponent], providers: [OrganizationStarringService, StarOrganizationService], diff --git a/src/app/organizations/organization/organization.component.html b/src/app/organizations/organization/organization.component.html index 6a93fec2a9..12164b1ace 100644 --- a/src/app/organizations/organization/organization.component.html +++ b/src/app/organizations/organization/organization.component.html @@ -19,37 +19,24 @@ organization icon Organizations / - {{ (organization$ | async)?.displayName }} + + + {{ (organization$ | async)?.displayName }} +
    Organization not found
    -
    -
    -
    -

    {{ org.displayName }}

    -
    -
    - -
    -
    -

    - Last updated: {{ org?.dbUpdateDate | timeAgoMessage }} -

    - - -
    -
    - +
    + info This organization is pending approval by a Dockstore curator. @@ -71,11 +58,11 @@

    {{ org.displayName }}

    - +

    {{ org.displayName }}

    - {{ org.topic }} + {{ org.topic }}
    @@ -87,82 +74,91 @@

    {{ org.displayName }}

    >
    - +
    +
    + + +
    + -
    -
    - - - -
    - collections icon - Collections - {{ collectionsLength$ | async }} -
    -     - -     - - -
    - people - Members - {{ (organizationMembersQuery.sortedOrganizationMembers$ | async).length }} -
    -     - -     - - -
    - update - Updates - {{ (eventsQuery.organizationEvents$ | async).length }} -
    -     - -     -     -
    -
    -
    -
    -

    About the Organization

    - -
    -
    -
    Select edit to add a markdown description
    -
    This organization does not have a description
    -
    -
    - - link - {{ org?.link }} +
    +
    + + + +
    + collections icon + Collections + {{ collectionsLength$ | async }} +
    +     + +     + + +
    + people + Members + {{ (organizationMembersQuery.sortedOrganizationMembers$ | async).length }} +
    +     + +     + + +
    + update + Updates + {{ (eventsQuery.organizationEvents$ | async).length }} +
    +     + +     +     +
    +
    +
    +
    +

    About the Organization

    + +
    +
    +
    Click edit to add a markdown description
    +
    This organization does not have a description
    +
    +
    + + link + {{ org?.link }} + + + location_on + {{ org.location }} + +
    +
    -
    -
    +
    diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index 244cf8490c..6a80ce6f80 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -59,11 +59,11 @@ fxFlex.lt-md="100" >
    -
    +
    - +
    star @@ -71,7 +71,7 @@
    -
    {{ org.displayName }}
    +
    {{ org.displayName }}
    {{ org.topic }}
    @@ -80,17 +80,17 @@
    {{ org.displayName }}
    link - {{ org.link }} location_on - {{ org.location }} + {{ org.location }} email - {{ org.email }} diff --git a/src/app/organizations/organizations/organizations.component.scss b/src/app/organizations/organizations/organizations.component.scss index 5f42207cf2..0b7e9bc9d3 100644 --- a/src/app/organizations/organizations/organizations.component.scss +++ b/src/app/organizations/organizations/organizations.component.scss @@ -13,6 +13,14 @@ .org-topic { line-height: 1.5; color: mat-color($dockstore-app-gray, darker); + // Hide overflow if longer than 4 lines + overflow: hidden; + text-overflow: ellipsis; + white-space: initial; + display: -webkit-box; + -webkit-line-clamp: 4; + -webkit-box-orient: vertical; + word-break: break-word; } .orgStar { @@ -38,6 +46,17 @@ line-height: 2rem; } +.info-overflow { + // Hide overflow if longer than 1 line + overflow: hidden; + text-overflow: ellipsis; + white-space: initial; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; + word-break: break-word; +} + form { margin-bottom: -1rem; } diff --git a/src/app/stargazers/stargazers.component.css b/src/app/stargazers/stargazers.component.css index 87898cf022..d3b5468857 100644 --- a/src/app/stargazers/stargazers.component.css +++ b/src/app/stargazers/stargazers.component.css @@ -15,7 +15,7 @@ */ .stargazer-img { - width: 15rem; - height: 15rem; + width: 17rem; + height: 17rem; border-radius: 0.5rem; } diff --git a/src/app/stargazers/stargazers.component.html b/src/app/stargazers/stargazers.component.html index 191aae4153..be41d52f22 100644 --- a/src/app/stargazers/stargazers.component.html +++ b/src/app/stargazers/stargazers.component.html @@ -28,19 +28,26 @@ Stargazers -
    -
    -
    +
    + +
    {{ altAvatarImg }} -
    -
    {{ stargazer.username }}
    +
    +
    {{ stargazer.username }}
    ORCID {{ stargazer.orcid }}
    -
    +
    diff --git a/src/app/starring/starring.component.html b/src/app/starring/starring.component.html index 437fb96c85..ed2f0d2897 100644 --- a/src/app/starring/starring.component.html +++ b/src/app/starring/starring.component.html @@ -24,7 +24,9 @@ [ngClass]="rate ? 'btn btn-default active' : 'btn btn-default'" > star - star_border + star_border
    diff --git a/src/app/starring/starring.module.ts b/src/app/starring/starring.module.ts index 823c7ce26b..0644fd9e66 100644 --- a/src/app/starring/starring.module.ts +++ b/src/app/starring/starring.module.ts @@ -16,13 +16,14 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { StarentryService } from '../shared/starentry.service'; import { StarringComponent } from './starring.component'; import { StarringService } from './starring.service'; @NgModule({ - imports: [CommonModule, MatIconModule], + imports: [CommonModule, MatIconModule, MatTooltipModule], declarations: [StarringComponent], exports: [StarringComponent], providers: [StarringService, StarentryService], diff --git a/src/app/workflow/workflow.component.html b/src/app/workflow/workflow.component.html index 56af659b45..abd47c778a 100644 --- a/src/app/workflow/workflow.component.html +++ b/src/app/workflow/workflow.component.html @@ -154,7 +154,7 @@

    -
    +
    + +
    +

    Please choose a well-known server to launch on, or specify your own.

    + + + {{ instance.displayName }} + + + + + + + + + + + + + + + + + + + +
    +
    + + + Launch + +
    + diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.spec.ts b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.spec.ts new file mode 100644 index 0000000000..15f764d342 --- /dev/null +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.spec.ts @@ -0,0 +1,32 @@ +import { HttpClientModule } from '@angular/common/http'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { CustomMaterialModule } from '../../../shared/modules/material.module'; +import { UsersService } from '../../../shared/openapi'; +import { UserStubService } from '../../../test/service-stubs'; +import { FilterCloudInstancesPipe } from '../filterCloudInstances.pipe'; +import { MultiCloudLaunchComponent } from './multi-cloud-launch.component'; + +describe('MultiCloudLaunchComponent', () => { + let component: MultiCloudLaunchComponent; + let fixture: ComponentFixture; + + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [MultiCloudLaunchComponent, FilterCloudInstancesPipe], + imports: [CustomMaterialModule, HttpClientModule], + providers: [{ provider: UsersService, useClass: UserStubService }], + }); + }) + ); + + beforeEach(() => { + TestBed.inject(UsersService); + fixture = TestBed.createComponent(MultiCloudLaunchComponent); + component = fixture.componentInstance; + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts new file mode 100644 index 0000000000..afee6c3183 --- /dev/null +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts @@ -0,0 +1,131 @@ +import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { Base } from '../../../shared/base'; +import { CloudInstance, User } from '../../../shared/openapi'; + +@Component({ + selector: 'app-multi-cloud-launch', + templateUrl: './multi-cloud-launch.component.html', +}) +export class MultiCloudLaunchComponent extends Base implements OnInit { + @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; + + @Input() + cloudInstances: Array; + + @Input() + usersCloudInstances: Array; + + @Input() + languagePartner: CloudInstance.PartnerEnum; + + @Input() + appendToLaunchUrl: string; + + @Input() + user: User; + + customLaunchWithOption: string; + + presetLaunchWithOption: string; + + launchWith = { url: '' }; + + defaultLaunchWith: string; + + customDefaultLaunchWith: string; + + partner: string; + + constructor() { + super(); + } + + ngOnInit(): void { + this.defaultLaunchWith = localStorage.getItem('defaultLaunchWith'); + if (this.defaultLaunchWith) { + this.launchWith.url = this.defaultLaunchWith; + } + + // Set the text of the custom launch with field if it's ever been used previously + const localCustomLaunchWith: string = localStorage.getItem('customDefaultLaunchWith'); + if (localCustomLaunchWith) { + this.customLaunchWithOption = localCustomLaunchWith; + } + // Select the custom option by default if it was used the time before + if (localStorage.getItem('useCustomLaunch') === 'true') { + this.presetLaunchWithOption = 'other'; + } + + switch (this.languagePartner) { + case CloudInstance.PartnerEnum.GALAXY: + this.partner = 'Galaxy'; + break; + case CloudInstance.PartnerEnum.DNASTACK: + this.partner = 'DNAstack'; + break; + default: + this.partner = null; + } + } + + get presetLaunchWith(): string { + return this.presetLaunchWithOption; + } + set presetLaunchWith(value: string) { + this.presetLaunchWithOption = value; + this.updateLaunchWithUrl(); + } + + get customLaunchWith(): string { + return this.customLaunchWithOption; + } + + set customLaunchWith(value: string) { + this.customLaunchWithOption = value; + this.updateLaunchWithUrl(); + } + + selectDefault(): void { + localStorage.setItem('defaultLaunchWith', this.launchWith.url); + this.defaultLaunchWith = localStorage.getItem('defaultLaunchWith'); + + // If the user launches with the custom launch option, then save the url to local storage and mark to use it at the default. + if (this.presetLaunchWithOption === 'other') { + localStorage.setItem('useCustomLaunch', 'true'); + localStorage.setItem('customDefaultLaunchWith', this.launchWith.url); + } else { + localStorage.setItem('useCustomLaunch', 'false'); + } + + // Uncomment when we want to create and save a user's custom launch entry + // if (this.presetLaunchWithOption === 'other' && this.user) { + // const url: URL = new URL(this.launchWith.url); + // const newCustomInstance: CloudInstance = { + // url: this.launchWith.url, + // partner: this.languagePartner, + // supportsFileImports: null, + // supportsHttpImports: null, + // supportedLanguages: new Array(), + // displayName: url.hostname, + // }; + // + // this.usersService.postUserCloudInstance(this.user.id, newCustomInstance).subscribe( + // (usersCloudInstances: Array) => { + // this.usersCloudInstances = usersCloudInstances; + // }, + // (error: HttpErrorResponse) => { + // console.log(error.message); + // } + // ); + // } + } + + private updateLaunchWithUrl(): void { + this.launchWith.url = this.presetLaunchWithOption === 'other' ? this.customLaunchWithOption : this.presetLaunchWithOption; + } + + closeMatMenu() { + this.trigger.closeMenu(); + } +} diff --git a/src/styles.scss b/src/styles.scss index 8b167776d7..7a89d30be8 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1466,3 +1466,11 @@ hr { max-width: 200px; margin-top: 1.5rem; } + +.mat-radio-label-content { + font-weight: normal; +} + +.mat-form-field.small-text { + font-size: 12px; +} From c4dc738c00c3df334e2e07fd2750251437075790 Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Tue, 18 May 2021 13:43:26 -0700 Subject: [PATCH 096/119] remove preview label for galaxy (#1235) * remove preview label for galaxy dockstore/dockstore#4107 --- src/app/entry/extendedDescriptorLanguage.ts | 2 +- src/app/shared/entry/descriptor-language.service.spec.ts | 2 +- .../register-workflow-modal.component.html | 6 ++---- src/app/workflow/workflow.component.html | 7 ------- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/app/entry/extendedDescriptorLanguage.ts b/src/app/entry/extendedDescriptorLanguage.ts index f1499db98a..dc88a0bb55 100644 --- a/src/app/entry/extendedDescriptorLanguage.ts +++ b/src/app/entry/extendedDescriptorLanguage.ts @@ -101,7 +101,7 @@ const extendedService: ExtendedDescriptorLanguageBean = { const extendedGalaxy: ExtendedDescriptorLanguageBean = { value: 'gxformat2', - shortFriendlyName: 'Galaxy (preview)', + shortFriendlyName: 'Galaxy', friendlyName: 'Galaxy Workflow Format', defaultDescriptorPath: '/Dockstore.yml', descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.(ga|yaml|yml)', diff --git a/src/app/shared/entry/descriptor-language.service.spec.ts b/src/app/shared/entry/descriptor-language.service.spec.ts index 8665ab2022..4d5034f960 100644 --- a/src/app/shared/entry/descriptor-language.service.spec.ts +++ b/src/app/shared/entry/descriptor-language.service.spec.ts @@ -129,7 +129,7 @@ describe('Service: DescriptorLanguage', () => { placeholder = DescriptorLanguageService.workflowDescriptorTypeEnumToShortFriendlyName(Workflow.DescriptorTypeEnum.Service); expect(placeholder).toEqual('Service'); placeholder = DescriptorLanguageService.workflowDescriptorTypeEnumToShortFriendlyName(Workflow.DescriptorTypeEnum.Gxformat2); - expect(placeholder).toEqual('Galaxy (preview)'); + expect(placeholder).toEqual('Galaxy'); placeholder = DescriptorLanguageService.workflowDescriptorTypeEnumToShortFriendlyName(null); expect(placeholder).toEqual(null); placeholder = DescriptorLanguageService.workflowDescriptorTypeEnumToShortFriendlyName('UnrecognizedType'); diff --git a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html index f46d2fbfb5..29c7a24267 100644 --- a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html +++ b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html @@ -131,8 +131,7 @@

    Register Workflow

    > Descriptor Type: - {{ descriptorType === 'gxformat2' ? 'Galaxy' : ('descriptor_type' | mapFriendlyValue: descriptorType) }} -
    preview
    + {{ 'descriptor_type' | mapFriendlyValue: descriptorType }}     @@ -227,8 +226,7 @@

    Register Workflow

    *ngFor="let descriptorType of descriptorLanguages$ | async" [value]="descriptorType" > - {{ descriptorType === 'gxformat2' ? 'Galaxy' : ('descriptor_type' | mapFriendlyValue: descriptorType) }} -
    preview
    + {{ 'descriptor_type' | mapFriendlyValue: descriptorType }} diff --git a/src/app/workflow/workflow.component.html b/src/app/workflow/workflow.component.html index abd47c778a..a3529a6e42 100644 --- a/src/app/workflow/workflow.component.html +++ b/src/app/workflow/workflow.component.html @@ -63,13 +63,6 @@

    - preview -

    From 063dc3adff758c1123b4b21d4ac7f4d594f71a63 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Wed, 19 May 2021 12:10:46 -0400 Subject: [PATCH 097/119] Add frontend pagination (#1236) --- .../organizations.component.html | 8 ++++++- .../organizations/organizations.component.ts | 23 +++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index 6a80ce6f80..23ebb5655d 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -20,7 +20,7 @@
    -
    +
    {{ orgLength$ | async }} organizations
    @@ -114,6 +114,12 @@
    {{ org.displayName }}
    +
    infoNo organizations found diff --git a/src/app/organizations/organizations/organizations.component.ts b/src/app/organizations/organizations/organizations.component.ts index 7692b081be..04f1ae15e0 100644 --- a/src/app/organizations/organizations/organizations.component.ts +++ b/src/app/organizations/organizations/organizations.component.ts @@ -16,6 +16,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; +import { PageEvent } from '@angular/material/paginator'; import { Observable } from 'rxjs'; import { debounceTime, distinctUntilChanged, takeUntil } from 'rxjs/operators'; import { AlertQuery } from '../../shared/alert/state/alert.query'; @@ -34,11 +35,13 @@ import { OrganizationsStateService } from '../state/organizations.service'; styleUrls: ['./organizations.component.scss'], }) export class OrganizationsComponent extends Base implements OnInit { - public filteredOrganizations$: Observable>; public orgLength$: Observable; public organizationSearchForm: FormGroup; public loading$: Observable; public isLoggedIn$: Observable; + public pagedOrganizations: Array; + public readonly initialPageSize = 9; + private filteredOrganizations: Array; constructor( private organizationsStateService: OrganizationsStateService, @@ -59,7 +62,12 @@ export class OrganizationsComponent extends Base implements OnInit { // The real loading$ is currently not being used because the alertQuery global loading is used instead // this.loading$ = this.organizationsQuery.loading$; this.organizationsStateService.updateOrganizations(); - this.filteredOrganizations$ = this.organizationsQuery.filteredOrganizations$; + this.organizationsQuery.filteredOrganizations$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((filteredOrganizations) => { + this.filteredOrganizations = filteredOrganizations; + if (filteredOrganizations) { + this.pagedOrganizations = filteredOrganizations.slice(0, this.initialPageSize); + } + }); this.orgLength$ = this.organizationsQuery.orgsLength$; this.organizationSearchForm .get('name') @@ -84,4 +92,15 @@ export class OrganizationsComponent extends Base implements OnInit { createOrganization(): void { this.matDialog.open(RegisterOrganizationComponent, { data: { organization: null, mode: TagEditorMode.Add }, width: '600px' }); } + + onPageChange(event: PageEvent) { + const organizations = this.filteredOrganizations; + const length = organizations.length; + const startIndex = event.pageIndex * event.pageSize; + let endIndex = startIndex + event.pageSize; + if (endIndex > length) { + endIndex = length; + } + this.pagedOrganizations = organizations.slice(startIndex, endIndex); + } } From f141ffb3086aa1c3bafe174831b4a90a0179702a Mon Sep 17 00:00:00 2001 From: Richard-Hansen <36607471+Richard-Hansen@users.noreply.github.com> Date: Wed, 19 May 2021 16:45:48 -0400 Subject: [PATCH 098/119] Remove doubled redirect (#1237) --- src/app/loginComponents/auth/auth.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/loginComponents/auth/auth.component.ts b/src/app/loginComponents/auth/auth.component.ts index 988e2bf276..f45fefb37f 100644 --- a/src/app/loginComponents/auth/auth.component.ts +++ b/src/app/loginComponents/auth/auth.component.ts @@ -95,7 +95,6 @@ export class AuthComponent extends Base implements OnInit { if (provider !== Provider.ORCID) { this.router.navigate([`${prevPage}`]); } - this.router.navigate([`${prevPage}`]); if (error.status === 409) { this.alertService.detailedSnackBarErrorWithLink( error, From 106cb15b32ac489bae0425ae62c80303516a5bbc Mon Sep 17 00:00:00 2001 From: NatalieEO Date: Fri, 21 May 2021 10:19:45 -0700 Subject: [PATCH 099/119] feature/3764/UI fixes for Galaxy launch with (#1239) * fix bug that saves the default, couple of UI changes, don't require users know the pattern for the launch url; add it for them. Which also means we should not save the pattern to the db too. Add the logo and get the hostname to form the launch redirect. dockstore/dockstore#3764 --- src/app/shared/dockstore.model.ts | 3 ++ .../launch-third-party.component.html | 4 ++- .../multi-cloud-launch.component.html | 17 ++++----- .../multi-cloud-launch.component.ts | 20 ++++++++++- src/assets/images/thirdparty/galaxy.png | Bin 0 -> 1754 bytes src/styles.scss | 33 ++++++++++++++++++ 6 files changed, 65 insertions(+), 12 deletions(-) create mode 100755 src/assets/images/thirdparty/galaxy.png diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index b29469500d..a444d13c23 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -21,7 +21,10 @@ import { Provider } from './enum/provider.enum'; export class Dockstore { static readonly HOSTNAME = window.location.protocol + '//' + window.location.host; + static readonly HOSTNAME_NO_PROTOCOL = window.location.hostname; static readonly API_URI = Dockstore.HOSTNAME + '/api'; + static readonly GALAXY_IMPORT_PATH_PORTION = + '/workflows/trs_import?trs_server=' + Dockstore.HOSTNAME_NO_PROTOCOL + '&trs_id=%23workflow/'; // All the following properties will get updated by configuration.service.ts. You do not // need to update them here. Set them in your dockstore.yml for the web service. diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index 8ec65d3682..c7a3e7563d 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -123,8 +123,10 @@ [cloudInstances]="cloudInstances" [usersCloudInstances]="usersCloudInstances" [languagePartner]="partner.GALAXY" - [appendToLaunchUrl]="'%23workflow/' + workflow?.full_workflow_path" + [appendToLaunchUrl]="config.GALAXY_IMPORT_PATH_PORTION + workflow?.full_workflow_path" [user]="user$ | async" + [imagePath]="'../assets/images/thirdparty/galaxy.png'" + [className]="'galaxy-launch'" >
    diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html index d1d8921bca..e70e7f0f44 100644 --- a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html @@ -1,4 +1,6 @@ - +

    Please choose a well-known server to launch on, or specify your own.

    @@ -29,14 +31,9 @@ - - + + Specify a url... + @@ -51,7 +48,7 @@ rel="noopener" [attr.href]="launchWith.url + appendToLaunchUrl" color="accent" - [disabled]="this.presetLaunchWithOption === 'other' && (customLaunchWithOption == null || customLaunchWithOption === '')" + [disabled]="(!this.defaultLaunchWith && !this.launchWith.url) || (this.presetLaunchWithOption === 'other' && !customLaunchWithOption)" (click)="selectDefault()" > Launch diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts index afee6c3183..834c9772c7 100644 --- a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { MatMenuTrigger } from '@angular/material/menu'; import { Base } from '../../../shared/base'; import { CloudInstance, User } from '../../../shared/openapi'; @@ -25,6 +25,14 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { @Input() user: User; + @Input() + imagePath: string; + + @Input() + className: string; + + @Output() closed: EventEmitter; + customLaunchWithOption: string; presetLaunchWithOption: string; @@ -37,6 +45,8 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { partner: string; + expanded = false; + constructor() { super(); } @@ -86,6 +96,14 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { this.updateLaunchWithUrl(); } + toggleExpanded(): void { + this.expanded = !this.expanded; + } + + menuClosed() { + this.expanded = !this.expanded; + } + selectDefault(): void { localStorage.setItem('defaultLaunchWith', this.launchWith.url); this.defaultLaunchWith = localStorage.getItem('defaultLaunchWith'); diff --git a/src/assets/images/thirdparty/galaxy.png b/src/assets/images/thirdparty/galaxy.png new file mode 100755 index 0000000000000000000000000000000000000000..abc99c1f339291d5c3d7832b74213e228c500f26 GIT binary patch literal 1754 zcmV<01||84P)Px#U{Fj{MMrQ&ThYEMSXf%ny(!VXD$uf^muZnyu$utmx2c>5tHN25a5g`iB2#TNh&K1~xR{f}5Zb%F7@8Ygz}p97eZ z{RjZU*?FE?<1_D^coYCKa6TPuCiuGmNOx%`i6O9UcYnpgz74=I^9!51vu;w?&oyDl zB1Sa-UI1#IE{xk_`G)FE&@f6$DRzqK9RQK-QvfG!|26>OYRZs7u8SKYgaSYaD)HDm zW1JhkT$i^65Z$m(UdHuaQt%SA*m{>JmySPFUvVb@Srdqv&2``DT*RUuIz*=2VtEWw za8eur2s{KEF=w}lvu^OoOZZ4E$wFm2YC5>G`{5==xPtEjAbJRZ9`>m<*c1_J)54qH zG+St|EdV-fykfDj98aorCKhcmyp9y6VTR>@iCW&Lz>|IiU_JnV3gGF!J%qGS+U+04 zwK)PXhgXt7bBEUDo64v?Dt^q>(nB?GF)E!SZKTqdwg(`~ZId=v6rBO^bnn_<{RM#N zHZN_se~hFaaJA!-Rg2GNa`6tc<{Z6~l{urzT1fP(Q9Xw<@{ z=K>X`_~}mejKilU>qZp$q~vJiA@;P+*oPcX^$zDD{nf{omUK}-7pAGk#wrNoRr1W+RogU{hrvFTUgM5XV|5Q_k@4*-bBcP@H$7U>eF zTA#I$n;p;5hcfPy3u$}ONgF-U5StXrSsf$LwtN6U{m`+g%n8#a0E$guy6_#}QKN8d zeW;=J*|ip~4y9RWy#_`KEReC2jJ=z6h}4OPyy zbAldViSR@M{0xi5r9^jHqsx2unskY-0f}v0(?2b zJMzsDs63&&qT&2G00{~K8BEvYUTXjdpsZFNlrZXZ1{LN@W{zDHg)1go*mWr`u|@#! zE%3&30OK}i3V<~Nz8(2M6_tP^U^Y_p{Hk!iN@Qufs~lC8i<$_)M_u8c1E|fo!rVom zrX&GEGjw0Zyo!y3J+(%k$|$j!nHH@w@zCQuV9+K4<>TCeU~wM<@NM6R2nY#TiWKY> z>&32&VF!<++|%3N(ca$PUS3{aqdh-AzrVjHEVQYDT3|B^LmayNXxAF3^3lZ@Mk4Oc z0YEMjg_GB)TA?Y2DyV7C_JzF8vxU$O0RAfW`}ePeBcn(dA_UPKs*rVB(F~zQbo!O4 zS!zKYna^tg*Jj*BuYl%;2dJwG4#$ikyF#vPyvm@hy)Wxe0CE_f3jo@L3kSA2R#}GR zG0FJ_8&AXHIRF~?avqlWdaY>z;pAv+=7E)t@j{*CY$AF35`aiUNFS#+ol;tu796TV zc~4{`YI)kSB?6TPp&mdL#h=8sjMolu0^s*&0AeKv#5O8|AsceHpu+-=S<_Eh8Uld) zxeWErlI3tl#a+){CT>m9m37OhVfnj8V-4 zDDTV=&A1WM-MM?b+UG+SV3k|*xgG&|m+not1+Bl(0}Cy~7To45mz@&T)32O9u=k literal 0 HcmV?d00001 diff --git a/src/styles.scss b/src/styles.scss index 7a89d30be8..e540881b4c 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1474,3 +1474,36 @@ hr { .mat-form-field.small-text { font-size: 12px; } + +// Style the float label of the mat-form-field +.mat-form-field-appearance-legacy.mat-form-field-can-float.mat-form-field-should-float + .mat-form-field-label:not(.mat-empty):not(.mat-form-field-empty) { + color: mat-color($dockstore-app-accent, 1); +} + +// Keep the outer circle in a radio button gray even when selected +.mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { + border-color: mat-color($dockstore-app-gray, 2) !important; +} + +// Remove some padding from mat form fields that are part of a radio group +.mat-radio-label-content > .mat-form-field > .mat-form-field-wrapper > .mat-form-field-flex > .mat-form-field-infix { + padding: 0.5em 0 0.5em 0; +} +// Align the radio button with the form field (only applies to form fields that are part of a radio group and is due to the style directly above) +.mat-radio-label-content > .mat-form-field > .mat-form-field-wrapper { + padding: 0; +} +// Center align the place holder text in a mat form if it's part of a radio group. Gets out of alignment because of styles above. +.mat-radio-button .mat-form-field-appearance-outline .mat-form-field-label { + top: 1.4em; +} +// Align the floating text in a mat form if it's part of a radio group. Gets out of alignment because of styles above. +.mat-radio-button .mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label { + top: 1.8em; +} + +.mat-button-wrapper img.galaxy-launch { + width: 95px; + height: auto; +} From 1294353d2cf580a8c0af8cb35b5caa1655120a22 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Wed, 26 May 2021 12:54:21 -0400 Subject: [PATCH 100/119] Launch with DNAstack multicloud (#1244) * Add DNAstack multi-cloud launch * Fix test * Add alt description to img * Move launch with styles from styles.scss to component.scss --- src/app/shared/dockstore.model.ts | 2 + .../launch-third-party.component.html | 285 +++++++++++------- .../launch-third-party.component.scss | 40 ++- .../launch-third-party.component.spec.ts | 12 +- .../multi-cloud-launch.component.html | 16 +- .../multi-cloud-launch.component.scss | 4 + .../multi-cloud-launch.component.ts | 7 + src/assets/images/thirdparty/anvil.png | Bin 0 -> 11133 bytes src/assets/images/thirdparty/dnanexus.png | Bin 0 -> 26422 bytes .../thirdparty/dnastack-multi-cloud.png | Bin 0 -> 12035 bytes src/assets/images/thirdparty/sevenbridges.png | Bin 0 -> 13495 bytes src/assets/images/thirdparty/terra.png | Bin 0 -> 9276 bytes src/styles.scss | 5 - 13 files changed, 243 insertions(+), 128 deletions(-) create mode 100644 src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.scss create mode 100644 src/assets/images/thirdparty/anvil.png create mode 100644 src/assets/images/thirdparty/dnanexus.png create mode 100644 src/assets/images/thirdparty/dnastack-multi-cloud.png create mode 100644 src/assets/images/thirdparty/sevenbridges.png create mode 100644 src/assets/images/thirdparty/terra.png diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index a444d13c23..11ca7867ba 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -25,6 +25,7 @@ export class Dockstore { static readonly API_URI = Dockstore.HOSTNAME + '/api'; static readonly GALAXY_IMPORT_PATH_PORTION = '/workflows/trs_import?trs_server=' + Dockstore.HOSTNAME_NO_PROTOCOL + '&trs_id=%23workflow/'; + static readonly DNASTACK_IMPORT_PATH_PORTION = '/import?trs_server=' + Dockstore.HOSTNAME_NO_PROTOCOL + '&trs_id='; // All the following properties will get updated by configuration.service.ts. You do not // need to update them here. Set them in your dockstore.yml for the web service. @@ -92,5 +93,6 @@ export class Dockstore { static FEATURES = { enableCwlViewer: true, enableLaunchWithGalaxy: true, + enableMultiCloudLaunchWithDNAstack: true, }; } diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index c7a3e7563d..11a006d0db 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -12,147 +12,216 @@
    -
    -
    -
    - Warning: this version of the WDL has imports, which are not supported by DNAstack. Make sure to select a version without - imports in DNAstack. -
    - DNAstack » +
    +
    + Warning: this version of the WDL has imports, which are not supported by DNAstack. Make sure to select a version without imports + in DNAstack.
    -
    diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.scss b/src/app/workflow/launch-third-party/launch-third-party.component.scss index ec375a0683..b32e495f9b 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.scss +++ b/src/app/workflow/launch-third-party/launch-third-party.component.scss @@ -1,12 +1,14 @@ -a { - margin-bottom: 0.625rem; - width: 18.5rem; +// Old launch with buttons are the blue buttons used before the UI redesign. +.old-launch-with-button { + width: 20rem; max-width: 98%; - img { - width: 24px; - height: 24px; - } } + +.partner-icon { + width: 24px; + height: 24px; +} + .import-warning { font-size: 11px; font-style: italic; @@ -20,3 +22,27 @@ a { transform: scale(1.3); margin-right: 0.3em; } + +// Styles for redesigned launch with buttons +.launch-with-button { + height: 4rem; + width: 20rem; + padding: 0.5rem 1.6rem; + line-height: inherit; + text-align: left; +} + +img.partner-launch { + width: auto; + max-height: 100%; + max-width: 80%; +} + +img.galaxy-launch { + width: 95px; + height: auto; +} + +.partner-name { + color: #151c3d; +} diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts b/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts index 01038cfadb..3f6a736e0a 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts +++ b/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts @@ -57,11 +57,13 @@ describe('LaunchThirdPartyComponent', () => { // Verify urls are correct; got these from prod (except for Terra, which is new) to verify there is no breakage. // tslint:disable:max-line-length - expect( - nativeElement.querySelector( - 'a[href="https://app.dnastack.com/#/app/workflow/import/dockstore?descriptorType=wdl&path=github.com/DataBiosphere/topmed-workflows/UM_aligner_wdl"]' - ) - ).toBeTruthy(); + if (!Dockstore.FEATURES.enableMultiCloudLaunchWithDNAstack) { + expect( + nativeElement.querySelector( + 'a[href="https://app.dnastack.com/#/app/workflow/import/dockstore?descriptorType=wdl&path=github.com/DataBiosphere/topmed-workflows/UM_aligner_wdl"]' + ) + ).toBeTruthy(); + } // https://platform.dnanexus.com/panx/tools/import-workflow?source=https://dockstore.org:443/api/api/ga4gh/v2/tools/%23workflow%2Fgithub.com%2FDataBiosphere%2Ftopmed-workflows%2FUM_aligner_wdl/versions/master expect( nativeElement.querySelector( diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html index e70e7f0f44..d2ec092c19 100644 --- a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.html @@ -1,6 +1,16 @@ - +
    + +

    Please choose a well-known server to launch on, or specify your own.

    diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.scss b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.scss new file mode 100644 index 0000000000..30f5a4d0e8 --- /dev/null +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.scss @@ -0,0 +1,4 @@ +mat-icon { + float: right; + line-height: inherit; +} diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts index 834c9772c7..4b9d8d1cc6 100644 --- a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts @@ -6,6 +6,7 @@ import { CloudInstance, User } from '../../../shared/openapi'; @Component({ selector: 'app-multi-cloud-launch', templateUrl: './multi-cloud-launch.component.html', + styleUrls: ['./multi-cloud-launch.component.scss', '../launch-third-party.component.scss'], }) export class MultiCloudLaunchComponent extends Base implements OnInit { @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; @@ -31,6 +32,12 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { @Input() className: string; + @Input() + disabled: boolean; + + @Input() + tooltip: string; + @Output() closed: EventEmitter; customLaunchWithOption: string; diff --git a/src/assets/images/thirdparty/anvil.png b/src/assets/images/thirdparty/anvil.png new file mode 100644 index 0000000000000000000000000000000000000000..23d02a3001bb756ae7024273b039a39f319c5fe9 GIT binary patch literal 11133 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 H(~$oMHt2{O literal 0 HcmV?d00001 diff --git a/src/assets/images/thirdparty/dnanexus.png b/src/assets/images/thirdparty/dnanexus.png new file mode 100644 index 0000000000000000000000000000000000000000..4e3abc4ff0b089ec7365efba93e9e47b2b758cd4 GIT binary patch literal 26422 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 W`v&Y=mj4dE0q7%)b!xQG;r|be7b187 literal 0 HcmV?d00001 diff --git a/src/assets/images/thirdparty/dnastack-multi-cloud.png b/src/assets/images/thirdparty/dnastack-multi-cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..843a189b55bb5d0f523fa08face1c98e5ba38656 GIT binary patch literal 12035 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%0Ax1WL1F#$YHV3 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/thirdparty/terra.png b/src/assets/images/thirdparty/terra.png new file mode 100644 index 0000000000000000000000000000000000000000..fc87ba33633eff9bd29865482d8ff090508ab0e8 GIT binary patch literal 9276 zcmV-CB*WW@P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91!=M8I1ONa40RR91Q~&?~06Hh*o&W$Nrb$FWRCodHT?v#F)w#Y^)!oyx zZ_EZW?5K$1GOjT!DiSybb6%dPSxnx`iyEGaOX3pEQO z2o7#U5SJ(@3bGB$z`$(G*4|K8k}Ymaz)y#}Q12pmZ;C?_rW=Fnh7ls_(Sozy+G3 z-7b8}Ig$&28}ubaK_NN}Q+dg68uQ=1`jypvDevX=M!;pmoOD$&%PeVQpUzyvaVIQjsHt~782(H>F6 z{xIxNK$@m0VdxY86cK&?s=2Q&Wj3om@92#{Z${wYgW>7f+UYx6rYe4MyHM0~Ns^}C zvq(g$CGpdGzaXP&45^~AQxS%$GOius(-Kor z?pb~H(vNyG2wom<1ULeur-Kuq7o1ZtV_e9u-iq~s@2aX2aMKIoiJ!ASi9e_bk>$ti zk8=XTB7Wvg6_~dbfY{Zp2yzU~rzjjAxdF*}pH(2j$x#GVN?rAt?b& z0GFm|dPFzBR3rLtw2HhZS6;HXy)RXId5^9UI3O@oFRJ#d?Io8g0reJGh)%Hd0*m;0 zB#{R|>_Lb zUhqc18i788;mn0IE1}W;0!|Y@Ff}#Pga%6)U(WoL{T-BEf`kE{79uaGi?PMJD8!M# zkqALNK|(R7sY4TcF|#+~uLIU1nFT*Q_BtT56ChX#)+gZpBH$l)RvqEB`PO`oZiUIL*aFCxYjM??Ui;k7-) za{~#Cc1_en2WadBFaQ(={xV<6fIMwfs@tMUbwUxK5TMYFh`tW-ced8&zO;7U;!w&u zy$oqR0tqzY*3;7$&YT5>^bW}0r@>)P<%u3{TFDsr6 zBhj<|PH+gxF+kXj07x6IWdhP9cd-iDkI3c<2;^13(g2HQh)t31jJ4NiK19ihY?7zH3$mLq$5 zf3C?5*l?~XaD9RL1^=3HPCdgyX^d+isz*Su5zwzym||guS|2f$-v--!PkOE${dqcr zw+v}2A)J2S^sfN`e^C7Dcq0VD?~;K?SXDVXtVA(dODN}bF}f%uMi%Oh`hipa{=|_R z&^kqkh5&>X=oby-8u+ug20MvaKQ$nb5pLqNJhd9SzSO51cdWejwa@$0F0ahs8v)Wu zES!G-^vQ~9#v!;DG3`{C2@`^4vFCfhZYD{`>dlRdJ;4u*!=zA z6jZ?X?APQu0o?|%%2i~tDk7Iqm9TCoZ)>`F4c@R@XC-;Z^c?}r^U+X!-?ZTn6J7)r zl*a=>rh1 zVj->-T!e5(w&Z{czz{W66BRgCR$h4GKejLZ+*`d)9;vj7p@boWs``GZ__eAeARyIR zN9dB6x=JJ-NPx_D41iFXe|R}UVoSQO*j_5l1j5L|h&Z++ES>(c{DvsciaG$Y-HrhX z@PZAh0p)9^(eWRSdA!K98UYE0Gar~S5mV_URFv(31Vs}n3EeF)j~{Cd$CUyIc>@Co z_O`N(CEyTT>!8?|jn!`n2xP>ib3h?IWR$_Id{OnHS;L((d9mp-0ul_mZeF4W)PNIJ zkWlz80mTldK*GxK8RGb|uqcOu&6#+h21S8cI9r#Cegp>rF@zif4R&lcBB6MzP^hc0 zL^pY$_RDM6!5IO9f%cQhu(LbXNTo9q9;PH7dte+zjuXqnq9kiz13|W(?G2c434tFK z`-8tcw7<9~K(L^07O19vlB~n~N!t-nr{6O@3tD8AlbMM0BAxCa0`WXPkeG5oR1+)0 zA|FQ=EX5ZY5a)bjcgTJi#&eXQv8ree>Sffk~DgNp`;-bvIW zAefd%KtxpOwsENXpl5Zc=6*5eP}OfLX6d1-JKgGa1p`G1zQ;_$7y&nIzMV!<3ES6+ zp?THfgrT#07z+jEbg`rPL$P+}GXR9^ZF;EV5GJ7?82~!_*M>Lf2#%!C)qi^FwgUIS zh8NO&1RSZ90HBi_ZSp>>F%-ht&6+_CGa`y|#)(nIQ+pg5KnLPRP<*;$aSyht9;-N{ ziQJ@sdP8eibJPup4~mEc44wKMGab?vdX*pU5pV_rT49+~xvdKU0er|nv1i}@FT}?B zWnD4wXw5ke3vZQpJ+nn@Z+c&H1ruIwJ6k@+tV^<@o`D(=*Bv+`GcB5K#j_l9E3|bY zt^1lz6G-W0y38E^gZgmCSPTh08;fsyTBG&G61q;g-rp$6U^v-c30zatX;npLL17&Rb0+=$<3Iv|5L+?r*%puY$ljrFm$ z49E?UEu`-k;mCfhC-`L>X`-06-Xf_;p_h9cJ$Ec#O5#))0!WjcwD*U`ZD1wd^06c34zPzh=| z;*^p9DMl7ehC?5|PQ`#^-3W<#aF`EjAD7@#g-;aajutb&etw;j_y=~b)JJIu+HSqmvYcjy47t(kHlEDB9;6fY419AnLRjFjs zveZppy&DnE^rw%QBgU71E4cvhLt-z?8YPylyI$;T{R&(s09_>ygsF-%hF^tM;%r$C zo=*T@0OwG8k)8=|Q(bihz-6V=G86zPRm9~%*^kD@-<0L@M*LW^xKFnKRdNWfLX!iA zI%RZxcG*|snTA>~RC6A1cRv(Q6WQ*k~0WYEOG*6V&bsNu!~=nIJR`A_;UBl zQor$mqh$qj(bSnV46=L#K;Uj1sYIzhjLLw^S~7gfY=GcKGoqhmJ@e=h&zln=MxwN8 z(m#Bva`TQYZ+__3fpDAo9TZp?pWddbKd7ucZ+S=wKZWm)ecehkfQYa!^d7GHhYd-L z`FOCGSm``|wn-UXI$}!swz|)rLVJcYj_raR!fjR@!7y~hq*F0@|FR|Ac|I~?`tB-( z3y>A2RQ`1s5IL8siuUumZ8e`VixrZnK)x0UFvvS27s1hl*CkO`p8^4p8ytpxRkHwq zcCl*fBC&PfO3dJXS@o8^?}#C}$BLo(Crj>tH|=8e>(Dv=h1q+}w#UGsFyrH2RIgxb zxD9=q_+-b^V)fSF%XFz4qdfENY{4${aUzl&K5!bsd&<~bMJB+P6DWab)dWsNpit{c z4jf2sb;%t#oYIp^46c}wBc}#ib^S467?(++ac{nY;hYxM&G*ZOPnlDL7x|( z%oV%0u6V-AoluZ>;d+AQg27Cj754)SB#gch1qirn!HtS;2+FHp3xaqv0Ei4pVeMgZ zNiNKhkh_~g?y#?Ylg!7w1cWTW1|jI=6m6Sh>8b<_%d?FneCh<$Wzb>}JUh`Ik{ns4 zQ;9~h41B-Ak3PqbFpE({YR6QPJoM3WgZZ~?;`Hpch_M`4|`h% z&*2wNK#=9}y?~zT!6SHpuJiUhh)*h4I%4X>cu?0PZ#NOy3)-$xcLu&G_!t0jftA!f z9V3PhJ_|9lCXpBza0*cYU&z6xz(tu9V`OySeo%=2xM0`a7uL+sp9-TT?Z4D5ass7d zOvyA+0&{Ovcfft{Kj{-ZHoRH5n7Y-dg?TsB@rT&H<#u4(WbHKFKs(I|bmzrK6b$pX^XAPv9)Csx7&s#)d2^y938M-75OJr8{sf9j zlSkhKP{Fimffx5G&N>Fw9V~*wP8eBZ#ku3|gl>_%-ajs;EB z$yMzG;Sl6Heuz^ODlQg9*`uTgwPxERSoheDw&Nc}rHZ^$#hD}LB((vXa!2(Bi|Ba- z=E)5)a0d;lNjE-15r(4QhT*b$+tmtnz8wfm*t5B27Zl*{g+ydM#yDo8!|+^QSvmXW z+S=3~e}O(Xf7jL(KL=5Bj_E^CBCu~@UGZ+7r09; zV391=QJIypy;I>{#PP}ceL2|u;yA2}bcl_6Ul;4^p2ylqW>;GkEczu(D6v{OMM%A& zYrTQ3qiPr1rqV_>v4Vr}q0R-0@#nR*%eR+SO@0Cc`IA_@ zY34_Kd(OmlO)Spg1a$LG|A0VpFc)A!(G>{R?KFHnEgss2PYvx@^8$=u&H)qS2hd3q zz<_nJVay%l47{L8m4r_&5g$kooGDwe-jG4Ft1Ue~uhThKfa~|K$BfOjgoImmWlwaK zaH=C!9M?2dX{iGLigd_z3A&CDx&$Cs!W{!TmjS&Yh-9ueuxoTkl)L7n5fIpSGt~BP z_)Q!L(|kSE439beefuLfBIX&WvWE5c5LWe_BXrfKDAMfOL)~J{nun=`uI?$1Jq>z8 zy?n@V2{5+E*PdeoW4U0s5xUeHu-?!Yy&+D-e0;5LMNn)NOB;(lN)9N5Y5=#n}G{${APQaVF6=cPLLgp z|525V<-^ZEK0eBRZW!U{gN#p5%+c|e1L?eC)OjPYSMEd*#8|kn=i``zNgyhcn8tXw zwn{J%^&|+oCfH{Hs~`!Z8DMZrxAIv>%IaJ&>j*c=RpqlsT@M9!9A?~BWQiv;m{DOS z-PPo}o?}(%dSsg-sJ9tnSaH^9aZKq9a4#&T;r_I?u`NS#sH{5&dgqeku~`H?zX!o1 zL7GkhGvH8;ReXRoc z8sA40RBebeRH$QCCo3aj7@}epmEvwn<-J3CJJ#v{4qv5Hq<(O6<>j%G$tT@qWg6rF z8V?wvB9bjVnl$)-6;aXa*(_CW@v>m5EQc$-ymHbRoucj;+^_0D`WFKO0mMHyG9c}7 z#^f&6+$V`Mrwll@!acu`ObDicWAGg1`#A@Ak&k; zN}{+CfosLzz#*2%72|jUj@A)%=hn0g5c(GJ+`oP-qv_Qe@1nt0?QPv4{_m43Bnara zN`=`9R=wMsJ^+{bQ22aU?e1CuxAMp%l%fdSJ>u(T-|39VmZ!4|1|DsL{n>)U{t@vc zm_7!zA7%P@ixk=EhEY~E`7!h<5eSM{qnW;+?%MXo3VRh;alRbNlRFqN7!n9HCuU%S zEjJ~a6*qSvcV6NxsJMoqtg@bNAXs_e{!RA_1Ul(Ch3;}7)UG@haVO?ydQ=g1PKO9b z0H8uBec&%NHYA7mvLp@yoF6w~J37D>*ne`uGz@zj`t)htwm0u}h#&A#<)h9$6OSrk zodJ(+i!W1~vEz$3>igP(1XkCKwS=C4K>8rzkVDu*l)!qXAm(xU7Y`sS-Cn z1lAJ+15K-Z*S7`Y0?(ZSXUlfz3|wLOOK*q8C_;#Dv)PUDm$rTX6>vVL%upR)u z+x-vg+&W@jyRdZBxe2qYm1aK<8#}eq9(P2qO;K*YKPZzXMAra!^?+Mq3=CF=-T3TN zN5ol7AOX>u#BVeYW-&tc1A4-SdY`DnC$6}07&#&h1k|0=HNd^%Bg|rJ68Z;28XoH7 zBjM7W5O2HS%Riw`{a<*uVSz2_h+Sd|OZu7;g#5GI8iYO;VBO*8Zs`eNh|ZQm?7&O% zZZjm6%>A8%mopH=odCl6JwCC$*(bRm`%P<7J2;-J^}uZe2U$E8CFj|j3<5g2HDY{- zmucv*mJmuNOwEBm&rOQ1zl*Uc#H4XUY31Za@bXNcorFS%?ZW&x=~kvW8=kCJ+T+Vd zOgXnr*WX9`$Jo>0@SnrDm^I1DK*HchKDT4W9EM%=_#L-+J%Z`f8@R4J*aCsjj<$ae zjywbza`KWzFuPv%;G=KP$HiAN;t2f|WECuJXl<+qn7M02EXemRswQ6#4frFNld(aF zc@o~Hb6<7EtEepO^Q$3v!D3tLI4yuQ;syw&5e$4c+9D=aG|&Tqz?YQP?eWXkSnX}6 z9>hMee~tko?ifD^BTMqjui4#H2l?NeX=^^ZZ;nGp$FaAL9fqe0xXZuSZC!RmfxvdJ zU;lhd>F}vH2t$9u)(;z@6W1w8K%`}~Ux+@t7OrwZID^hGB(bjO}0pl?DXRO=fY^$~9ALy6do@VOVWwWsU zc{iSYuUS0CVJ)1NzYgxQY@qaU_tu&}gN)~*ZAtory^VO(dsJ1u$Q}>C97p4Ty7I=A z?Z~uI;cA;LkWdl;(UnfCOCw4pm#|eZ04~|az0iTy?GC`}mLF(KY!v4Wib&)PjsekF zHOD}!+iK?3z_gGaVe#U{`tGf7-4Y1+k4OI=$J5;F(lb15EA%r7 z66i0!kNu_Dso%2dx>uH1Wzy|Ph4^=m*GyCmvkDw?h^Cm>VpiRerRW=bvsKJM84p^; z+9Sp|LsgCg(PzL?SPL`RKe1&^vgfU>(el}!_27(=x-MXLQ}W$p1q%>Vs;vzJj_vyR zIc4pE7wl0Kr45<+|z6RuU5(*tSFDuzdYD?(>TsEm5nC+pOzQ)nSRMZSsjPz!4|{ zxdDL7D>#5(0$~e)unD3Y+l~Jz13|hM?Twj^Sq^V5VK2~n zyyLq_5y3lF&HcNRr)SE#y$pkI1e|GR_H6BpueW?3?}FYAE-}u8hK$z(lX@595a0xU z)D)kCY1TEl2f0QexJDtk3BMg}sVDLIl5Wt;2m)bqgN8qUlIgUkDjKi|w}&QTf&hqB zRJF~B=x?ITy{oTzWjT&k7kaA3OG}dxa0WwH=g#=m`Nd{#;5tmR*Md_N81&M!kq3#H zJ9Jk75Ki07SmQ)2u_(C%MXZ8g1mYAnCk9CP{xKV3<*~}7Ihv;$&UPe72J#1BCb zf&pM3cEM=DS~5itgR^ahSIwM93kG}j#(IFrSa96D(EkzWGZ?yVrBvTH ztqR{-xDi{p{s`hmu4RfnP(WB+AttCpSVT^Jgxhsm8y64+{9_)zuGtQ&RYw=`(>g>@ zuq^}#|6nRL4c)ATNOZqHEdH?a#^_gLtowOKZv;Rl2N327^|YdIo~CM%+dy*PB6Uj3 z6NoSyvVVCBrMj6Q#JKe6H_&2;R6DMY*<(8Na)=3m>&<}JJ=ln z1Gzyw=diaMU-7~V-fE|AM3(za?bq*Kvy>)NFL)#1Isyj;3|8&czpl>La>}m6hw-k1 z=rl~n8$wxlZ>S7w3-o#=@w$b0;-`2+muk-VlK63yazEm&e69@#cLE^snKykcz94#c zy{Kh!ib-xL8C3ihfZ=KI&rm{ zHzh8tn-e6o`0(9i?$FT*i%-JKHppn@b!`_i00b~{nY+L?9t@g!54|;avA25cI$&Oc zeFRd{n7u%+uV)MGtjROa(lv2AZZear2Y&cM2Vp*?rHINeIRIsUdc%_V-Q@mM_rxkW z*$&>=GoDg(^*2~ASeL4dm+p;#eFP327`pCMePy*@oH%5*&!^oA1e~bTwF6Yo8Qy-n!vc?y&3yZv+l_1P(74tmZyFTRU@S z^JFui-VPz@d`5G9qNgDB0uwtR7{+thV*8#|KY1~E1F4=W@Y1{yNHGFO1`J(|8oO|8 zMxi<8yLh|q25^cK=|(MG#i>~%@S1ic#BuBGx4}hz^Zs?OEM=M(yb(CqBXC5)V0Gr4 z`4{E3XNRWw6lFRHe*);ApXP+cRo$hk`Uk4+f2H2kS9qh*# Date: Wed, 26 May 2021 14:56:26 -0700 Subject: [PATCH 101/119] Save user's custom launch to db (#1241) * save to the db, but ignore errors https://ucsc-cgl.atlassian.net/browse/SEAB-2971 --- .../multi-cloud-launch.component.ts | 63 ++++++++++++------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts index 4b9d8d1cc6..bd2e2fd0a9 100644 --- a/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts +++ b/src/app/workflow/launch-third-party/multi-cloud-launch/multi-cloud-launch.component.ts @@ -1,7 +1,9 @@ +import { HttpErrorResponse } from '@angular/common/http'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { MatMenuTrigger } from '@angular/material/menu'; +import { AlertService } from '../../../shared/alert/state/alert.service'; import { Base } from '../../../shared/base'; -import { CloudInstance, User } from '../../../shared/openapi'; +import { CloudInstance, Language, User, UsersService } from '../../../shared/openapi'; @Component({ selector: 'app-multi-cloud-launch', @@ -54,7 +56,7 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { expanded = false; - constructor() { + constructor(private usersService: UsersService, private alertService: AlertService) { super(); } @@ -123,27 +125,42 @@ export class MultiCloudLaunchComponent extends Base implements OnInit { localStorage.setItem('useCustomLaunch', 'false'); } - // Uncomment when we want to create and save a user's custom launch entry - // if (this.presetLaunchWithOption === 'other' && this.user) { - // const url: URL = new URL(this.launchWith.url); - // const newCustomInstance: CloudInstance = { - // url: this.launchWith.url, - // partner: this.languagePartner, - // supportsFileImports: null, - // supportsHttpImports: null, - // supportedLanguages: new Array(), - // displayName: url.hostname, - // }; - // - // this.usersService.postUserCloudInstance(this.user.id, newCustomInstance).subscribe( - // (usersCloudInstances: Array) => { - // this.usersCloudInstances = usersCloudInstances; - // }, - // (error: HttpErrorResponse) => { - // console.log(error.message); - // } - // ); - // } + // Create and save a user's custom launch entry to the db + if (this.presetLaunchWithOption === 'other' && this.user) { + let url: URL; + try { + this.alertService.start('Constructing URL'); + url = new URL(this.launchWith.url); + this.alertService.simpleSuccess(); + } catch (error) { + this.alertService.customDetailedError( + 'Invalid URL', + this.launchWith.url + + ' is is not a valid URL. ' + + 'Make sure your URL starts with "https://" and ends with a top-level domain like ".com" or ".eu".' + ); + } + + const newCustomInstance: CloudInstance = { + url: this.launchWith.url, + partner: this.languagePartner, + supportsFileImports: null, + supportsHttpImports: null, + supportedLanguages: new Array(), + displayName: url.hostname, + }; + + this.usersService.postUserCloudInstance(this.user.id, newCustomInstance).subscribe( + (usersCloudInstances: Array) => { + this.usersCloudInstances = usersCloudInstances; + }, + (error: HttpErrorResponse) => { + // It's okay for the save to the db to fail for now. At this step, we only care about what URL's users + // are trying to use. Probably most of these failures will be the for violating the uniqueness constraint + console.log(error.message); + } + ); + } } private updateLaunchWithUrl(): void { From 030d6b4e406b8a0b4905200507798f672ef477c8 Mon Sep 17 00:00:00 2001 From: e34lin <65895867+e34lin@users.noreply.github.com> Date: Thu, 27 May 2021 12:09:36 -0400 Subject: [PATCH 102/119] Adding register button (#1238) Co-authored-by: Elizabeth Lin --- src/app/app.routing.ts | 1 + src/app/home-page/home-logged-out/home.component.html | 2 +- src/app/login/login.component.html | 2 +- src/app/login/login.component.ts | 6 ++++++ src/app/navbar/navbar.component.html | 11 ++++++++--- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 4d54c733b1..0277248d25 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -106,6 +106,7 @@ const APP_ROUTES: Routes = [ loadChildren: () => import('app/search/search.module').then((m) => m.SearchModule), data: { title: 'Dockstore | Search' }, }, + { path: 'register', component: LoginComponent, data: { title: 'Dockstore | Register' } }, { path: 'login', component: LoginComponent, data: { title: 'Dockstore | Login' } }, { path: 'logout', component: LogoutComponent, data: { title: 'Dockstore | Logout' } }, { path: 'session-expired', component: SessionExpiredComponent, data: { title: 'Dockstore | Session Expired' } }, diff --git a/src/app/home-page/home-logged-out/home.component.html b/src/app/home-page/home-logged-out/home.component.html index 791feece3d..baff7ecd82 100644 --- a/src/app/home-page/home-logged-out/home.component.html +++ b/src/app/home-page/home-logged-out/home.component.html @@ -195,7 +195,7 @@

    Create reproducible workflows & tools.

    -
    diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 27c91cccc3..415afbbfac 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -29,7 +29,7 @@

    Login to Collaboratory Dockstore

    - + Terms of Service and Privacy Policy. diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 3268ebe606..e844229b0a 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -32,6 +32,7 @@ import { LoginService } from './login.service'; export class LoginComponent { faGithub = faGithub; faGoogle = faGoogle; + public tabindex: number; constructor( private trackLoginService: TrackLoginService, private loginService: LoginService, @@ -41,6 +42,11 @@ export class LoginComponent { iconRegistry: MatIconRegistry, sanitizer: DomSanitizer ) { + if (this.router.url.includes('register')) { + this.tabindex = 1; + } else { + this.tabindex = 0; + } iconRegistry.addSvgIcon('google', sanitizer.bypassSecurityTrustResourceUrl('../assets/svg/btn_google_light_normal_ios.svg')); } diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index dbdcab0bbc..b2757ab4b8 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -41,9 +41,14 @@ Forum - - - +

    Explore Featured Content

    diff --git a/src/app/home-page/home-logged-out/home.component.html b/src/app/home-page/home-logged-out/home.component.html index baff7ecd82..2e8d355877 100644 --- a/src/app/home-page/home-logged-out/home.component.html +++ b/src/app/home-page/home-logged-out/home.component.html @@ -236,41 +236,17 @@

    Share and curate for stargazing.

    illustration
    - - -
    +

    News & Events

    - -

    - Dockstore GitHub App -

    - Our Dockstore GitHub App adds support for registering and automatically syncing workflows and services between GitHub and - Dockstore. Check it out! -     - -

    - Viral Analysis Workflows for COVID-19 -

    - A collection of viral NGS workflows for analyzing COVID-19. Learn how to use them with your own data in linked Terra workspaces - from the Broad Viral Genomics & Data Sciences Platform. -     +

    Helpful Resources

    diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts index 1708304048..0de8428b95 100644 --- a/src/app/home-page/home-page.module.ts +++ b/src/app/home-page/home-page.module.ts @@ -18,6 +18,7 @@ import { HomePageComponent } from './home-page.component'; import { RecentEventsComponent } from './recent-events/recent-events.component'; import { EntriesComponent } from './widget/entries/entries.component'; import { FeaturedContentComponent } from './widget/featured-content/featured-content.component'; +import { FeaturedNewsComponent } from './widget/featured-content/featured-news.component'; import { GettingStartedComponent } from './widget/getting-started/getting-started.component'; import { NewsUpdatesComponent } from './widget/news-updates/news-updates.component'; import { OrganizationsComponent } from './widget/organizations/organizations.component'; @@ -47,6 +48,7 @@ import { RequestsComponent } from './widget/requests/requests.component'; EntriesComponent, OrganizationsComponent, FeaturedContentComponent, + FeaturedNewsComponent, NewsUpdatesComponent, GettingStartedComponent, EntryToDisplayNamePipe, diff --git a/src/app/home-page/widget/featured-content/featured-content.component.ts b/src/app/home-page/widget/featured-content/featured-content.component.ts index 6f02ed0c05..8813f5b6c6 100644 --- a/src/app/home-page/widget/featured-content/featured-content.component.ts +++ b/src/app/home-page/widget/featured-content/featured-content.component.ts @@ -8,11 +8,11 @@ import { Dockstore } from '../../../shared/dockstore.model'; template: `
    `, }) export class FeaturedContentComponent implements OnInit { - public myExternalHTML: any = ''; + public myExternalHTML = ''; constructor(private http: HttpClient, private alertService: AlertService) {} ngOnInit() { - this.alertService.start('Retrieve featured content'); + this.alertService.start('Retrieving featured content'); this.http .get( Dockstore.FEATURED_CONTENT_URL, diff --git a/src/app/home-page/widget/featured-content/featured-news.component.ts b/src/app/home-page/widget/featured-content/featured-news.component.ts new file mode 100644 index 0000000000..2e0c2d6c54 --- /dev/null +++ b/src/app/home-page/widget/featured-content/featured-news.component.ts @@ -0,0 +1,33 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit } from '@angular/core'; +import { AlertService } from '../../../shared/alert/state/alert.service'; +import { Dockstore } from '../../../shared/dockstore.model'; + +@Component({ + selector: 'featured-news', + template: `
    `, +}) +export class FeaturedNewsComponent implements OnInit { + // TODO should parameterize FeaturedContentComponent or something + public myExternalHTML = ''; + + constructor(private http: HttpClient, private alertService: AlertService) {} + ngOnInit() { + this.alertService.start('Retrieving featured news'); + this.http + .get( + Dockstore.FEATURED_NEWS_URL, + // set authorization header to empty, prevents ng2-ui interceptor from adding dockstore bearer token + { headers: { Authorization: '' }, responseType: 'text' } + ) + .subscribe( + (data) => { + this.myExternalHTML = data; + this.alertService.simpleSuccess(); + }, + () => { + this.alertService.simpleError(); + } + ); + } +} diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index 11ca7867ba..59fd4b317e 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -85,6 +85,7 @@ export class Dockstore { static DOCKSTORE_REPO = 'https://github.com/dockstore/dockstore'; static DOCUMENTATION_URL = 'https://docs.dockstore.org'; static FEATURED_CONTENT_URL = 'will be filled in by configuration.service'; + static FEATURED_NEWS_URL = 'will be filled in by configuration.service'; static DEPLOY_VERSION = ''; static COMPOSE_SETUP_VERSION = ''; From a2cb5e6db95f96a0b979207ad1c83f80388aeb3a Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Thu, 3 Jun 2021 15:25:59 -0400 Subject: [PATCH 105/119] Fix stargazers and organizations card spacing (#1256) --- .../organizations.component.html | 109 +++++++++--------- src/app/stargazers/stargazers.component.html | 33 +++--- 2 files changed, 66 insertions(+), 76 deletions(-) diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index 23ebb5655d..311169eb4c 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -47,71 +47,66 @@
    -
    +
    -
    - -
    -
    - -
    -
    - - - Stargazers -
    - -
    - {{ altAvatarImg }} -
    -
    {{ stargazer.username }}
    -
    - ORCID - {{ stargazer.orcid }} -
    +
    +
    + +
    + {{ altAvatarImg }} +
    +
    {{ stargazer.username }}
    +
    + ORCID + {{ stargazer.orcid }} +
    +
    -
    - + +
    From 59473667e13cb7ff13637d75341dd26cec38215c Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Thu, 3 Jun 2021 15:34:45 -0400 Subject: [PATCH 106/119] Point at stable (#1258) * Update organizations.component.html * Update entries.component.html * Update about.component.html --- src/app/about/about.component.html | 6 +++--- src/app/home-page/widget/entries/entries.component.html | 2 +- .../widget/organizations/organizations.component.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 36b31587b3..fc76a0f76e 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -42,7 +42,7 @@

    Dockstore follows the FAIR Guiding Principles

    FAIR best practice guide helps researchers and other contributors create secure and reusable software.You can register your workflows and tools on Dockstore in three ways:
  • Dockstore can retrieve your workflow descriptors from GitHub and other source control methods (new with github appsYou can register your workflows and tools on Dockstore in three ways: tutorials, you can save your descriptors on GitHub, build your Docker image automatically on Quay.io, and have Dockstore reach out and index your tools. diff --git a/src/app/home-page/widget/entries/entries.component.html b/src/app/home-page/widget/entries/entries.component.html index af7edb9a75..9fa49f671d 100644 --- a/src/app/home-page/widget/entries/entries.component.html +++ b/src/app/home-page/widget/entries/entries.component.html @@ -4,7 +4,7 @@

    My Entries

    You have no entries. Read our - docs to learn more.My Organizations You have no organizations. Read our docs Date: Thu, 3 Jun 2021 16:14:11 -0400 Subject: [PATCH 107/119] Feature/2855/automate smoke tests rebased (#1259) Added various smoke tests that were previously run manually. --- .../integration/manualTests/basic-enduser.ts | 192 +++++++++++------- cypress/integration/manualTests/monitor.ts | 2 +- cypress/integration/manualTests/search.ts | 2 +- .../info-tab/info-tab.component.html | 3 +- .../versions/versions.component.html | 1 + .../search-workflow-table.component.html | 2 +- .../workflow/info-tab/info-tab.component.html | 8 +- .../launch-third-party.component.html | 24 ++- .../workflow/versions/versions.component.html | 1 + 9 files changed, 154 insertions(+), 81 deletions(-) diff --git a/cypress/integration/manualTests/basic-enduser.ts b/cypress/integration/manualTests/basic-enduser.ts index 75c58dc248..189ccfdb7b 100644 --- a/cypress/integration/manualTests/basic-enduser.ts +++ b/cypress/integration/manualTests/basic-enduser.ts @@ -2,13 +2,86 @@ import { ga4ghPath } from '../../../src/app/shared/constants'; import { Dockstore } from '../../../src/app/shared/dockstore.model'; import { goToTab } from '../../support/commands'; +// Test an entry, these should be ambiguous between tools and workflows. +describe('run stochastic smoke test', () => { + testEntry('Tools'); + testEntry('Workflows'); +}); +function testEntry(tab: string) { + beforeEach('get random entry on first page', () => { + cy.visit('/search'); + goToTab(tab); + const linkName = tab === 'Workflows' ? 'workflowColumn' : 'toolNames'; + // select a random entry on the first page and navigate to it + let chosen_index = 0; + cy.get('[data-cy=' + linkName + ']') + .then(($list) => { + chosen_index = Math.floor(Math.random() * $list.length); + }) + .eq(chosen_index) + .within(() => { + cy.get('a').then((el) => { + cy.log(el.prop('href')); // log the href in case a test fails + cy.visit(el.prop('href')); + }); + }); + }); + + it('check info tab', () => { + // test export to zip button + goToTab('Info'); + + cy.get('[data-cy=downloadZip]').within(() => { + cy.get('a').then((el) => { + cy.request(el.prop('href')).its('status').should('eq', 200); + }); + }); + cy.get('[data-cy=sourceRepository]').should('have.attr', 'href'); + }); + + it('check files tab', () => { + goToTab('Files'); + cy.url().should('contain', '?tab=files'); + cy.contains('Descriptor Files'); + }); + + it('check versions tab', () => { + goToTab('Versions'); + cy.url().should('contain', '?tab=versions'); + cy.get('[data-cy=versionRow]').should('have.length.of.at.least', 1); + }); +} + +// pairs of [workflow URL without version number, verified version number, another verified version number, workflow.trsUrl] +const workflowVersionTuples = [ + [ + 'github.com/briandoconnor/dockstore-workflow-md5sum/dockstore-wdl-workflow-md5sum', + '1.4.0', + 'develop', + window.location.origin + + '/api' + + ga4ghPath + + '/tools/%23workflow%2Fgithub.com%2Fbriandoconnor%2Fdockstore-workflow-md5sum%2Fdockstore-wdl-workflow-md5sum/versions/develop', + 'WDL', + ], + [ + 'github.com/NCI-GDC/gdc-dnaseq-cwl/GDC_DNASeq', + 'dev', + 'master', + window.location.origin + '/api' + ga4ghPath + '/tools/%23workflow%2Fgithub.com%2FNCI-GDC%2Fgdc-dnaseq-cwl%2FGDC_DNASeq/versions/master', + 'CWL', + ], + ['github.com/nf-core/vipr', 'dev', 'master', '', 'NFL'], +]; +describe('Monitor workflows', () => { + workflowVersionTuples.forEach((t) => testWorkflow(t[0], t[1], t[2], t[3], t[4])); +}); function testWorkflow(url: string, version1: string, version2: string, trsUrl: string, type: string) { it('info tab works', () => { cy.visit('/workflows/' + url + ':' + version1); goToTab('Launch'); cy.url().should('contain', '?tab=launch'); cy.contains('mat-card-header', 'Workflow Information'); - // test export to zip button? }); it('versions tab works', () => { @@ -38,43 +111,44 @@ function testWorkflow(url: string, version1: string, version2: string, trsUrl: s cy.url().should('contain', '?tab=tools'); }); - // This tends to be flaky so we are leaving it out for now - // - // it('DAG tab works', () => { - // goToTab('DAG'); - // cy.url().should('contain', '?tab=dag'); - // cy.get('[data-cy=dag-holder]'); - // }); + it('DAG tab works', () => { + cy.contains('.mat-tab-label', 'DAG').click(); + cy.url().should('contain', '?tab=dag'); + cy.get('[data-cy=dag-holder]') + .children().should('have.length.of.at.least', 1); + }); let launchWithTuples: any[] = []; if (type === 'WDL') { it('get the svg icons', () => { - cy.get('[data-cy=dnanexusIcon]').within(() => { - cy.get('svg').should('exist'); + cy.get('[data-cy=dnanexusLaunchWith]').within(() => { + cy.get('img').should('exist'); }); - cy.get('[data-cy=terraIcon]').within(() => { - cy.get('svg').should('exist'); + cy.get('[data-cy=terraLaunchWith]').within(() => { + cy.get('img').should('exist'); }); - cy.get('[data-cy=anvilIcon]').within(() => { - cy.get('svg').should('exist'); + cy.get('[data-cy=anvilLaunchWith]').within(() => { + cy.get('img').should('exist'); }); }); } if (type === 'CWL') { launchWithTuples = [ // pairs of [launch button text, expected href] - ['CGC', '?trs=' + trsUrl], - ['NHLBI BioData Catalyst', '?trs=' + trsUrl], + ['cgcLaunchWith', '?trs=' + trsUrl], + ['nhlbiLaunchWith', '?trs=' + trsUrl], + ['cavaticaLaunchWith', '?trs=' + trsUrl], ]; } else if (type === 'WDL') { launchWithTuples = [ // pairs of [launch button text, expected href] - ['DNAstack', '?descriptorType=wdl&path=' + url], - ['DNAnexus', '?source=' + trsUrl], - ['Terra', url + ':' + version2], - ['AnVIL', url + ':' + version2], - ['NHLBI BioData Catalyst', url + ':' + version2], + ['dnanexusLaunchWith', '?source=' + trsUrl], + ['terraLaunchWith', url + ':' + version2], + ['anvilLaunchWith', url + ':' + version2], + ['nhlbiLaunchWith', url + ':' + version2], ]; + } else if (type === 'NFL') { + launchWithTuples = [['nextflowtowerLaunchWith', url + '&revision=' + version2]]; } else { launchWithTuples = []; } @@ -82,7 +156,7 @@ function testWorkflow(url: string, version1: string, version2: string, trsUrl: s // click on each launch button and confirm the url changes launchWithTuples.forEach((t) => { it('launch with buttons go to external site', () => { - cy.contains('a', t[0]).should(($el) => { + cy.get('[data-cy=' + t[0] + ']').should(($el) => { // @ts-ignore expect($el.attr('href')).to.contain(t[1]); }); @@ -90,6 +164,25 @@ function testWorkflow(url: string, version1: string, version2: string, trsUrl: s }); } +const organizations = [['Broad Institute']]; +describe('Check organizations page', () => { + it('has multiple organizations', () => { + cy.contains('a', 'Organizations').click(); + cy.url().should('contain', '/organizations'); + cy.get('[data-cy=orgName]').should('have.length.of.at.least', 2); + }); + + organizations.forEach((t) => { + it('organization page and collections work', () => { + cy.contains('[data-cy=orgName]', t[0]).click(); + cy.get('[data-cy=collectionName').should('have.length.of.at.least', 1); + cy.get('[data-cy=collectionName').first().click(); + cy.url().should('contain', 'collections'); + cy.get('[data-cy=collectionEntry]').should('have.length.of.at.least', 1); + }); + }); +}); + describe('Test logged out home page', () => { it('find buttons', () => { cy.visit('/'); @@ -132,6 +225,15 @@ describe('Test search page functionality', () => { cy.url().should('not.contain', 'descriptorType=NF'); cy.url().should('contain', 'searchMode=files'); }); + it('boolean facet filters', () => { + cy.visit('/search'); + cy.contains('mat-checkbox', /^[ ]*verified/).click(); + cy.url().should('contain', 'verified=1'); + cy.get('[data-cy=verificationStatus]').each(($el, index, $list) => { + console.log($el); + cy.wrap($el).contains('done'); + }); + }); }); describe('Test workflow page functionality', () => { @@ -150,52 +252,6 @@ describe('Test workflow page functionality', () => { }); }); -// pairs of [workflow URL without version number, verified version number, another verified version number, workflow.trsUrl] -// TODO re add this after https://ucsc-cgl.atlassian.net/browse/SEAB-2071 is done: [ -// 'github.com/DataBiosphere/topmed-workflows/UM_aligner_wdl', -// '1.32.0', -// 'develop', -// window.location.origin + -// '/api' + -// ga4ghPath + -// '/tools/%23workflow%2Fgithub.com%2FDataBiosphere%2Ftopmed-workflows%2FUM_aligner_wdl/versions/develop', -// 'WDL', -// ], -const workflowVersionTuples = [ - [ - 'github.com/NCI-GDC/gdc-dnaseq-cwl/GDC_DNASeq', - 'dev', - 'master', - window.location.origin + '/api' + ga4ghPath + '/tools/%23workflow%2Fgithub.com%2FNCI-GDC%2Fgdc-dnaseq-cwl%2FGDC_DNASeq/versions/master', - 'CWL', - ], - ['github.com/nf-core/vipr', 'dev', 'master', '', 'NFL'], -]; - -const organizations = [['Broad Institute']]; - -describe('Monitor workflows', () => { - workflowVersionTuples.forEach((t) => testWorkflow(t[0], t[1], t[2], t[3], t[4])); -}); - -describe('Check organizations page', () => { - it('has multiple organizations', () => { - cy.contains('a', 'Organizations').click(); - cy.url().should('contain', '/organizations'); - cy.get('[data-cy=orgName]').should('have.length.of.at.least', 2); - }); - - organizations.forEach((t) => { - it('organization page and collections work', () => { - cy.contains('[data-cy=orgName]', t[0]).click(); - cy.get('[data-cy=collectionName').should('have.length.of.at.least', 1); - cy.get('[data-cy=collectionName').first().click(); - cy.url().should('contain', 'collections'); - cy.get('[data-cy=collectionEntry]').should('have.length.of.at.least', 1); - }); - }); -}); - describe('Check external links', () => { it('github, twitter, gitter, discuss links are correct', () => { cy.visit(''); diff --git a/cypress/integration/manualTests/monitor.ts b/cypress/integration/manualTests/monitor.ts index 9551cf292b..0db8d4a461 100644 --- a/cypress/integration/manualTests/monitor.ts +++ b/cypress/integration/manualTests/monitor.ts @@ -22,7 +22,7 @@ function aboutPageExternalLink(selector: string, url: string): void { } const selectorLinkTuples = [ - ['[data-cy=register-button]', '/login'], + ['[data-cy=register-button]', '/register'], ['[data-cy=footer-about-link]', '/about'], ['[data-cy=homepage-organizations-button]', '/organizations'], ['[data-cy=footer-organizations-link]', '/organizations'], diff --git a/cypress/integration/manualTests/search.ts b/cypress/integration/manualTests/search.ts index e5b100352b..1c63615679 100644 --- a/cypress/integration/manualTests/search.ts +++ b/cypress/integration/manualTests/search.ts @@ -21,7 +21,7 @@ describe('Admin UI', () => { it('should be able to use basic search box and have suggestions', () => { cy.get('[data-cy=basic-search]').type('dockstore_i'); cy.contains(' Sorry, no matches found for dockstore_i'); - cy.contains('Do you mean: dockstore?'); + cy.contains('Do you mean: dockstore\'s?'); cy.url().should('include', 'search=dockstore_i'); }); diff --git a/src/app/container/info-tab/info-tab.component.html b/src/app/container/info-tab/info-tab.component.html index 19db3f3da2..f2ed1577ce 100644 --- a/src/app/container/info-tab/info-tab.component.html +++ b/src/app/container/info-tab/info-tab.component.html @@ -27,6 +27,7 @@ {{ tool?.providerUrl | urlDeconstruct: (isPublic ? selectedVersion?.name : '') }} @@ -281,7 +282,7 @@ n/a
    - + Export as ZIP diff --git a/src/app/container/versions/versions.component.html b/src/app/container/versions/versions.component.html index 57aff53fc9..feb3f79342 100644 --- a/src/app/container/versions/versions.component.html +++ b/src/app/container/versions/versions.component.html @@ -123,6 +123,7 @@ [ngClass]="{ highlight: version.name === selectedTag.name }" mat-row *matRowDef="let row; columns: displayedColumns; let version" + data-cy="versionRow" >
    • diff --git a/src/app/search/search-workflow-table/search-workflow-table.component.html b/src/app/search/search-workflow-table/search-workflow-table.component.html index c8be7f7a35..3c756170c3 100644 --- a/src/app/search/search-workflow-table/search-workflow-table.component.html +++ b/src/app/search/search-workflow-table/search-workflow-table.component.html @@ -22,7 +22,7 @@ Verified - + done diff --git a/src/app/workflow/info-tab/info-tab.component.html b/src/app/workflow/info-tab/info-tab.component.html index 67dad360d1..c2a2bc6604 100644 --- a/src/app/workflow/info-tab/info-tab.component.html +++ b/src/app/workflow/info-tab/info-tab.component.html @@ -42,7 +42,11 @@
  • Source Code: - + {{ workflow?.providerUrl | urlDeconstruct: (isPublic ? selectedVersion?.name : '') }}
    • @@ -280,7 +284,7 @@ n/a
    - + Export as ZIP diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html index 11a006d0db..1fef91cdaa 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.html +++ b/src/app/workflow/launch-third-party/launch-third-party.component.html @@ -50,6 +50,7 @@ rel="noopener" [attr.href]="config.DNANEXUS_IMPORT_URL + '?source=' + trsUrl" [disabled]="!(hasContent$ | async)" + data-cy="dnanexusLaunchWith" >DNAnexus launch with logo Terra launch with logo AnVIL launch with logo NHLBI BioData Catalyst
    @@ -95,8 +98,8 @@ [attr.href]="config.DNASTACK_IMPORT_URL + '?descriptorType=wdl&path=' + workflowPathAsQueryValue" [disabled]="!(hasContent$ | async)" color="primary" - >DNAstack icon - DNAstack »DNAstack icon DNAstack » DNAnexus » DNAnexus » Terra » Terra » AnVIL » AnVIL » NHLBI BioData Catalyst
    @@ -161,6 +167,7 @@ [attr.href]="config.CGC_IMPORT_URL + '?trs=' + trsUrl" [disabled]="disableSevenBridgesPlatform$ | async" color="primary" + data-cy="cgcLaunchWith" >CGC icon CGC NHLBI BioData Catalyst Cavatica icon Cavatica
    @@ -219,6 +228,7 @@ " [disabled]="!(hasContent$ | async)" color="primary" + data-cy="nextflowtowerLaunchWith" > Nextflow icon Nextflow Tower diff --git a/src/app/workflow/versions/versions.component.html b/src/app/workflow/versions/versions.component.html index fc4cd48998..cc0421ea88 100644 --- a/src/app/workflow/versions/versions.component.html +++ b/src/app/workflow/versions/versions.component.html @@ -181,6 +181,7 @@ [ngClass]="{ highlight: version.name === _selectedVersion.name }" mat-row *matRowDef="let row; columns: displayedColumns; let version" + data-cy="versionRow" >
    From 9e11f93cac4abd939c0f69975c5025a1cbd67fe7 Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Thu, 3 Jun 2021 16:15:58 -0700 Subject: [PATCH 108/119] Snapshot / Export Dialog (#1249) dockstore/dockstore#2846 --- THIRD-PARTY-LICENSES.csv | 1 + angular.json | 1 + cypress/fixtures/doiResponse.json | 78 ++++++ cypress/fixtures/tokens.json | 34 +++ cypress/integration/group2/myworkflows.ts | 49 +++- package-lock.json | 5 + package.json | 1 + src/app/app.module.ts | 4 + src/app/shared/dockstore.model.ts | 1 + src/app/shared/state/token.query.ts | 1 + .../exporter-step.component.html | 23 ++ .../exporter-step.component.scss | 8 + .../exporter-step.component.spec.ts | 24 ++ .../exporter-step/exporter-step.component.ts | 20 ++ .../snaphot-exporter-modal.component.html | 179 ++++++++++++++ .../snaphot-exporter-modal.component.spec.ts | 59 +++++ .../snaphot-exporter-modal.component.ts | 224 ++++++++++++++++++ .../snapshot-exporter-modal.service.spec.ts | 23 ++ .../snapshot-exporter-modal.service.ts | 78 ++++++ src/app/workflow/view/view.component.html | 17 +- src/app/workflow/view/view.component.ts | 23 +- src/app/workflow/view/view.service.ts | 198 +--------------- src/materialColorScheme.scss | 18 ++ src/styles.scss | 20 ++ 24 files changed, 882 insertions(+), 207 deletions(-) create mode 100644 cypress/fixtures/doiResponse.json create mode 100644 cypress/fixtures/tokens.json create mode 100644 src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.html create mode 100644 src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.scss create mode 100644 src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.spec.ts create mode 100644 src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.ts create mode 100644 src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.html create mode 100644 src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.spec.ts create mode 100644 src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.ts create mode 100644 src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.spec.ts create mode 100644 src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.ts diff --git a/THIRD-PARTY-LICENSES.csv b/THIRD-PARTY-LICENSES.csv index df97493284..edbde1ba95 100644 --- a/THIRD-PARTY-LICENSES.csv +++ b/THIRD-PARTY-LICENSES.csv @@ -274,6 +274,7 @@ "JSONStream@1.3.5","(MIT OR Apache-2.0)","https://github.com/dominictarr/JSONStream" "abab@2.0.5","BSD-3-Clause","https://github.com/jsdom/abab" "abbrev@1.1.1","ISC","https://github.com/isaacs/abbrev-js" +"academicons@1.8.6","OFL-1.1","https://github.com/jpswalsh/academicons" "accepts@1.3.5","MIT","https://github.com/jshttp/accepts" "accepts@1.3.7","MIT","https://github.com/jshttp/accepts" "ace-builds@1.4.6","BSD-3-Clause","https://github.com/ajaxorg/ace-builds" diff --git a/angular.json b/angular.json index 5f17e83529..f2808891fb 100644 --- a/angular.json +++ b/angular.json @@ -24,6 +24,7 @@ ], "styles": [ "node_modules/bootstrap/dist/css/bootstrap.css", + "node_modules/academicons/css/academicons.css", "src/styles.scss", "src/material.scss" ], diff --git a/cypress/fixtures/doiResponse.json b/cypress/fixtures/doiResponse.json new file mode 100644 index 0000000000..313a255110 --- /dev/null +++ b/cypress/fixtures/doiResponse.json @@ -0,0 +1,78 @@ +[ + { + "aliases": null, + "author": null, + "commitID": null, + "dbUpdateDate": 1622246514895, + "description": null, + "descriptionSource": null, + "dirtyBit": false, + "doiStatus": "NOT_REQUESTED", + "doiURL": "10.5072/zenodo.841014", + "email": null, + "frozen": true, + "hidden": false, + "id": 13, + "images": null, + "input_file_formats": [], + "last_modified": 1480374117003, + "legacyVersion": true, + "name": "master", + "output_file_formats": [], + "reference": "master", + "referenceType": "UNSET", + "subClass": null, + "synced": false, + "valid": true, + "validations": null, + "verified": false, + "verifiedSource": null, + "verifiedSources": [], + "versionEditor": null, + "versionMetadata": { + "id": 13, + "orcidPutCode": null, + "parsedInformationSet": [] + }, + "workflow_path": "/1st-workflow.cwl", + "workingDirectory": "" + }, + { + "aliases": null, + "author": null, + "commitID": null, + "dbUpdateDate": 1480374117003, + "description": null, + "descriptionSource": null, + "dirtyBit": false, + "doiStatus": "NOT_REQUESTED", + "doiURL": null, + "email": null, + "frozen": false, + "hidden": true, + "id": 14, + "images": null, + "input_file_formats": [], + "last_modified": 1480374117003, + "legacyVersion": true, + "name": "test", + "output_file_formats": [], + "reference": "test", + "referenceType": "UNSET", + "subClass": null, + "synced": true, + "valid": true, + "validations": null, + "verified": false, + "verifiedSource": null, + "verifiedSources": [], + "versionEditor": null, + "versionMetadata": { + "id": 14, + "orcidPutCode": null, + "parsedInformationSet": [] + }, + "workflow_path": "/1st-workflow.cwl", + "workingDirectory": "" + } +] diff --git a/cypress/fixtures/tokens.json b/cypress/fixtures/tokens.json new file mode 100644 index 0000000000..de3cf7f102 --- /dev/null +++ b/cypress/fixtures/tokens.json @@ -0,0 +1,34 @@ +[ + { + "dbCreateDate": 1595275995928, + "dbUpdateDate": 1595275995928, + "id": 129838, + "tokenSource": "dockstore", + "userId": 1, + "username": "coverbeck" + }, + { + "dbCreateDate": 1618604954189, + "dbUpdateDate": 1618604954189, + "id": 135488, + "tokenSource": "orcid.org", + "userId": 1, + "username": "Charles Overbeck" + }, + { + "dbCreateDate": 1618602772856, + "dbUpdateDate": 1618602772856, + "id": 135438, + "tokenSource": "zenodo.org", + "userId": 1, + "username": "coverbeck" + }, + { + "dbCreateDate": 1595275995936, + "dbUpdateDate": 1620412026948, + "id": 129888, + "tokenSource": "github.com", + "userId": 1, + "username": "coverbeck" + } +] diff --git a/cypress/integration/group2/myworkflows.ts b/cypress/integration/group2/myworkflows.ts index dad97cfa4e..22a7b8ebd2 100644 --- a/cypress/integration/group2/myworkflows.ts +++ b/cypress/integration/group2/myworkflows.ts @@ -154,14 +154,19 @@ describe('Dockstore my workflows', () => { cy.get('[data-cy=save-version').click(); cy.get('[data-cy=save-version').should('not.be.visible'); }); + }); - it('Should be able to snapshot', () => { + describe('Should be able to snapshot, request DOI, and export to ORCID', () => { + function gotoVersionsAndClickActions() { cy.visit('/my-workflows/github.com/A/l'); cy.url().should('eq', Cypress.config().baseUrl + '/my-workflows/github.com/A/l'); goToTab('Versions'); + cy.get('td').contains('Actions').click(); + } + it('Should be able to snapshot', () => { + gotoVersionsAndClickActions(); cy.get('[data-cy=dockstore-snapshot-locked]').should('have.length', 0); // The buttons should be present - cy.get('td').contains('Actions').click(); cy.get('[data-cy=dockstore-request-doi-button]').its('length').should('be.gt', 0); cy.get('[data-cy=dockstore-snapshot]').its('length').should('be.gt', 0); @@ -169,11 +174,49 @@ describe('Dockstore my workflows', () => { cy.get('[data-cy=dockstore-snapshot]').first().click(); - cy.get('[data-cy=confirm-dialog-button]').click(); + cy.get('[data-cy=snapshot-button]').click(); cy.wait(250); cy.get('[data-cy=dockstore-snapshot-locked').should('have.length', 1); }); + it('Request DOI should require linked account', () => { + gotoVersionsAndClickActions(); + cy.get('[data-cy=dockstore-request-doi-button]').click(); + + cy.get('[data-cy=zenodo-not-linked]').its('length').should('be.gt', 0); + cy.get('[data-cy=export-button').should('be.disabled'); + + cy.get('[data-cy=link-zenodo]').click(); + cy.url().should('eq', Cypress.config().baseUrl + '/accounts?tab=accounts'); + }); + it('Export DOI should result in badge', () => { + cy.server(); + // tokens.json indicates a Zenodo token + cy.fixture('tokens.json').then((json) => { + cy.route({ + url: '/api/users/1/tokens', + method: 'GET', + status: 200, + response: json, + }); + }); + // doiResponse.json has a workflow version with a DOI + cy.fixture('doiResponse.json').then((json) => { + cy.route({ + url: '/api/**/requestDOI/*', + method: 'PUT', + status: 200, + response: json, + }); + }); + cy.get('[data-cy=workflow-version-DOI-badge]').should('not.exist'); + gotoVersionsAndClickActions(); + // Make sure there are no existing Zenodo badges + cy.get('[data-cy=dockstore-request-doi-button]').click(); + cy.get('[data-cy=export-button').should('be.enabled'); + cy.get('[data-cy=export-button').click(); + cy.get('[data-cy=workflow-version-DOI-badge]').its('length').should('be.gt', 0); + }); }); it('Should be able to view a dockstore.yml workflow', () => { diff --git a/package-lock.json b/package-lock.json index 8e9c2dd10c..3f053a8f10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5384,6 +5384,11 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, + "academicons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/academicons/-/academicons-1.8.6.tgz", + "integrity": "sha512-Deq5TUn98SNp6o/XhenYJoqXvg9BZ+ZkpKJDsUU6B37nTKj8fJ3ybz351ERaLxbBESTjU7AhTWf7oBbGm+uwKw==" + }, "accepts": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", diff --git a/package.json b/package.json index 190aef8aa7..9a8ec1534f 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "@fortawesome/free-solid-svg-icons": "^5.13.1", "@material-extended/mde": "^3.0.3", "@ngx-lite/json-ld": "^0.6.2", + "academicons": "^1.8.6", "ace-builds": "^1.4.6", "angular-tag-cloud-module": "^5.2.0", "bodybuilder": "^2.4.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 559f9dc1f7..0de256084d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -100,6 +100,8 @@ import { StarredEntriesComponent } from './starredentries/starredentries.compone import { StarringModule } from './starring/starring.module'; import { TosBannerService } from './tosBanner/state/tos-banner.service'; import { TosBannerComponent } from './tosBanner/tos-banner.component'; +import { ExporterStepComponent } from './workflow/snapshot-exporter-modal/exporter-step/exporter-step.component'; +import { SnaphotExporterModalComponent } from './workflow/snapshot-exporter-modal/snaphot-exporter-modal.component'; import { ViewService } from './workflow/view/view.service'; export const myCustomTooltipDefaults: MatTooltipDefaultOptions = { @@ -149,6 +151,8 @@ export function configurationServiceFactory(configurationService: ConfigurationS LogoutComponent, GitTagPipe, AboutComponent, + SnaphotExporterModalComponent, + ExporterStepComponent, ], imports: [ environment.production ? [] : AkitaNgDevtools.forRoot(), diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index 59fd4b317e..58e9b2a7c6 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -95,5 +95,6 @@ export class Dockstore { enableCwlViewer: true, enableLaunchWithGalaxy: true, enableMultiCloudLaunchWithDNAstack: true, + enableOrcidExport: true, }; } diff --git a/src/app/shared/state/token.query.ts b/src/app/shared/state/token.query.ts index 659e3b6d1a..84d939a0ec 100644 --- a/src/app/shared/state/token.query.ts +++ b/src/app/shared/state/token.query.ts @@ -15,6 +15,7 @@ export class TokenQuery extends QueryEntity { hasGoogleToken$: Observable = this.tokens$.pipe(map((tokens) => this.hasEntity(TokenSource.GOOGLE))); hasZenodoToken$: Observable = this.tokens$.pipe(map((tokens) => this.hasEntity(TokenSource.ZENODO))); gitHubOrganizations$: Observable = this.select((state) => state.gitHubOrganizations); + hasOrcidToken$: Observable = this.tokens$.pipe(map((tokens) => this.hasEntity(TokenSource.ORCID))); hasSourceControlToken$: Observable = this.tokens$.pipe( map((tokens) => this.hasEntity(TokenSource.GITHUB) || this.hasEntity(TokenSource.BITBUCKET) || this.hasEntity(TokenSource.GITLAB)) ); diff --git a/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.html b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.html new file mode 100644 index 0000000000..245b55819e --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.html @@ -0,0 +1,23 @@ +
    +
    +
    + {{ matIcon }} +
    +
    + +
    +
    + +
    + check_circle + error + +
    +
    +
    +
    {{ successText }}
    +
    {{ errorText }}
    +
    {{ defaultText }}
    +
    +
    +
    diff --git a/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.scss b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.scss new file mode 100644 index 0000000000..12ac8e203f --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.scss @@ -0,0 +1,8 @@ +@import 'materialColorScheme.scss'; + +.mat-icon { + transform: scale(1.8); +} +.icon-row { + height: 40px; +} diff --git a/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.spec.ts b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.spec.ts new file mode 100644 index 0000000000..dc8b25a909 --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExporterStepComponent } from './exporter-step.component'; + +describe('ExporterStepComponent', () => { + let component: ExporterStepComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ExporterStepComponent], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExporterStepComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.ts b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.ts new file mode 100644 index 0000000000..ac28ab5fdd --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/exporter-step/exporter-step.component.ts @@ -0,0 +1,20 @@ +import { Component, Input } from '@angular/core'; +import { IconDefinition } from '@fortawesome/free-brands-svg-icons'; +import { StepState } from '../snaphot-exporter-modal.component'; + +@Component({ + selector: 'app-exporter-step', + templateUrl: './exporter-step.component.html', + styleUrls: ['./exporter-step.component.scss'], +}) +export class ExporterStepComponent { + @Input() stepState: StepState; + @Input() matIcon: string; + @Input() aiIcon: string; + @Input() faIcon: IconDefinition; + @Input() successText: string; + @Input() errorText: string; + @Input() defaultText: string; + + public readonly StepState = StepState; +} diff --git a/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.html b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.html new file mode 100644 index 0000000000..6eab7de2b9 --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.html @@ -0,0 +1,179 @@ +
    +

    + {{ title }}: Version {{ version.name }} +

    + +
    +
    + +
    +
    + + +
    +
    +
    + +
    +
    + + + + +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + Are you sure you want to snapshot this version, making it uneditable? This cannot be undone. +
    +
    + + + +
    +
    +
    +
    + + +

    + A snapshot freezes the workflow version, ensuring that the content of the workflow does not change, e.g., if cited in publications. + Important note: once a snapshot is made, the workflow version becomes uneditable, apart from some metadata. +

    +

    + You can then use this snapshot to request a DOI or export to your ORCID record. + Are you sure you want to snapshot this version? +

    +     + + +

    A Digital Object Identifier (DOI) allows a workflow version to be easily cited in publications. What’s involved in the request:

    +
      +
    1. + Before a DOI can be issued, a snapshot of the workflow version must be made to ensure that the content referenced + by the DOI does not change. + Please note: a snapshot will make the workflow version uneditable, apart from some metadata. +
      2. +
    2. + Next, a DOI is requested, providing a unique identifier for this workflow version. The DOI identifier will be displayed in the + snapshot column of the versions table. +
      3. +
    +     + + +

    + Exporting to ORCID requires a Digital Object Identifier (DOI), which allows a workflow version to be easily cited in publications. + What’s involved: +

    + +
      +
    1. + Before a DOI can be issued, a snapshot of the workflow version must be made to ensure that the content referenced by the DOI does + not change. Please note: a snapshot will make the workflow version uneditable, apart from some metadata. +
      2. +
    2. Next, a DOI is requested, providing a unique identifier for this workflow version.
      3. +
    3. Lastly, the workflow will be exported to your ORCID record.
      4. +
    +     + + +
    +
    + warning +
    +
    +
    + To request a DOI, you must first link your Zenodo account in your Dockstore Linked Accounts section. After linking, come back to + this screen and try again. +
    +
    + +
    +
    +
    +     + + +
    +
    + +
    +
    +
    + To export a workflow to ORCID, you must first link your ORCID account in your Dockstore Linked Accounts section. After linking, + come back to this screen and try again. + +
    +
    +
    +     +
    diff --git a/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.spec.ts b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.spec.ts new file mode 100644 index 0000000000..9b04fac5ed --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.spec.ts @@ -0,0 +1,59 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { RouterTestingModule } from '@angular/router/testing'; +import { AuthService } from 'ng2-ui-auth'; +import { AccountsService } from '../../loginComponents/accounts/external/accounts.service'; +import { DateService } from '../../shared/date.service'; +import { ProviderService } from '../../shared/provider.service'; +import { AccountsStubService, AuthStubService } from '../../test/service-stubs'; + +import { SnaphotExporterModalComponent, SnapshotExporterAction } from './snaphot-exporter-modal.component'; + +describe('SnapshotDoiOrcidComponent', () => { + let component: SnaphotExporterModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [SnaphotExporterModalComponent], + imports: [MatSnackBarModule, HttpClientTestingModule, RouterTestingModule], + providers: [ + { + provide: MAT_DIALOG_DATA, + useValue: { + workflow: {}, + version: { + frozen: false, + versionMetadata: {}, + }, + action: SnapshotExporterAction.SNAPSHOT, + }, + }, + { + provide: MatDialogRef, + useValue: { + close: (dialogResult: any) => { + // Do nothing + }, + }, + }, + { provide: AuthService, useClass: AuthStubService }, + { provide: AccountsService, useClass: AccountsStubService }, + DateService, + ProviderService, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SnaphotExporterModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.ts b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.ts new file mode 100644 index 0000000000..8e66bfa770 --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/snaphot-exporter-modal.component.ts @@ -0,0 +1,224 @@ +import { Component, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { Router } from '@angular/router/'; +import { faOrcid } from '@fortawesome/free-brands-svg-icons'; +import { concat, Observable, of as observableOf, throwError } from 'rxjs'; +import { catchError, first, switchMap, tap } from 'rxjs/operators'; +import { AlertQuery } from '../../shared/alert/state/alert.query'; +import { Base } from '../../shared/base'; +import { Dockstore } from '../../shared/dockstore.model'; +import { TokenQuery } from '../../shared/state/token.query'; +import { BioWorkflow, WorkflowVersion } from '../../shared/swagger'; +import { SnapshotExporterModalService } from './snapshot-exporter-modal.service'; + +export enum SnapshotExporterAction { + SNAPSHOT, + DOI, + ORCID, +} + +export interface SnapshotExporterDialogData { + workflow: BioWorkflow; + version: WorkflowVersion; + action: SnapshotExporterAction; +} + +export enum StepState { + INITIAL, + EXECUTING, + COMPLETED, + ERROR, +} + +export interface State { + snapshot: StepState; + doi: StepState; + orcid: StepState; + overall: StepState; +} + +@Component({ + selector: 'app-snapshot-exporter-modal-component', + templateUrl: './snaphot-exporter-modal.component.html', +}) +export class SnaphotExporterModalComponent extends Base { + public hasZenodoToken$: Observable = this.tokenQuery.hasZenodoToken$; + public hasOrcidToken$: Observable = this.tokenQuery.hasOrcidToken$; + public isAjaxing$ = this.alertQuery.showInfo$; + public isSnapshot: boolean = this.dialogData.version.frozen; + public workflow: BioWorkflow; + public version: WorkflowVersion; + public Dockstore = Dockstore; + public StepState = StepState; + public SnapshotExporterAction = SnapshotExporterAction; + public title: string; + public action: SnapshotExporterAction; + public promptToConfirmSnapshot = false; + public faOrcid = faOrcid; + public state: State; + + constructor( + @Inject(MAT_DIALOG_DATA) private dialogData: SnapshotExporterDialogData, + private dialogRef: MatDialogRef, + private snapshotExporterModalService: SnapshotExporterModalService, + private tokenQuery: TokenQuery, + private alertQuery: AlertQuery, + private router: Router + ) { + super(); + this.workflow = dialogData.workflow; + this.version = dialogData.version; + this.action = dialogData.action; + this.title = this.calculateTitle(); + this.state = this.calculateState(); + } + + linkAccount() { + this.dialogRef.close(); + this.router.navigate(['/accounts']); + } + + /** + * Invoked when snapshotting only (not exporting). Closes the dialog on success + */ + snapshot() { + this.snapshotExporterModalService + .snapshotWorkflowVersion(this.workflow, this.version) + .pipe(first()) + .subscribe(() => this.dialogRef.close()); + // If there's an error, leave dialog up. this.snapshotExporterModalService.snapshotWorkflowVersion displays error message + } + + /** + * Invoked when exporting to DOI and/or ORCID. Executes all steps as necessary + * @param snapshotConfirmed - if true, caller has confirmed that they want do do the snapshot step + */ + export(snapshotConfirmed: boolean) { + if (!this.isSnapshot && !snapshotConfirmed) { + this.promptToConfirmSnapshot = true; + } else { + const observables = this.getSteps(); + this.state.overall = StepState.EXECUTING; + concat(...observables).subscribe( + () => { + // Intentionally not doing anything + }, + () => (this.state.overall = StepState.ERROR), + () => { + if (this.state.overall !== StepState.ERROR) { + this.dialogRef.close(); + } + } + ); + } + } + + private getSteps() { + const observables: Observable[] = []; + if (!this.isSnapshot) { + observables.push(this.snapshotStep()); + } + if (!this.version.doiURL) { + observables.push(this.requestDOIStep()); + } + if (this.action === SnapshotExporterAction.ORCID) { + observables.push(this.orcidStep()); + } + + // This code is useful if you want to test the UI only + // const observables: Observable[] = []; + // if (!this.isSnapshot) { + // observables.push(observableOf(1).pipe( + // tap(() => { console.log('snapshotting...'); this.state.snapshot = StepState.EXECUTING; }), + // delay(5000), + // tap(() => {throw throwError('whatevs'); }), + // switchMap(() => observableOf(1).pipe(tap(() => this.state.snapshot = StepState.COMPLETED))), + // catchError((error) => { + // this.state.snapshot = StepState.ERROR; + // throw throwError(error); }) + // ) + // ); + // } + // if (!this.version.doiURL) { + // observables.push(observableOf(1).pipe( + // tap(() => {console.log('doi....'); this.state.doi = StepState.EXECUTING; }), + // delay(5000), + // switchMap(() => observableOf(1).pipe(tap(() => this.state.doi = StepState.COMPLETED)))) + // ); + // } + // if (this.action === SnapshotExporterAction.ORCID) { + // observables.push(observableOf(1).pipe( + // tap(() => this.state.orcid = StepState.EXECUTING), + // delay(5000), + // switchMap(() => observableOf(1).pipe(tap(() => this.state.orcid = StepState.COMPLETED))))); + // } + return observables; + } + + private requestDOIStep() { + return observableOf(1).pipe( + tap(() => (this.state.doi = StepState.EXECUTING)), + switchMap(() => + this.snapshotExporterModalService.requestDOI(this.workflow, this.version).pipe( + tap(() => (this.state.doi = StepState.COMPLETED)), + catchError((error) => { + this.state.doi = StepState.ERROR; + throw throwError(error); + }) + ) + ) + ); + } + + private snapshotStep() { + return observableOf(1).pipe( + tap(() => { + this.state.snapshot = StepState.EXECUTING; + }), + switchMap(() => + this.snapshotExporterModalService.snapshotWorkflowVersion(this.workflow, this.version).pipe( + tap(() => (this.state.snapshot = StepState.COMPLETED)), + catchError((error) => { + this.state.snapshot = StepState.ERROR; + throw throwError(error); + }) + ) + ) + ); + } + + private orcidStep() { + return observableOf(null).pipe( + tap(() => (this.state.orcid = StepState.EXECUTING)), + switchMap(() => + this.snapshotExporterModalService.exportToOrcid(this.workflow, this.version).pipe( + tap(() => (this.state.orcid = StepState.COMPLETED)), + catchError((error) => { + this.state.orcid = StepState.ERROR; + throw throwError(error); + }) + ) + ) + ); + } + + private calculateTitle() { + switch (this.action) { + case SnapshotExporterAction.SNAPSHOT: + return 'Snapshot'; + case SnapshotExporterAction.DOI: + return 'Request DOI'; + case SnapshotExporterAction.ORCID: + return 'Export to ORCID'; + } + } + + private calculateState(): State { + return { + snapshot: this.isSnapshot ? StepState.COMPLETED : StepState.INITIAL, + doi: this.version.doiURL ? StepState.COMPLETED : StepState.INITIAL, + orcid: this.version.versionMetadata.orcidPutCode ? StepState.COMPLETED : StepState.INITIAL, + overall: StepState.INITIAL, + }; + } +} diff --git a/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.spec.ts b/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.spec.ts new file mode 100644 index 0000000000..dca3d2e89a --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.spec.ts @@ -0,0 +1,23 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { DateService } from '../../shared/date.service'; +import { ProviderService } from '../../shared/provider.service'; + +import { SnapshotExporterModalService } from './snapshot-exporter-modal.service'; + +describe('SnapshotExporterModalService', () => { + let service: SnapshotExporterModalService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [MatSnackBarModule, HttpClientTestingModule], + providers: [DateService, ProviderService], + }); + service = TestBed.inject(SnapshotExporterModalService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.ts b/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.ts new file mode 100644 index 0000000000..f37a17c421 --- /dev/null +++ b/src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.ts @@ -0,0 +1,78 @@ +import { Injectable } from '@angular/core'; +import { EMPTY, Observable } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; +import { AlertService } from '../../shared/alert/state/alert.service'; +import { EntriesService } from '../../shared/openapi'; +import { WorkflowQuery } from '../../shared/state/workflow.query'; +import { WorkflowService } from '../../shared/state/workflow.service'; +import { Workflow, WorkflowsService, WorkflowVersion } from '../../shared/swagger'; + +@Injectable({ + providedIn: 'root', +}) +export class SnapshotExporterModalService { + constructor( + private alertService: AlertService, + private workflowService: WorkflowService, + private workflowsService: WorkflowsService, + private workflowQuery: WorkflowQuery, + private entriesService: EntriesService + ) {} + + public snapshotWorkflowVersion(workflow: Workflow, version: WorkflowVersion): Observable { + this.alertService.start(`Snapshotting workflow ${workflow.workflowName} version ${version.name}`); + const snapshot: WorkflowVersion = { ...version, frozen: true }; + return this.workflowsService.updateWorkflowVersion(workflow.id, [snapshot]).pipe( + map((workflowVersions: Array) => { + this.alertService.detailedSuccess(`A snapshot was created for workflow + "${workflow.workflowName}" version "${version.name}"!`); + const selectedWorkflow = { ...this.workflowQuery.getActive() }; + if (selectedWorkflow.id === workflow.id) { + this.workflowService.setWorkflow({ ...selectedWorkflow, workflowVersions: workflowVersions }); + } + }), + catchError((error) => { + if (error) { + this.alertService.detailedError(error); + } else { + this.alertService.simpleError(); + } + return EMPTY; + }) + ); + } + + public requestDOI(workflow: Workflow, version: WorkflowVersion): Observable { + this.alertService.start(`A Digital Object Identifier (DOI) is being requested for workflow + "${workflow.workflowName}" version "${version.name}"!`); + return this.workflowsService.requestDOIForWorkflowVersion(workflow.id, version.id).pipe( + map((versions) => { + const selectedWorkflow = { ...this.workflowQuery.getActive() }; + if (selectedWorkflow.id === workflow.id) { + this.workflowService.setWorkflow({ ...selectedWorkflow, workflowVersions: versions }); + } + + const workflowName: string = workflow.workflowName || workflow.repository; + + this.alertService.detailedSuccess(`A Digital Object Identifier (DOI) was created for workflow + "${workflowName}" version "${version.name}"!`); + }), + catchError((error) => { + return EMPTY; + }) + ); + } + + public exportToOrcid(workflow: Workflow, version: WorkflowVersion): Observable { + this.alertService.start(`Exporting workflow ${workflow.workflowName} version ${version.name} to ORCID`); + return this.entriesService.exportToORCID(workflow.id, version.id).pipe( + map((result) => { + this.alertService.detailedSuccess(`Exported workflow ${workflow.workflowName} version ${version.name} to ORCID`); + }), + catchError((error) => { + this.alertService.detailedError(error); + return EMPTY; + }) + ); + } +} diff --git a/src/app/workflow/view/view.component.html b/src/app/workflow/view/view.component.html index e980b80c0c..3d7c827640 100644 --- a/src/app/workflow/view/view.component.html +++ b/src/app/workflow/view/view.component.html @@ -16,7 +16,7 @@ - @@ -35,7 +35,6 @@ type="button" mat-menu-item color="accent" - class="btn-block" [disabled]="(isRefreshing$ | async) || !(!version.frozen && version.referenceType !== 'BRANCH')" (click)="snapshotVersion()" data-cy="dockstore-snapshot" @@ -47,7 +46,6 @@ mat-menu-item id="DOIButton" color="accent" - class="btn-block" (click)="requestDOIForWorkflowVersion()" [disabled]="isRefreshing$ | async" data-cy="dockstore-request-doi-button" @@ -56,13 +54,24 @@ > Request DOI +
    - + + + +
    diff --git a/src/app/home-page/home-logged-out/home.component.scss b/src/app/home-page/home-logged-out/home.component.scss index 9a0855fcfb..a73e729095 100644 --- a/src/app/home-page/home-logged-out/home.component.scss +++ b/src/app/home-page/home-logged-out/home.component.scss @@ -118,3 +118,13 @@ h3 { .warn-1 { color: mat-color($dockstore-app-warn, darker); } + +// Style home search mat-form-field +// Make mat-form-field match home search bar, could look into more solutions +::ng-deep .home-field .mat-form-field-wrapper { + padding-bottom: 0; +} +::ng-deep .home-field .mat-form-field-infix { + padding: 0.8em 0 0.8em 0; + border-top: 0em; +} diff --git a/src/app/organizations/organizations/organizations.component.html b/src/app/organizations/organizations/organizations.component.html index 311169eb4c..98afdacaca 100644 --- a/src/app/organizations/organizations/organizations.component.html +++ b/src/app/organizations/organizations/organizations.component.html @@ -34,16 +34,20 @@ Create Organization Request
    -
    - + + Sort by... Name Starred - - + + Search Organizations + +
    @@ -117,6 +121,6 @@
    {{ org.displayName }}
    >
    - infoNo organizations found + infoNo organizations found
    diff --git a/src/app/organizations/organizations/organizations.component.scss b/src/app/organizations/organizations/organizations.component.scss index 0b7e9bc9d3..0b5ac0dbc1 100644 --- a/src/app/organizations/organizations/organizations.component.scss +++ b/src/app/organizations/organizations/organizations.component.scss @@ -1,10 +1,5 @@ -@import 'bootstrap4.scss'; @import '/src/materialColorScheme.scss'; -.mat-icon { - @extend .pr-5; -} - .h5 { color: #151c3d; font-weight: 500; @@ -61,10 +56,6 @@ form { margin-bottom: -1rem; } -.form-field { - transform: scale(0.9); -} - .mat-form-field-appearance-outline .mat-form-field-outline { border: black 2px solid; } diff --git a/src/app/search/basic-search/basic-search.component.html b/src/app/search/basic-search/basic-search.component.html index ef9920eaad..a850719302 100644 --- a/src/app/search/basic-search/basic-search.component.html +++ b/src/app/search/basic-search/basic-search.component.html @@ -1,18 +1,21 @@ Search - + + Enter search term + {{ option }} diff --git a/src/app/search/basic-search/basic-search.component.scss b/src/app/search/basic-search/basic-search.component.scss index aaa6265289..cb631dbf19 100644 --- a/src/app/search/basic-search/basic-search.component.scss +++ b/src/app/search/basic-search/basic-search.component.scss @@ -3,7 +3,3 @@ input[type='text']:focus, textarea:focus { border: none; } - -.form-field { - display: inherit; -} diff --git a/src/styles.scss b/src/styles.scss index 560a32d5cd..44450aa55f 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1495,6 +1495,15 @@ hr { font-size: 12px; } +// Can use this class for all search bars +.search-form-field { + width: 200px; + button { + // Workaround for Firefox since x icon does not align correctly, but can remove this if using angular 11 + display: inline-block !important; + } +} + // Style the float label of the mat-form-field .mat-form-field-appearance-legacy.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label:not(.mat-empty):not(.mat-form-field-empty) { From efe6c292ac1890e7ac8c0a3bb6b2e248c89725d1 Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Fri, 4 Jun 2021 11:18:08 -0700 Subject: [PATCH 110/119] Tiny, tiny word tweaking. (#1262) --- src/app/about/about.component.html | 2 +- src/app/home-page/home-logged-out/home.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index fc76a0f76e..777f3ff19c 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -61,7 +61,7 @@

    Findable

    icon

    Accessible

    - Dockstore never requires a user to login to search and inspect contents for workflows and tools. Links to source repositories + Dockstore never requires a user to log in to search and inspect contents for workflows and tools. Links to source repositories are provided. Once found, analyses can be moved from environment-to-environment (e.g. Terra, DNAstack, and diff --git a/src/app/home-page/home-logged-out/home.component.html b/src/app/home-page/home-logged-out/home.component.html index bab93014a0..da77d07162 100644 --- a/src/app/home-page/home-logged-out/home.component.html +++ b/src/app/home-page/home-logged-out/home.component.html @@ -179,7 +179,7 @@

    Create reproducible workflows & tools.

    Docker Hub.
  • - To minimizes redundancy and error prone installation, workflows and tools are described with common languages such as + To minimize redundancy and error prone installation, workflows and tools are described with common languages such as CWL, WDL, or Nextflow and stored on From 39230a96cab045d0f303db97d51187ca0d0b3f08 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Mon, 7 Jun 2021 19:21:02 -0400 Subject: [PATCH 111/119] This seems out of date --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 23a2cf7342..b7dd072775 100644 --- a/README.md +++ b/README.md @@ -212,16 +212,6 @@ Before running the tests make sure you: - serve the app via `ng serve` or similar. - have the Dockstore webservice jar in the root directory and run it (see scripts/run-webservice-script.sh for guideline) -## Documentation Generation - -This should eventually be done automatically on the master branch and have GitHub pages point to the docs folder. -To manually run it: -``` -npm install -g @compodoc/compodoc -npm run compodoc -``` -Then open `docs/index.html` with browser - ## Further help To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). From f6f3a28704de51bde3166f50b0dd610d83a22299 Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Tue, 8 Jun 2021 14:14:24 -0700 Subject: [PATCH 112/119] Remove Preview from GitHub apps (#1266) dockstore/dockstore#4282 --- src/app/shared/constants.ts | 3 --- src/app/workflow/info-tab/info-tab.component.html | 3 +-- src/app/workflow/info-tab/info-tab.component.ts | 2 -- .../register-workflow-modal.component.html | 1 - .../register-workflow-modal.component.ts | 7 +++---- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/app/shared/constants.ts b/src/app/shared/constants.ts index 712bd59b62..5936a3b175 100644 --- a/src/app/shared/constants.ts +++ b/src/app/shared/constants.ts @@ -38,8 +38,5 @@ export const currentTOSVersion: User.TosversionEnum = User.TosversionEnum.TOSVER export const currentPrivacyPolicyVersion: User.PrivacyPolicyVersionEnum = User.PrivacyPolicyVersionEnum.PRIVACYPOLICYVERSION25; export const dismissedLatestTOS = 'dismissedLatestTOS'; export const dismissedLatestPrivacyPolicy = 'dismissedLatestPrivacyPolicy'; -// This is used to toggle whether GitHub apps are recommended or not. -// If it's to be recommended permanently, it's better to revert this commit instead. -export const recommendGitHubApps = false; // There is a search term length limit of 500 on the backend, but two extra characters, '.*', get counted in the backend. export const searchTermLengthLimit = 498; diff --git a/src/app/workflow/info-tab/info-tab.component.html b/src/app/workflow/info-tab/info-tab.component.html index c2a2bc6604..8495589d17 100644 --- a/src/app/workflow/info-tab/info-tab.component.html +++ b/src/app/workflow/info-tab/info-tab.component.html @@ -19,8 +19,7 @@ *ngIf=" !isPublic && workflow?.source_control_provider === 'GITHUB' && - (workflow?.mode === WorkflowType.ModeEnum.FULL || workflow?.mode === WorkflowType.ModeEnum.STUB) && - this.recommendGitHubApps + (workflow?.mode === WorkflowType.ModeEnum.FULL || workflow?.mode === WorkflowType.ModeEnum.STUB) " > Keep your workflow automatically in sync with GitHub with our new registration process. Click diff --git a/src/app/workflow/info-tab/info-tab.component.ts b/src/app/workflow/info-tab/info-tab.component.ts index ce92196cd0..17805498ae 100644 --- a/src/app/workflow/info-tab/info-tab.component.ts +++ b/src/app/workflow/info-tab/info-tab.component.ts @@ -20,7 +20,6 @@ import { EntryType } from 'app/shared/enum/entry-type'; import { Observable } from 'rxjs'; import { shareReplay, takeUntil } from 'rxjs/operators'; import { AlertQuery } from '../../shared/alert/state/alert.query'; -import { recommendGitHubApps } from '../../shared/constants'; import { Dockstore } from '../../shared/dockstore.model'; import { EntryTab } from '../../shared/entry/entry-tab'; import { ExtendedWorkflowsService } from '../../shared/extended-workflows.service'; @@ -68,7 +67,6 @@ export class InfoTabComponent extends EntryTab implements OnInit, OnChanges { ToolDescriptor = ToolDescriptor; public entryType$: Observable; public isRefreshing$: Observable; - public recommendGitHubApps = recommendGitHubApps; modeTooltipContent = `STUB: Basic metadata pulled from source control. FULL: Full content synced from source control. HOSTED: Workflow metadata and files hosted on Dockstore.`; diff --git a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html index 29c7a24267..eaf220c477 100644 --- a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html +++ b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.html @@ -31,7 +31,6 @@

    Register Workflow

    {{ option.label }} -
    preview
    {{ selectedOption.extendedLabel }}
    diff --git a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.ts b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.ts index 9540e5c759..fba7085cec 100644 --- a/src/app/workflow/register-workflow-modal/register-workflow-modal.component.ts +++ b/src/app/workflow/register-workflow-modal/register-workflow-modal.component.ts @@ -22,7 +22,7 @@ import { SessionQuery } from 'app/shared/session/session.query'; import { Observable, Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { AlertQuery } from '../../shared/alert/state/alert.query'; -import { formInputDebounceTime, recommendGitHubApps } from '../../shared/constants'; +import { formInputDebounceTime } from '../../shared/constants'; import { Dockstore } from '../../shared/dockstore.model'; import { BioWorkflow, Service, ToolDescriptor, Workflow } from '../../shared/swagger'; import { Tooltip } from '../../shared/tooltip'; @@ -60,7 +60,6 @@ export class RegisterWorkflowModalComponent implements OnInit, AfterViewChecked, public Tooltip = Tooltip; public workflowPathPlaceholder: string; public gitHubAppInstallationLink$: Observable; - public recommendGitHubApps = recommendGitHubApps; public hostedWorkflow = { repository: '', descriptorType: Workflow.DescriptorTypeEnum.CWL, @@ -84,11 +83,11 @@ export class RegisterWorkflowModalComponent implements OnInit, AfterViewChecked, }, ]; private githubAppOption = { - label: 'Register using GitHub Apps' + (this.recommendGitHubApps ? ' (Recommended)' : ''), + label: 'Register using GitHub Apps (Recommended)', extendedLabel: 'Install our GitHub App on your repository/organization to automatically sync workflows with GitHub.', value: 0, }; - public options = this.recommendGitHubApps ? [this.githubAppOption, ...this.baseOptions] : [...this.baseOptions, this.githubAppOption]; + public options = [this.githubAppOption, ...this.baseOptions]; public selectedOption = this.options[0]; From cb4423a269e2bcddcf3a9d945ab7d294ec1e3d5a Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Thu, 10 Jun 2021 10:42:51 -0400 Subject: [PATCH 113/119] Update dockstore.model.ts (#1269) --- src/app/shared/dockstore.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts index 58e9b2a7c6..b26de3f450 100644 --- a/src/app/shared/dockstore.model.ts +++ b/src/app/shared/dockstore.model.ts @@ -94,7 +94,7 @@ export class Dockstore { static FEATURES = { enableCwlViewer: true, enableLaunchWithGalaxy: true, - enableMultiCloudLaunchWithDNAstack: true, + enableMultiCloudLaunchWithDNAstack: false, enableOrcidExport: true, }; } From 5f034b142a64f9a2d0b8638c6cc60e54abdab356 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Thu, 10 Jun 2021 16:53:51 -0400 Subject: [PATCH 114/119] Update run-webservice-script.sh --- scripts/run-webservice-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-webservice-script.sh b/scripts/run-webservice-script.sh index f4ded8ee95..371389e6ed 100755 --- a/scripts/run-webservice-script.sh +++ b/scripts/run-webservice-script.sh @@ -4,9 +4,9 @@ set -o pipefail set -o nounset set -o xtrace # Uncomment this to use the actual Dockstore webservice from the package.json -# JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" +JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" # Uncomment this to use the CircleCI jar -JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" +# JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH} chmod u+x dockstore-webservice.jar From 3e5321f45779583a019dfeaa422e01990363ced6 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Thu, 10 Jun 2021 16:57:13 -0400 Subject: [PATCH 115/119] wrong one --- scripts/run-webservice-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-webservice-script.sh b/scripts/run-webservice-script.sh index 371389e6ed..f4ded8ee95 100755 --- a/scripts/run-webservice-script.sh +++ b/scripts/run-webservice-script.sh @@ -4,9 +4,9 @@ set -o pipefail set -o nounset set -o xtrace # Uncomment this to use the actual Dockstore webservice from the package.json -JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" +# JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" # Uncomment this to use the CircleCI jar -# JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" +JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH} chmod u+x dockstore-webservice.jar From d0b9c99ba01998ed4c62ed7035f34957e7463f85 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 23 Jun 2021 10:11:44 -0400 Subject: [PATCH 116/119] Test with hopefully the final artifacts (#1279) * Might as well * Update package.json --- package.json | 4 ++-- scripts/generate-openapi-script.sh | 12 ++++++------ scripts/run-webservice-script.sh | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 9a8ec1534f..334d9d456b 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "dockstore-ui2", - "version": "2.3.0", + "version": "2.8.0", "license": "Apache License 2.0", "config": { - "webservice_version": "https://app.circleci.com/pipelines/github/dockstore/dockstore/5927/workflows/fa63bb79-cd13-4cf6-9c44-92fb1e90f368/jobs/10638/artifacts" + "webservice_version": "1.11.3" }, "scripts": { "ng": "npx ng", diff --git a/scripts/generate-openapi-script.sh b/scripts/generate-openapi-script.sh index 526f82f487..9592ced28c 100755 --- a/scripts/generate-openapi-script.sh +++ b/scripts/generate-openapi-script.sh @@ -9,9 +9,9 @@ GENERATOR_VERSION="4.3.0" # Uncomment this to use the actual Dockstore webservice release from the package.json -# BASE_PATH="https://raw.githubusercontent.com/dockstore/dockstore/$npm_package_config_webservice_version" +BASE_PATH="https://raw.githubusercontent.com/dockstore/dockstore/$npm_package_config_webservice_version" # Uncomment this to use the CircleCI swagger/openapi instead -CIRCLE_CI_PATH="https://11124-33383826-gh.circle-artifacts.com/0/tmp/artifacts" +# CIRCLE_CI_PATH="https://11124-33383826-gh.circle-artifacts.com/0/tmp/artifacts" # DOCKSTORE-2428 - demo how to add new workflow language, generate from local copy of swagger # Uncomment this to use your local copy of swagger instead # BASE_PATH="../dockstore" @@ -24,11 +24,11 @@ rm -Rf src/app/shared/openapi # Uncomment these two lines to use the actual Dockstore webservice release from the package.json -# java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/swagger.yaml -g typescript-angular -o src/app/shared/swagger -c swagger-config.json --skip-validate-spec -# java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/openapi3/openapi.yaml -g typescript-angular -o src/app/shared/openapi -c swagger-config.json --skip-validate-spec +java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/swagger.yaml -g typescript-angular -o src/app/shared/swagger -c swagger-config.json --skip-validate-spec +java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/openapi3/openapi.yaml -g typescript-angular -o src/app/shared/openapi -c swagger-config.json --skip-validate-spec # Uncomment these two lines to use the CircleCI swagger/openapi instead -java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/swagger.yaml -g typescript-angular -o src/app/shared/swagger -c swagger-config.json --skip-validate-spec -java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/openapi.yaml -g typescript-angular -o src/app/shared/openapi -c swagger-config.json --skip-validate-spec +# java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/swagger.yaml -g typescript-angular -o src/app/shared/swagger -c swagger-config.json --skip-validate-spec +# java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/openapi.yaml -g typescript-angular -o src/app/shared/openapi -c swagger-config.json --skip-validate-spec diff --git a/scripts/run-webservice-script.sh b/scripts/run-webservice-script.sh index f4ded8ee95..371389e6ed 100755 --- a/scripts/run-webservice-script.sh +++ b/scripts/run-webservice-script.sh @@ -4,9 +4,9 @@ set -o pipefail set -o nounset set -o xtrace # Uncomment this to use the actual Dockstore webservice from the package.json -# JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" +JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar" # Uncomment this to use the CircleCI jar -JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" +# JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar" wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH} chmod u+x dockstore-webservice.jar From ea7fb582a1f22780a3702b172c251eb50c61f1d3 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Tue, 6 Jul 2021 16:48:38 -0400 Subject: [PATCH 117/119] Add extra note about what is ORCID (#1299) * Add extra note about what is ORCID * Fix --- .../loginComponents/accounts/external/accounts.component.html | 3 +++ .../loginComponents/accounts/external/accounts.component.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/loginComponents/accounts/external/accounts.component.html b/src/app/loginComponents/accounts/external/accounts.component.html index 8414b3bc45..04d419f9d0 100644 --- a/src/app/loginComponents/accounts/external/accounts.component.html +++ b/src/app/loginComponents/accounts/external/accounts.component.html @@ -69,6 +69,9 @@

    {{ row.message }} If your token has expired, relink your account.

    • +
    + See ORCID and docs for information on what is ORCID. +
    {{ row.bold }}
    diff --git a/src/app/loginComponents/accounts/external/accounts.component.ts b/src/app/loginComponents/accounts/external/accounts.component.ts index 292008f283..e85dc585f6 100644 --- a/src/app/loginComponents/accounts/external/accounts.component.ts +++ b/src/app/loginComponents/accounts/external/accounts.component.ts @@ -23,7 +23,6 @@ import { Dockstore } from '../../../shared/dockstore.model'; import { TokenSource } from '../../../shared/enum/token-source.enum'; import { TokenQuery } from '../../../shared/state/token.query'; import { TokenService } from '../../../shared/state/token.service'; -import { User } from '../../../shared/swagger'; import { TrackLoginService } from '../../../shared/track-login.service'; import { UserQuery } from '../../../shared/user/user.query'; import { UserService } from '../../../shared/user/user.service'; @@ -38,6 +37,8 @@ import { AccountsService } from './accounts.service'; export class AccountsExternalComponent implements OnInit, OnDestroy { public dsServerURI: any; public orcidId$: Observable; + public TokenSource = TokenSource; + Dockstore = Dockstore; // TODO: Uncomment section when GitLab is enabled accountsInfo: Array = [ { From 1c739c9509c61194a79482471acbecd99673aa4e Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Tue, 6 Jul 2021 13:51:16 -0700 Subject: [PATCH 118/119] Remove BDCat logo and update its font. (#1300) Also, Galaxy added to launch partners graphic. For funders, since there is no graphic logo for BD Cat, removed the title because it just ended up repeating BioData Catalyst text twice. --- src/app/funding/funding.component.ts | 2 +- .../images/home/diagram-launch-with.png | Bin 44598 -> 167203 bytes .../sponsors/BDCatalyst-text-generated.png | Bin 1566 -> 8331 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/funding/funding.component.ts b/src/app/funding/funding.component.ts index 61a8abc653..17fa5ad5dc 100644 --- a/src/app/funding/funding.component.ts +++ b/src/app/funding/funding.component.ts @@ -49,7 +49,7 @@ export class FundingComponent { }; // Due to not having permission to use BD Catalyst's logo, the source here is a text generated placeholder BioDataCatalyst: Funder = { - title: 'BioData Catalyst', + title: '', website: 'https://biodatacatalyst.nhlbi.nih.gov/', // imageSource: '../assets/images/sponsors/bioDataCatalyst.svg', imageSource: '../assets/images/sponsors/BDCatalyst-text-generated.png', diff --git a/src/assets/images/home/diagram-launch-with.png b/src/assets/images/home/diagram-launch-with.png index 963580329276231ae97c34e3316bf29cff13ccc9..e4cee84f4b1293712213c6272f0a9622c4dad8d3 100644 GIT binary patch literal 167203 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

    MsAs&_UF_LJ?RDtl#vX$w3E&z8Z$qd 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%0D*u22C6zup5Dqe8 z5=bP%N(G4@~n?kKVR}s z@iQgGk&yu=(1Dghd)VdqY7)S2yeObow@bcwdjH&FBr{8EMzcH=cwG5Vuos=F_4%)C z$EGhdm9oXJ?MbA_lvZj2OS1VzTAMZ`&;JOoYFQT$T<{gPF7;v3SPRSR68)nciQqmf)j7>qc|rttDDzS zjrN`A%n0YCxi$`+PoHf?(brQ03>s~61@KtvUFC9vftQ1biRxtoPj9?|`-j(+cGICB zA>3tK2_-Ab;3x40x;h_XSzM`Sf z_lL9H>5epnktetu9&%XdT;xA+eAG@_>h{i!`sfgjYemSW^Bf2T) zs#Wq$JdN?kf5#R$K<7C%GB`{c0|HbecN5w&ID56haKq`2sbuNR$4@F=YWCuzc9SX@ zoDT|=jj6(UVyC|`Xhx1x5Fwku1NM0vqC zXpHb9Q9%BeZoJsjW{)|(hJnsJ{*q+02RAWo<@)(bx5pg&Tu90Bg~eQmXS_7N^gy&p zZkTCjm=!Oj+lfibnx*Y^f{S%8jLSi8@anMGFcKk|25lgkHrEZvY}{=d7H@DylvDv5 zQQT)JrJvv%!XvY8WwSv9x5>;NpgWX!8|RXaf0%)Pr|~|HuE)xPb9~MRKktr!yfr)S z+hZjss<|EUx__^z8j-*y!9o#Sh+=SXPzQ!v>vB=axH?S0z0;(*Mj-ZNuklvHO($HHQ=vijP+ zUi6$;N;Y9ZV+wL)${Ql0x2C|8cDQ>`B`pk65h?r73r@(bHQ5Ogb9QN$JH z*f1u7m>7Bh4ooz2U_2|)3l=OZ9K>M5`04EWd1;ApkI67xL*0{_L7|x4h4A1~hz&o3 zP}2cmPFXZhb>5XL!Iw7M%=&d#wmCTB%PioTI57}G3(-w%;MS)zDhRt1fN2IJjgEyz z^~+lzp>F_I_x+w&o?x*~KtSTJt;rl9mC}wxA;5$IjS?Z&A)yBxhtB`;B4ai~6BI{k zm}Qo|{h0ZeSk@|gR74{Y=m{iYdPXi?F58RzTGH|t+t6SF_Rh`^bHSyar50T!{!0*+3GG8izk~*yDkD=!w z#v}<7y>S3jM7b6!-9D)C7;8b7LF=oXH^>=MvhaTgCOD`IKpX%Hd@Vu1M858tK@!Hw zkJ6OIaS}em140>;5Kp+Wi%5t7C;ioru`O5W6bivR5)SNkxqKr%7q@L*;KBfJCmG18Kba9 zok#rDh%l{F2?Nc*n2QZ1RBEd{U+pH@O%QmElr8LZeZGHnzq#X? z{`GLjV`BxAgSXtoa=41LuhGSMhHRbtbKSk@2pUq0*k}zF@)a3=r9>fPiPi?i*Ul&p z>}TET>Z%TFY7<1@TxLLNFAH+~&tEP7RuvMU>^pA5n&s`CkAE>D751$D%&AJ?uN6I& z2K59~U}tvo^!jEq8-p3A5YTJmM;h^5cidYZj->#G|Jfx-ANSo#LwSM`G1s!s%87`8 zc0SC>0dlB-M21ncqQ~Q~n}l9M#YA&^`<|B*!hei`4`5)g@SY`=4jQa33`7vyWa2ln zse04wnyXFM)ocM2)A`A+S%Q{Su9Pfd7V8Bz?Z{Y(y%XHYc~$gDiGIbajYB{me~~Ct z>n^cU)EQMsNMN#D!kP<2H4jjtkI<#H0%;M8rZ*$3_9{}D0m%^@Ke`m~ZC@St zOV!?rxrK?Y%!nlUvuf6`a*^CJPR}%v2dGlJb<}NXtr&PLMj u#MCFM{p#11 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%0D8g1 zqS7!lpU1rA<>j9J04P%(QbJn#8|%Y7{vW19*aa%18ks+;()QYc)ZR`QxtDWeoO$}H ztgndH1a4-KW`UTO}U9tivxzn!8D#Ag)YA))cGmJh7VieNZB-odF29xd9 zf=e1un0P-34B82OYb3ayIpVMoMkQuxtERT`jG&BGz9U8fu1gS(ka+ay(ZJgc;7CMs z{KF~T?Hr?vGrvq-jBU(h>b31-dn`g1wtF1|ogk;;T#C_I1WKXG-F z*QREw1jtAay(DI4#)JsMdmjp$l^O4%o6QR|5h#E$z;kSq^iC)zjj`TQ4SMEBD0>Y( zofl<#7*)38B@V4E136QZz-@ZTrO$PAq?_s%rJj%vSGwvixP6%(25hI*ca~gpsd|v( zEgnaNpj}4BJV!<*-ekaNp_`{T$NJblpjNgR3EXErpkpByF?D|YV+EnsK%WG`r-jzN zl1YOD9vg}@OQ5Z?)r<4&YFqK9d*`_321JT>xvgyBG~Gl`)z!HEr~lklkm=6kAg0k zs&N+7YMT_oR1u9L*_IiT5sxSxaBlHZq_GE=`v&T-FG%i5Xz<7!>dQC75DAD~yWAlw z($O7d7PD(-9$pK zoEhMbDRek%IzBQ;C!`0FWO0}w&Ne96SCJg&LiySxNMNjkgin!{?u=Adz6J29qk%51 zh_n-_!|zq8goo#~vIPQ|WMlbw#fp;RlyTGZY=s*M3iS03p-P;15diJ?k%vTt(CVkV z?+Zy%{>s_6S2fGZ+4-AmdUL1=$hqA|KgTzfB2~Q#1_1aM0i4F0Qq|9O2h+NJs!p2K z-PL065$$?v8NN22PoL5d5<#0Gb=zoGX$2dcpNIelJ zyRME_R87g*WZ@VRgJ+tj!PNs*0|*7FTQ^GdTf`s?WavbEj(G<;3aEuy-DZORKHiDd zl1WdU`Nrdz^1+KMXuNv@?C*x_#UWYw|X9U&Y{$f+c!j~ zs~UzR)3h7%Xk?j4ylQdccT3*ATXUcQ9|nZ}B(f13By!`8hTDPMb|?oUD%7UjP6A literal 44598 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

    JbdK3>>I$BM+~ zS#TwtW7Wi~SFhd#j=F9I78n~GJ)Q?l?H_Q+^y{15T7bkFT0qt~YeQ(5>Ye7GM%`&)c!oH-2;h&2vB{P6l3Kuk4PuB`$b?fj=qy|x)Oh# z4=6;)j;54L+7K&r7kN~JPDVp8mdoFeG0?=w3$5WyL^9@ql_~u~M=A-U{2w%ABM=2Si}V zSQNxjuLT(OKJ<|VcD=mE9WPR?cF1y{Ss-bCa@V_|e-8z{WSS%#^sPI$fB^!$6r5DP zaI!htMq}tRbQ`!EMMjY>;`0A|`qgU63Cy|7qv`{$@sxEevG`eq?61M|R8v0EP6Gsv z3`W2q-#^i5sSkuU)X%|rADmfUU9{Vu@A>C+j7~g2-p8Xdy8QH$ zN$A!<16Dm#XwWg}co?1b9XDFFgPz4V;XYz@IsUN24*Nwuzqjyf#6%D}hgKf?c*@6d zgvvY9g12Uc)eD$bWEJgp#w|dHkMrejX}^M2fO z>N-Q^O5eIev0b@j(qjaU#6E^;Ym+g$&@O0<52Ng}iP!YgUZ@|=PcdN_v>DKjFkxPN z6d#Yhg7L4{agSvxMBr6sDTCPrrQ+~9kVwG{ z5NGO5LWS%Bd>#QWVlkmrtnMXFChWs;TM1$6>?Mk(qTxD5V`4fLna-je4=3zFSjTm| zSU_1q#)fhm7Lb3Dj63~Lj~#vl-y>8n#!+2-A&beGmoEP4pXWn(0=_r$>|Yr&>8O-4DPiK8eJdv=Tws*r8h9G4pV@qL{Kq4mQPf8#1lm>D zC{>bH+whw0Q3}@+@stdHSiu5?jxQ;4OjRo2#FYStW}Oj*TB@;dBe-rx)bX5wab`7+vK3*mi&|JUA0=nC5Zl&Y({JOMYP7 z`?$dC5Fdtty@YxAF~-J?%pak}hmW5rObeU|NqJrey2-{vm^S#Sw85}57IO*61NX$5D(*&A&K4&sVfE(G8wME#?COnCUH1JXgvIo#P0$$}{I-{OfF1H1t zt;-{`E@T4^e$6vIDB$R*Wq`m-(Dw>GiC*j|XDfFn@0f5_i855fO_&$oqN54wa|A}S z8E577@wyM1;J__72z}_eZyg6?O;BfYFVSYmkRf$hTr@$>lO1?@gQ)Yn5yU4(z+;1{ z(|C|W_a&712K6|bupKXVQ}v>b$H!(|4n!vQYmh5+;(;t{km*M5r4DM=tXV_azY+S@ zl|g6`Q;y;Tq?Gw+0I(-|6yq&)4(=oAA5d!1Ou7@ehTd z5yEd4d^D-q3){hzd0(apFH`w?(ZvyVZySg5UPjmY_F77@)G>uZ8`O48uX;&ZE zfZ;h_rye$c+CLY4=QLK^v}rTdevCkQy_m1{HU489vP`sLt~5Gb4SXaUjN8%k2zdP` zX)UO1cQIEnBVFHwvk}d--BHXuXB=z(FEaEZ$#&-<;Gs6~Tb#~$Hepa48=;TT**SPQ z^N--22Kxgw4Tur(I&dckYDi`#?^rT3KxaDm>6z@=F1TRu)+c6r35EBZ>V^@`PRZFyaCA9J72U?5}Qw?7V=5C}u`CH`)9^@SA*C% zMmi@8Z_rhjXioAok)J`sY4;d%=xt#L7~EkxvU3MfPEInjqHd1N&r(vTp8yZZ%!Ck& zKR=FK3{M^H+3qUN)f?GBV6A}ZoIT)>VFo*sa_zeH{W4Z}qtT7d^7jc8K!P%+F|p3D z;jT2ep@#~>gTEdF9POfU!N6Vbg0l-~IonfXZ2>DZ+;z7McIgnpJ8E@oF*uxG?3;~e4_A@`9! zK62`nT3dE(x+8F2u!Hl0kDpJ7v3in;BCunIXHU-6r!xUv&pG}a7CN=~w95DJ4^u{9 z6{j-6AD2Vf?Togmt2)v?z4*bkzEB)>G_neuVG(7>h@NWY9l`|Ki@x%2AMPC=Jx4lp zf8pcUp;nuWFYPd!n0d%DiaO}uFO=&0f_z218#+9S{xd;%=yWk@lOz=frhBbh{S5t} z5I%R4{=N?@REV*D72ea~*Wcucj`d;CN#tEY_&l;MLN48x>1eeLux^9{fpw;yYlx>$ zS?CLkT}NtOz2^Ak@btVM$53~`>ogx0C#1X;&;(FP50D|e_~MJ7(L_pn=#xsvA@BRt zagm3tK5$fkkk21MH%hxfA5MB8@~aP5sB?W8fqL|{3Jv}C$INFuJVYBE4D4CP-}4`Q z@WDzm-;0NiLj|WSwOhb>x(&Q~1@BtM$?J@h*?ActmC&wTyZdSE%ZavEIu93Y@jMt5 zfTTal=pTcRR!Fu13ds+z=HT7#^CRs?BSRYKx`@o|#1Vv1V9IjxM9%d6KoqSBhtJ=b z1pj2h6lX$k^0)Dn=EtlL^LrVU`#m!sS^6?qr{l|b+8VhyK!&%tO#dGy2a`NgydAu6 zHxWpi$v_+nBhkbD}*@Dk)Lvgt|J!N1D@o(9@R;$5hRc0N%C&c)h?g(f%nY2Yt` z|7N~e+>p5RqZMh&05xvhcnL4gc7hie*R;zmOrR$+c`hKYCBO4H0vhcq3+~WM8K0fG zgyYotl-1ZS0N8QBjzgwYmLJ-9W}0K4<Hk0%{U~!De3~;Ksa`T@IXUPT z!^@`8g)Oh_CqGUZWS42tBAoN_DFfv70owrSH*TfS`~`fy%IgK6!))dim8QH$Dc4>Y zrHdm!^xL0w=AH=TWimixX~VJfn~l(vk}f6OM%}cVR~rT#d2=Gh$`TN5BiI@~v*5io zbhHxSnjztRM&^bLC`ncp4bW)UGm&eu+G`v#&u1djAS{>DmlWVL7=F$P9_E>h&l--E zF7&qe<&wiij7+cdKVPt835tgh#;gN{ZxXyD7vE<^p}%=2DHBM(MKkyMwOE$} z_@zu#ec}7BxU}HTX5b&iMQ>=kAD2fI9=!DhwgL;ICpV|JlWZIqqHZC%N(jE0+Nh0~&55K~4=Px^ICCtw3FMLiyYA zpW@XJ&ih-|Z=f6wGmsJI@RpwHteQx9;o1Ju2i(~+-<>W9XHxhb!bjq_9y%ruf^FqCe3yBZ>^$)(s%AY{`lk0=(;O@r+6@N zE|8ImqR9oWKFIx}?(a&FO?P?g{r~Tji4S*Q2SC>Y9R25B-5W2#K&{I}QxSRGt@MU( zXi-63x?(J{8J4t2UVS=JmuB=g{nqmv{8ucbmg#W<{GyK5(mc!vw8cEiIgn6&Af=v^>PMS0-W9>!-Guj8IBC;JK^ zPmbU!M6C(aL<5Ni5)D+W1~51`Q^MJJy-IC|;pyork^7q=dSv0st7=%X1FGs4NXkz% zkZ2&$Kpq;v;55VQOCG0186VjGQD1Y&gMFot)T)$Hl0p&V&YJMPo=iW4O>=VS+zSwBf`qJcyM zi3X~r1~4*H@ay@VP6-0m<+o5vNiQiWDS6HNR9dx^I}s|;K%#*}1BnI_4OF=X{tx*J Vi~e@YOhNzv002ovPDHLkV1lp%B{Tp4 literal 1566 zcmZ{kc|4SP9LIl-P_EoZt|W5LJR`!WWJU&KD21}iteMd;(W_V%=lA=3zrXkA`}+O$d~*E#b}FyYUjqP8 z#(80O!8!*ow1O$zk8ghe*e9q$f6L$2Z{;wrc|iSXKm2O!BDfb>iNmf)lG*8s#J z0GJ8~z@-QPokQoY2cTgf{gcm54EVy%6}7;fJQIh<%8$#g*09ntlKF&$kE9rf{Q{-B z&LCSr)kLEh?()4erGU^@*lQX4KiHHomFPb7YlLP3CZ9(UCmSAlJ@zS+*g} znXK@Ga@=S1kCgQ`mTPJbn9LW6IBjYBIad^KDR0HT(bjhAqTp)Y9mQxW5Pn4^ZclZ? z)$dACpXywkr$daZIZnKUa(X|x1QP?PI|AdNNuu3v-t;9NWMrq!cXP9%~ z*is^oFMrWYFs1a^mnY6d2t<#d!4i^$WEUxyThQNX>cbsEJwvnVplNSFk!})e~t_Z zR&3it?+L9o;MrY^`WRs($buA zM%**<QF-}hOGWF4;)Ojtmcui8&u?ceJeY>YHUjg8M2%OFPw$}& zyBK1M)=)M)y9LB8UNJe9mR{g!F(#Fa`eH1X%jSK&q239QsB1Vt_Qnf@H z2SfE0h=m;l3MH1z1gI@_S8s2CsqPB(r?SYjU<{Q`J{U`790ZU9>Y7^A3D~3ay(i?G W#}U!)Vf{C30XVE5=JJm4qyGTgHjqpJ From d3f0bf76c556476b4e0cf402b16f1dc17d0ff422 Mon Sep 17 00:00:00 2001 From: e34lin <65895867+e34lin@users.noreply.github.com> Date: Wed, 7 Jul 2021 15:59:06 -0400 Subject: [PATCH 119/119] Changed the ORCID logo size (#1302) Co-authored-by: Elizabeth Lin --- src/styles.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles.scss b/src/styles.scss index 44450aa55f..f077e016ca 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1451,8 +1451,8 @@ hr { } .orcid-id-logo { - height: 1.4rem; - width: 1.4rem; + height: 1.6rem; + width: 1.6rem; vertical-align: sub; }