From a871058577e7019f03ea824fca82967825d7669c Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:43:28 +0200 Subject: [PATCH 01/22] chore: we use our custom made doc --- webcomponents/drag-resize-rotate/package.json | 2 +- .../src/components/readme.md | 23 ------------------- .../drag-resize-rotate/stencil.config.ts | 15 +++++------- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 webcomponents/drag-resize-rotate/src/components/readme.md diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index bef5d9957..196d7f144 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -16,7 +16,7 @@ "LICENSE" ], "scripts": { - "build": "stencil build --docs", + "build": "stencil build", "start": "stencil build --dev --watch --serve", "test": "stencil test --spec --e2e", "test.watch": "stencil test --spec --e2e --watchAll", diff --git a/webcomponents/drag-resize-rotate/src/components/readme.md b/webcomponents/drag-resize-rotate/src/components/readme.md deleted file mode 100644 index 8d7523b59..000000000 --- a/webcomponents/drag-resize-rotate/src/components/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# deckgo-social - - - -## Properties - -| Property | Attribute | Description | Type | Default | -| ---------- | ---------- | ----------- | ----------------------------------------- | -------------- | -| `drag` | `drag` | | `"all" \| "none" \| "x-axis" \| "y-axis"` | `'all'` | -| `resize` | `resize` | | `boolean` | `true` | -| `rotation` | `rotation` | | `boolean` | `true` | -| `unit` | `unit` | | `"percentage" \| "px" \| "viewport"` | `'percentage'` | - -## Events - -| Event | Description | Type | -| -------------- | ----------- | -------------------------- | -| `drrDidChange` | | `CustomEvent` | -| `drrSelect` | | `CustomEvent` | - ---- - -_Built with [StencilJS](https://stenciljs.com/)_ diff --git a/webcomponents/drag-resize-rotate/stencil.config.ts b/webcomponents/drag-resize-rotate/stencil.config.ts index f76b9df95..ebca56ff9 100644 --- a/webcomponents/drag-resize-rotate/stencil.config.ts +++ b/webcomponents/drag-resize-rotate/stencil.config.ts @@ -8,20 +8,17 @@ export const config: Config = { namespace: 'deckdeckgo-drag-resize-rotate', outputTargets: [ { - type: 'dist' - }, - { - type: 'docs-readme' + type: 'dist', }, { type: 'www', - serviceWorker: null // disable service workers - } + serviceWorker: null, // disable service workers + }, ], plugins: [ sass(), postcss({ - plugins: [autoprefixer()] - }) - ] + plugins: [autoprefixer()], + }), + ], }; From a38e0921842674463a1cb2a732ec4223f85a444a Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:43:47 +0200 Subject: [PATCH 02/22] feat: add supports for editable text elements --- .../drag-resize-rotate/src/components.d.ts | 2 + .../src/components/deckdeckgo-drr.scss | 6 +- .../src/components/deckdeckgo-drr.tsx | 104 +++++++++++++++--- .../drag-resize-rotate/src/index.html | 38 ++++++- 4 files changed, 127 insertions(+), 23 deletions(-) diff --git a/webcomponents/drag-resize-rotate/src/components.d.ts b/webcomponents/drag-resize-rotate/src/components.d.ts index 6617b11a6..5a18c407e 100644 --- a/webcomponents/drag-resize-rotate/src/components.d.ts +++ b/webcomponents/drag-resize-rotate/src/components.d.ts @@ -10,6 +10,7 @@ export namespace Components { "drag": "x-axis" | "y-axis" | "all" | "none"; "resize": boolean; "rotation": boolean; + "text": boolean; "unit": "percentage" | "viewport" | "px"; } } @@ -31,6 +32,7 @@ declare namespace LocalJSX { "onDrrSelect"?: (event: CustomEvent) => void; "resize"?: boolean; "rotation"?: boolean; + "text"?: boolean; "unit"?: "percentage" | "viewport" | "px"; } interface IntrinsicElements { diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss index 613a20d07..9eeae791c 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss @@ -3,7 +3,7 @@ justify-content: center; align-items: center; - contain: size; + contain: var(--contain); width: var(--width); height: var(--height); @@ -30,9 +30,9 @@ width: 100%; height: 100%; - user-select: none; + user-select: var(--user-select, none); touch-action: none; - pointer-events: none; + pointer-events: var(--pointer-events, none); } div.anchor { diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx index 551383f11..64a48f9c6 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx @@ -22,7 +22,7 @@ export class DeckdeckgoDragResizeRotate { // Size - @Prop() + @Prop({mutable: true}) resize: boolean = true; // Position @@ -35,6 +35,11 @@ export class DeckdeckgoDragResizeRotate { @Prop() rotation: boolean = true; + // Text content editable + + @Prop({reflect: true}) + text: boolean = false; + // Size @State() @@ -107,6 +112,9 @@ export class DeckdeckgoDragResizeRotate { private pp_x: number; private pp_y: number; + @State() + private editing: boolean = false; + async componentWillLoad() { await this.init(); @@ -145,18 +153,22 @@ export class DeckdeckgoDragResizeRotate { document.removeEventListener('mouseup', this.stop, true); document.removeEventListener('touchend', this.stop, true); } + + if (this.el) { + this.el.removeEventListener('dblclick', this.dbclick, true); + } } - private init(): Promise { - return new Promise((resolve) => { - this.width = this.el.style.getPropertyValue('--width') ? parseFloat(this.el.style.getPropertyValue('--width')) : 0; - this.height = this.el.style.getPropertyValue('--height') ? parseFloat(this.el.style.getPropertyValue('--height')) : 0; - this.top = this.el.style.getPropertyValue('--top') ? parseFloat(this.el.style.getPropertyValue('--top')) : 0; - this.left = this.el.style.getPropertyValue('--left') ? parseFloat(this.el.style.getPropertyValue('--left')) : 0; - this.rotate = this.el.style.getPropertyValue('--rotate') ? parseFloat(this.el.style.getPropertyValue('--rotate')) : 0; + private async init() { + this.width = this.el.style.getPropertyValue('--width') ? parseFloat(this.el.style.getPropertyValue('--width')) : 0; + this.height = this.el.style.getPropertyValue('--height') ? parseFloat(this.el.style.getPropertyValue('--height')) : 0; + this.top = this.el.style.getPropertyValue('--top') ? parseFloat(this.el.style.getPropertyValue('--top')) : 0; + this.left = this.el.style.getPropertyValue('--left') ? parseFloat(this.el.style.getPropertyValue('--left')) : 0; + this.rotate = this.el.style.getPropertyValue('--rotate') ? parseFloat(this.el.style.getPropertyValue('--rotate')) : 0; - resolve(); - }); + if (this.text) { + this.resize = false; + } } private async displaySlot() { @@ -183,17 +195,48 @@ export class DeckdeckgoDragResizeRotate { } this.selected = false; + + this.resetTextEditable(); + return; } - this.drrSelect.emit(selected); + if (!this.editing) { + this.drrSelect.emit(selected); - this.selected = true; + this.selected = true; + + this.initTextEditable(); + + this.startMove(); + } - this.startMove(); await this.initStartPositions($event); }; + private initTextEditable() { + if (!this.text || !this.el) { + return; + } + + this.el.addEventListener('dblclick', this.dbclick, {once: true}); + + const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *'); + if (element) { + element.setAttribute('contentEditable', 'true'); + } + } + + private resetTextEditable() { + if (!this.text || !this.el) { + return; + } + + this.editing = false; + + this.el.removeEventListener('dblclick', this.dbclick, true); + } + private async initStartPositions($event: MouseEvent | TouchEvent) { this.startX = unifyEvent($event).clientX; this.startY = unifyEvent($event).clientY; @@ -206,8 +249,8 @@ export class DeckdeckgoDragResizeRotate { } private initStartPositionsMove() { - this.startWidth = this.width; - this.startHeight = this.height; + this.startWidth = isNaN(this.width) ? 0 : this.width; + this.startHeight = isNaN(this.height) ? 0 : this.height; this.startTop = this.top; this.startLeft = this.left; @@ -516,6 +559,30 @@ export class DeckdeckgoDragResizeRotate { }; } + private dbclick = async () => { + this.editing = true; + + const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *'); + if (element) { + element.focus(); + + await this.moveCursorToEnd(element); + } + }; + + // https://stackoverflow.com/a/3866442/5404186 + private async moveCursorToEnd(contentEditableElement: HTMLElement) { + if (window && document && document.createRange && contentEditableElement) { + const range: Range = document.createRange(); + range.selectNodeContents(contentEditableElement); + range.collapse(false); + + const selection: Selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(range); + } + } + render() { const widthUnit: string = this.unit === 'percentage' ? '%' : this.unit === 'viewport' ? 'vw' : this.unit; const heightUnit: string = this.unit === 'percentage' ? '%' : this.unit === 'viewport' ? 'vh' : this.unit; @@ -523,11 +590,14 @@ export class DeckdeckgoDragResizeRotate { return ( {this.renderEdgesAnchors()} diff --git a/webcomponents/drag-resize-rotate/src/index.html b/webcomponents/drag-resize-rotate/src/index.html index 1a2f86534..b95e36d8e 100644 --- a/webcomponents/drag-resize-rotate/src/index.html +++ b/webcomponents/drag-resize-rotate/src/index.html @@ -17,11 +17,11 @@

Editable container

-
+
-
+
@@ -35,6 +35,23 @@

Editable container

+ + +

Move and edit me

+

Not editable container

@@ -45,7 +62,22 @@

Not editable container

 -
+
+ + + +

You can't edit me

 From 2e2b082068645ba7217891e814a304b782b905e3 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:46:31 +0200 Subject: [PATCH 03/22] chore: update dependencies --- .../drag-resize-rotate/package-lock.json | 1707 +++++++++-------- webcomponents/drag-resize-rotate/package.json | 18 +- .../drag-resize-rotate/src/components.d.ts | 8 +- 3 files changed, 898 insertions(+), 835 deletions(-) diff --git a/webcomponents/drag-resize-rotate/package-lock.json b/webcomponents/drag-resize-rotate/package-lock.json index a2dc74957..d11950308 100644 --- a/webcomponents/drag-resize-rotate/package-lock.json +++ b/webcomponents/drag-resize-rotate/package-lock.json @@ -14,35 +14,55 @@ } }, "@babel/core": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", - "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.6", - "@babel/parser": "^7.9.6", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz", + "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.5", + "@babel/types": "^7.10.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", "json5": "^2.1.2", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" }, "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "@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/helper-validator-identifier": { + "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/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" + } + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -52,14 +72,13 @@ } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", + "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", "dev": true, "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.5", "jsesc": "^2.5.1", - "lodash": "^4.17.13", "source-map": "^0.5.0" }, "dependencies": { @@ -72,102 +91,102 @@ } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "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.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@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.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz", + "integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.10.5" } }, "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", + "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz", + "integrity": "sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" } }, "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "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-replace-supers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", - "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", + "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", "dev": true, "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", + "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-validator-identifier": { @@ -177,14 +196,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", + "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", "dev": true, "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/highlight": { @@ -199,9 +218,9 @@ } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -223,12 +242,21 @@ } }, "@babel/plugin-syntax-class-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz", - "integrity": "sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", + "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -241,12 +269,12 @@ } }, "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz", - "integrity": "sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==", + "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.8.3" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-nullish-coalescing-operator": { @@ -259,12 +287,12 @@ } }, "@babel/plugin-syntax-numeric-separator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz", - "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==", + "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.8.3" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-object-rest-spread": { @@ -304,42 +332,106 @@ } }, "@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" + }, + "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/helper-validator-identifier": { + "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/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/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "@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.13" + "lodash": "^4.17.19" + }, + "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/helper-validator-identifier": { + "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/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/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "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": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "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 + } } }, "@bcoe/v8-coverage": { @@ -364,13 +456,14 @@ "integrity": "sha512-/bomB2gBlEuXmLSXCHujABB1EYDTrcK/IQaH9NFh6ZUB+dEfb3L3uCof8RyUvQcEzqhVJJa63ZBnDnitJSOWYg==" }, "@istanbuljs/load-nyc-config": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", - "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, "requires": { "camelcase": "^5.3.1", "find-up": "^4.1.0", + "get-package-type": "^0.1.0", "js-yaml": "^3.13.1", "resolve-from": "^5.0.0" }, @@ -390,22 +483,22 @@ "dev": true }, "@jest/console": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz", - "integrity": "sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz", + "integrity": "sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", - "jest-message-util": "^26.0.1", - "jest-util": "^26.0.1", + "jest-message-util": "^26.1.0", + "jest-util": "^26.1.0", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -425,9 +518,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -467,33 +560,33 @@ } }, "@jest/core": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.0.1.tgz", - "integrity": "sha512-Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz", + "integrity": "sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw==", "dev": true, "requires": { - "@jest/console": "^26.0.1", - "@jest/reporters": "^26.0.1", - "@jest/test-result": "^26.0.1", - "@jest/transform": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/console": "^26.1.0", + "@jest/reporters": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/transform": "^26.1.0", + "@jest/types": "^26.1.0", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", - "jest-changed-files": "^26.0.1", - "jest-config": "^26.0.1", - "jest-haste-map": "^26.0.1", - "jest-message-util": "^26.0.1", + "jest-changed-files": "^26.1.0", + "jest-config": "^26.1.0", + "jest-haste-map": "^26.1.0", + "jest-message-util": "^26.1.0", "jest-regex-util": "^26.0.0", - "jest-resolve": "^26.0.1", - "jest-resolve-dependencies": "^26.0.1", - "jest-runner": "^26.0.1", - "jest-runtime": "^26.0.1", - "jest-snapshot": "^26.0.1", - "jest-util": "^26.0.1", - "jest-validate": "^26.0.1", - "jest-watcher": "^26.0.1", + "jest-resolve": "^26.1.0", + "jest-resolve-dependencies": "^26.1.0", + "jest-runner": "^26.1.0", + "jest-runtime": "^26.1.0", + "jest-snapshot": "^26.1.0", + "jest-util": "^26.1.0", + "jest-validate": "^26.1.0", + "jest-watcher": "^26.1.0", "micromatch": "^4.0.2", "p-each-series": "^2.1.0", "rimraf": "^3.0.0", @@ -502,9 +595,9 @@ }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -524,9 +617,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -566,20 +659,20 @@ } }, "@jest/environment": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.0.1.tgz", - "integrity": "sha512-xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz", + "integrity": "sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA==", "dev": true, "requires": { - "@jest/fake-timers": "^26.0.1", - "@jest/types": "^26.0.1", - "jest-mock": "^26.0.1" + "@jest/fake-timers": "^26.1.0", + "@jest/types": "^26.1.0", + "jest-mock": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -599,9 +692,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -641,22 +734,22 @@ } }, "@jest/fake-timers": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz", - "integrity": "sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz", + "integrity": "sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "@sinonjs/fake-timers": "^6.0.1", - "jest-message-util": "^26.0.1", - "jest-mock": "^26.0.1", - "jest-util": "^26.0.1" + "jest-message-util": "^26.1.0", + "jest-mock": "^26.1.0", + "jest-util": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -676,9 +769,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -718,20 +811,20 @@ } }, "@jest/globals": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.0.1.tgz", - "integrity": "sha512-iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz", + "integrity": "sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw==", "dev": true, "requires": { - "@jest/environment": "^26.0.1", - "@jest/types": "^26.0.1", - "expect": "^26.0.1" + "@jest/environment": "^26.1.0", + "@jest/types": "^26.1.0", + "expect": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -751,9 +844,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -793,30 +886,30 @@ } }, "@jest/reporters": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.0.1.tgz", - "integrity": "sha512-NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz", + "integrity": "sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg==", "dev": true, "requires": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^26.0.1", - "@jest/test-result": "^26.0.1", - "@jest/transform": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/console": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/transform": "^26.1.0", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.2", "graceful-fs": "^4.2.4", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-instrument": "^4.0.3", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.0.2", - "jest-haste-map": "^26.0.1", - "jest-resolve": "^26.0.1", - "jest-util": "^26.0.1", - "jest-worker": "^26.0.0", + "jest-haste-map": "^26.1.0", + "jest-resolve": "^26.1.0", + "jest-util": "^26.1.0", + "jest-worker": "^26.1.0", "node-notifier": "^7.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", @@ -826,9 +919,9 @@ }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -848,9 +941,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -890,9 +983,9 @@ } }, "@jest/source-map": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.0.0.tgz", - "integrity": "sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.1.0.tgz", + "integrity": "sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA==", "dev": true, "requires": { "callsites": "^3.0.0", @@ -901,21 +994,21 @@ } }, "@jest/test-result": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz", - "integrity": "sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz", + "integrity": "sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw==", "dev": true, "requires": { - "@jest/console": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/console": "^26.1.0", + "@jest/types": "^26.1.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -935,9 +1028,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -977,34 +1070,34 @@ } }, "@jest/test-sequencer": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz", - "integrity": "sha512-ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz", + "integrity": "sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q==", "dev": true, "requires": { - "@jest/test-result": "^26.0.1", + "@jest/test-result": "^26.1.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^26.0.1", - "jest-runner": "^26.0.1", - "jest-runtime": "^26.0.1" + "jest-haste-map": "^26.1.0", + "jest-runner": "^26.1.0", + "jest-runtime": "^26.1.0" } }, "@jest/transform": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz", - "integrity": "sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz", + "integrity": "sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "babel-plugin-istanbul": "^6.0.0", "chalk": "^4.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^26.0.1", + "jest-haste-map": "^26.1.0", "jest-regex-util": "^26.0.0", - "jest-util": "^26.0.1", + "jest-util": "^26.1.0", "micromatch": "^4.0.2", "pirates": "^4.0.1", "slash": "^3.0.0", @@ -1013,9 +1106,9 @@ }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -1035,9 +1128,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -1141,9 +1234,9 @@ } }, "@sinonjs/commons": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.2.tgz", - "integrity": "sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -1159,12 +1252,12 @@ } }, "@stencil/core": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-1.13.0.tgz", - "integrity": "sha512-++kIXaEgmwm/vq+9QAVHPuLLddCKVdJyI8OfHxknkpu5udxZMYA/vaN/K9i+2NIiTLbGpvHNk9E+RyYzKxS0XQ==", + "version": "1.16.4", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-1.16.4.tgz", + "integrity": "sha512-RN1xoGyzNCXAAzN8HHDDoGEbGrms1YpEnfp86kd37ZHOOwX500GwxjsTOpzFcBOfkUoiuBjKVnONTqWO04H8/Q==", "dev": true, "requires": { - "typescript": "3.8.3" + "typescript": "3.9.7" } }, "@stencil/postcss": { @@ -1177,9 +1270,9 @@ } }, "@stencil/sass": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-1.3.1.tgz", - "integrity": "sha512-5qsEyhLGTywpG4zlWv6eBhhj/z2Z37nbUGa87Ak0KqfsEiclJCYRA/AMM9FiN1jHfBvr968G4zE8rNlYmiPLsQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@stencil/sass/-/sass-1.3.2.tgz", + "integrity": "sha512-w6rkOsRIPY1rBa/13Wf+rMZrOzc6z86/Mkp3inzaYGsxBmLkf4PeP1rfaUB4SFDVRfMduP7FTd4ZJi/+FVrsMw==", "dev": true }, "@stencil/utils": { @@ -1189,9 +1282,9 @@ "dev": true }, "@types/babel__core": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", - "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", + "version": "7.1.9", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz", + "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -1221,9 +1314,9 @@ } }, "@types/babel__traverse": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz", - "integrity": "sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==", + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz", + "integrity": "sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==", "dev": true, "requires": { "@babel/types": "^7.3.0" @@ -1245,9 +1338,9 @@ } }, "@types/istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", "dev": true }, "@types/istanbul-lib-report": { @@ -1260,9 +1353,9 @@ } }, "@types/istanbul-reports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz", - "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "*", @@ -1270,9 +1363,9 @@ } }, "@types/jest": { - "version": "25.2.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz", - "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==", + "version": "26.0.5", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.5.tgz", + "integrity": "sha512-heU+7w8snfwfjtcj2H458aTx3m5unIToOJhx75ebHilBiiQ39OIdA18WkG4LP08YKeAoWAGvWg8s+22w/PeJ6w==", "dev": true, "requires": { "jest-diff": "^25.2.1", @@ -1286,9 +1379,9 @@ "dev": true }, "@types/node": { - "version": "13.9.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz", - "integrity": "sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==", + "version": "14.0.23", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz", + "integrity": "sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==", "dev": true }, "@types/normalize-package-data": { @@ -1304,21 +1397,21 @@ "dev": true }, "@types/prettier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.0.tgz", - "integrity": "sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.2.tgz", + "integrity": "sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==", "dev": true }, "@types/prismjs": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.16.0.tgz", - "integrity": "sha512-mEyuziLrfDCQ4juQP1k706BUU/c8OGn/ZFl69AXXY6dStHClKX4P+N8+rhqpul1vRDA2VOygzMRSJJZHyDEOfw==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.16.1.tgz", + "integrity": "sha512-RNgcK3FEc1GpeOkamGDq42EYkb6yZW5OWQwTS56NJIB8WL0QGISQglA7En7NUx9RGP8AC52DOe+squqbAckXlA==", "dev": true }, "@types/puppeteer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-2.0.1.tgz", - "integrity": "sha512-G8vEyU83Bios+dzs+DZGpAirDmMqRhfFBJCkFrg+A5+6n5EPPHxwBLImJto3qjh0mrBXbLBCyuahhhtTrAfR5g==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-3.0.1.tgz", + "integrity": "sha512-t03eNKCvWJXhQ8wkc5C6GYuSqMEdKLOX0GLMGtks25YZr38wKZlKTwGM/BoAPVtdysX7Bb9tdwrDS1+NrW3RRA==", "dev": true, "requires": { "@types/node": "*" @@ -1331,9 +1424,9 @@ "dev": true }, "@types/yargs": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz", - "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -1362,9 +1455,9 @@ "dev": true }, "acorn": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", - "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", "dev": true }, "acorn-globals": { @@ -1378,9 +1471,9 @@ } }, "acorn-walk": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz", - "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true }, "agent-base": { @@ -1390,9 +1483,9 @@ "dev": true }, "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.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1528,24 +1621,24 @@ "dev": true }, "autoprefixer": { - "version": "9.7.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz", - "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==", + "version": "9.8.5", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.5.tgz", + "integrity": "sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==", "dev": true, "requires": { - "browserslist": "^4.11.1", - "caniuse-lite": "^1.0.30001039", - "chalk": "^2.4.2", + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001097", + "colorette": "^1.2.0", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.27", - "postcss-value-parser": "^4.0.3" + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" }, "dependencies": { "postcss": { - "version": "7.0.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz", - "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==", + "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", @@ -1562,31 +1655,31 @@ "dev": true }, "aws4": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", - "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", + "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", "dev": true }, "babel-jest": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.0.1.tgz", - "integrity": "sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz", + "integrity": "sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg==", "dev": true, "requires": { - "@jest/transform": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/transform": "^26.1.0", + "@jest/types": "^26.1.0", "@types/babel__core": "^7.1.7", "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^26.0.0", + "babel-preset-jest": "^26.1.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -1606,9 +1699,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -1661,25 +1754,27 @@ } }, "babel-plugin-jest-hoist": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz", - "integrity": "sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz", + "integrity": "sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw==", "dev": true, "requires": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", "@types/babel__traverse": "^7.0.6" } }, "babel-preset-current-node-syntax": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz", - "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz", + "integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==", "dev": true, "requires": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -1690,12 +1785,12 @@ } }, "babel-preset-jest": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz", - "integrity": "sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz", + "integrity": "sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^26.0.0", + "babel-plugin-jest-hoist": "^26.1.0", "babel-preset-current-node-syntax": "^0.1.2" } }, @@ -1812,15 +1907,15 @@ "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.13.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz", + "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==", "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.30001093", + "electron-to-chromium": "^1.3.488", + "escalade": "^3.0.1", + "node-releases": "^1.1.58" } }, "bser": { @@ -1884,9 +1979,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001055", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001055.tgz", - "integrity": "sha512-MbwsBmKrBSKIWldfdIagO5OJWZclpJtS4h0Jrk/4HFrXJxTdVdH23Fd+xCiHriVGvYcWyW8mR/CPsYajlH8Iuw==", + "version": "1.0.30001103", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001103.tgz", + "integrity": "sha512-EJkTPrZrgy712tjZ7GQDye5A67SQOyNS6X9b6GS/e5QFu5Renv5qfkx3GHq1S+vObxKzbWWYuPO/7nt4kYW/gA==", "dev": true }, "capture-exit": { @@ -2015,6 +2110,12 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, + "colorette": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", + "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", + "dev": true + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -2222,6 +2323,12 @@ "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true }, + "devtools-protocol": { + "version": "0.0.767361", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.767361.tgz", + "integrity": "sha512-ziRTdhEVQ9jEwedaUaXZ7kl9w9TF/7A3SXQ0XuqrJB+hMS62POHZUWTbumDN2ehRTfvWqTPc2Jw4gUl/jggmHA==", + "dev": true + }, "diff-sequences": { "version": "25.2.6", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", @@ -2256,9 +2363,9 @@ } }, "electron-to-chromium": { - "version": "1.3.432", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.432.tgz", - "integrity": "sha512-/GdNhXyLP5Yl2322CUX/+Xi8NhdHBqL6lD9VJVKjH6CjoPGakvwZ5CpKgj/oOlbzuWWjOvMjDw1bBuAIRCNTlw==", + "version": "1.3.501", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.501.tgz", + "integrity": "sha512-tyzuKaV2POw2mtqBBzQGNBojMZzH0MRu8bT8T/50x+hWeucyG/9pkgAATy+PcM2ySNM9+8eG2VllY9c6j4i+bg==", "dev": true }, "emoji-regex": { @@ -2285,6 +2392,12 @@ "is-arrayish": "^0.2.1" } }, + "escalade": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", + "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -2292,9 +2405,9 @@ "dev": true }, "escodegen": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", - "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "dev": true, "requires": { "esprima": "^4.0.1", @@ -2402,23 +2515,23 @@ } }, "expect": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/expect/-/expect-26.0.1.tgz", - "integrity": "sha512-QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz", + "integrity": "sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-styles": "^4.0.0", "jest-get-type": "^26.0.0", - "jest-matcher-utils": "^26.0.1", - "jest-message-util": "^26.0.1", + "jest-matcher-utils": "^26.1.0", + "jest-message-util": "^26.1.0", "jest-regex-util": "^26.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -2438,9 +2551,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -2578,9 +2691,9 @@ } }, "extract-zip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.0.tgz", - "integrity": "sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, "requires": { "@types/yauzl": "^2.9.1", @@ -2596,9 +2709,9 @@ "dev": true }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "fast-json-stable-stringify": { @@ -2722,6 +2835,12 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, "get-stream": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", @@ -3234,6 +3353,14 @@ "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.0.0", "semver": "^6.3.0" + }, + "dependencies": { + "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-report": { @@ -3286,31 +3413,31 @@ } }, "jest": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest/-/jest-26.0.1.tgz", - "integrity": "sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz", + "integrity": "sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw==", "dev": true, "requires": { - "@jest/core": "^26.0.1", + "@jest/core": "^26.1.0", "import-local": "^3.0.2", - "jest-cli": "^26.0.1" + "jest-cli": "^26.1.0" } }, "jest-changed-files": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.0.1.tgz", - "integrity": "sha512-q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz", + "integrity": "sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "execa": "^4.0.0", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3330,9 +3457,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3355,9 +3482,9 @@ "dev": true }, "execa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.1.tgz", - "integrity": "sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", "dev": true, "requires": { "cross-spawn": "^7.0.0", @@ -3398,30 +3525,30 @@ } }, "jest-cli": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.0.1.tgz", - "integrity": "sha512-pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz", + "integrity": "sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw==", "dev": true, "requires": { - "@jest/core": "^26.0.1", - "@jest/test-result": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/core": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", "is-ci": "^2.0.0", - "jest-config": "^26.0.1", - "jest-util": "^26.0.1", - "jest-validate": "^26.0.1", + "jest-config": "^26.1.0", + "jest-util": "^26.1.0", + "jest-validate": "^26.1.0", "prompts": "^2.0.1", "yargs": "^15.3.1" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3441,9 +3568,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3483,35 +3610,35 @@ } }, "jest-config": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.0.1.tgz", - "integrity": "sha512-9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz", + "integrity": "sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^26.0.1", - "@jest/types": "^26.0.1", - "babel-jest": "^26.0.1", + "@jest/test-sequencer": "^26.1.0", + "@jest/types": "^26.1.0", + "babel-jest": "^26.1.0", "chalk": "^4.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "graceful-fs": "^4.2.4", - "jest-environment-jsdom": "^26.0.1", - "jest-environment-node": "^26.0.1", + "jest-environment-jsdom": "^26.1.0", + "jest-environment-node": "^26.1.0", "jest-get-type": "^26.0.0", - "jest-jasmine2": "^26.0.1", + "jest-jasmine2": "^26.1.0", "jest-regex-util": "^26.0.0", - "jest-resolve": "^26.0.1", - "jest-util": "^26.0.1", - "jest-validate": "^26.0.1", + "jest-resolve": "^26.1.0", + "jest-util": "^26.1.0", + "jest-validate": "^26.1.0", "micromatch": "^4.0.2", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3531,9 +3658,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3568,12 +3695,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -3664,22 +3791,22 @@ } }, "jest-each": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.0.1.tgz", - "integrity": "sha512-OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz", + "integrity": "sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "jest-get-type": "^26.0.0", - "jest-util": "^26.0.1", - "pretty-format": "^26.0.1" + "jest-util": "^26.1.0", + "pretty-format": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3699,9 +3826,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3736,12 +3863,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -3759,23 +3886,23 @@ } }, "jest-environment-jsdom": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz", - "integrity": "sha512-u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz", + "integrity": "sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw==", "dev": true, "requires": { - "@jest/environment": "^26.0.1", - "@jest/fake-timers": "^26.0.1", - "@jest/types": "^26.0.1", - "jest-mock": "^26.0.1", - "jest-util": "^26.0.1", + "@jest/environment": "^26.1.0", + "@jest/fake-timers": "^26.1.0", + "@jest/types": "^26.1.0", + "jest-mock": "^26.1.0", + "jest-util": "^26.1.0", "jsdom": "^16.2.2" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3795,9 +3922,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3837,22 +3964,22 @@ } }, "jest-environment-node": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.0.1.tgz", - "integrity": "sha512-4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz", + "integrity": "sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg==", "dev": true, "requires": { - "@jest/environment": "^26.0.1", - "@jest/fake-timers": "^26.0.1", - "@jest/types": "^26.0.1", - "jest-mock": "^26.0.1", - "jest-util": "^26.0.1" + "@jest/environment": "^26.1.0", + "@jest/fake-timers": "^26.1.0", + "@jest/types": "^26.1.0", + "jest-mock": "^26.1.0", + "jest-util": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3872,9 +3999,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -3920,20 +4047,20 @@ "dev": true }, "jest-haste-map": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz", - "integrity": "sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz", + "integrity": "sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "@types/graceful-fs": "^4.1.2", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", - "jest-serializer": "^26.0.0", - "jest-util": "^26.0.1", - "jest-worker": "^26.0.0", + "jest-serializer": "^26.1.0", + "jest-util": "^26.1.0", + "jest-worker": "^26.1.0", "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7", @@ -3941,9 +4068,9 @@ }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3963,9 +4090,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4005,34 +4132,34 @@ } }, "jest-jasmine2": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz", - "integrity": "sha512-ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz", + "integrity": "sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^26.0.1", - "@jest/source-map": "^26.0.0", - "@jest/test-result": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/environment": "^26.1.0", + "@jest/source-map": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "co": "^4.6.0", - "expect": "^26.0.1", + "expect": "^26.1.0", "is-generator-fn": "^2.0.0", - "jest-each": "^26.0.1", - "jest-matcher-utils": "^26.0.1", - "jest-message-util": "^26.0.1", - "jest-runtime": "^26.0.1", - "jest-snapshot": "^26.0.1", - "jest-util": "^26.0.1", - "pretty-format": "^26.0.1", + "jest-each": "^26.1.0", + "jest-matcher-utils": "^26.1.0", + "jest-message-util": "^26.1.0", + "jest-runtime": "^26.1.0", + "jest-snapshot": "^26.1.0", + "jest-util": "^26.1.0", + "pretty-format": "^26.1.0", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4052,9 +4179,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4083,12 +4210,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -4106,19 +4233,19 @@ } }, "jest-leak-detector": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz", - "integrity": "sha512-93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz", + "integrity": "sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw==", "dev": true, "requires": { "jest-get-type": "^26.0.0", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4138,9 +4265,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4175,12 +4302,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -4198,21 +4325,21 @@ } }, "jest-matcher-utils": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz", - "integrity": "sha512-PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz", + "integrity": "sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA==", "dev": true, "requires": { "chalk": "^4.0.0", - "jest-diff": "^26.0.1", + "jest-diff": "^26.1.0", "jest-get-type": "^26.0.0", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4232,9 +4359,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4269,15 +4396,15 @@ "dev": true }, "jest-diff": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.0.1.tgz", - "integrity": "sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz", + "integrity": "sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg==", "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^26.0.0", "jest-get-type": "^26.0.0", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" } }, "jest-get-type": { @@ -4287,12 +4414,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -4310,13 +4437,13 @@ } }, "jest-message-util": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz", - "integrity": "sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz", + "integrity": "sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "@types/stack-utils": "^1.0.1", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", @@ -4326,9 +4453,9 @@ }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4348,9 +4475,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4390,18 +4517,18 @@ } }, "jest-mock": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz", - "integrity": "sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz", + "integrity": "sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw==", "dev": true, "requires": { - "@jest/types": "^26.0.1" + "@jest/types": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4421,9 +4548,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4463,9 +4590,9 @@ } }, "jest-pnp-resolver": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz", - "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", "dev": true }, "jest-regex-util": { @@ -4475,25 +4602,25 @@ "dev": true }, "jest-resolve": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.0.1.tgz", - "integrity": "sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz", + "integrity": "sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", - "jest-util": "^26.0.1", + "jest-util": "^26.1.0", "read-pkg-up": "^7.0.1", "resolve": "^1.17.0", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4513,9 +4640,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4555,20 +4682,20 @@ } }, "jest-resolve-dependencies": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz", - "integrity": "sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz", + "integrity": "sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "jest-regex-util": "^26.0.0", - "jest-snapshot": "^26.0.1" + "jest-snapshot": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4588,9 +4715,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4630,36 +4757,36 @@ } }, "jest-runner": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.0.1.tgz", - "integrity": "sha512-CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz", + "integrity": "sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw==", "dev": true, "requires": { - "@jest/console": "^26.0.1", - "@jest/environment": "^26.0.1", - "@jest/test-result": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/console": "^26.1.0", + "@jest/environment": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", - "jest-config": "^26.0.1", + "jest-config": "^26.1.0", "jest-docblock": "^26.0.0", - "jest-haste-map": "^26.0.1", - "jest-jasmine2": "^26.0.1", - "jest-leak-detector": "^26.0.1", - "jest-message-util": "^26.0.1", - "jest-resolve": "^26.0.1", - "jest-runtime": "^26.0.1", - "jest-util": "^26.0.1", - "jest-worker": "^26.0.0", + "jest-haste-map": "^26.1.0", + "jest-jasmine2": "^26.1.0", + "jest-leak-detector": "^26.1.0", + "jest-message-util": "^26.1.0", + "jest-resolve": "^26.1.0", + "jest-runtime": "^26.1.0", + "jest-util": "^26.1.0", + "jest-worker": "^26.1.0", "source-map-support": "^0.5.6", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4679,9 +4806,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4721,43 +4848,43 @@ } }, "jest-runtime": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.0.1.tgz", - "integrity": "sha512-Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw==", - "dev": true, - "requires": { - "@jest/console": "^26.0.1", - "@jest/environment": "^26.0.1", - "@jest/fake-timers": "^26.0.1", - "@jest/globals": "^26.0.1", - "@jest/source-map": "^26.0.0", - "@jest/test-result": "^26.0.1", - "@jest/transform": "^26.0.1", - "@jest/types": "^26.0.1", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz", + "integrity": "sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA==", + "dev": true, + "requires": { + "@jest/console": "^26.1.0", + "@jest/environment": "^26.1.0", + "@jest/fake-timers": "^26.1.0", + "@jest/globals": "^26.1.0", + "@jest/source-map": "^26.1.0", + "@jest/test-result": "^26.1.0", + "@jest/transform": "^26.1.0", + "@jest/types": "^26.1.0", "@types/yargs": "^15.0.0", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", - "jest-config": "^26.0.1", - "jest-haste-map": "^26.0.1", - "jest-message-util": "^26.0.1", - "jest-mock": "^26.0.1", + "jest-config": "^26.1.0", + "jest-haste-map": "^26.1.0", + "jest-message-util": "^26.1.0", + "jest-mock": "^26.1.0", "jest-regex-util": "^26.0.0", - "jest-resolve": "^26.0.1", - "jest-snapshot": "^26.0.1", - "jest-util": "^26.0.1", - "jest-validate": "^26.0.1", + "jest-resolve": "^26.1.0", + "jest-snapshot": "^26.1.0", + "jest-util": "^26.1.0", + "jest-validate": "^26.1.0", "slash": "^3.0.0", "strip-bom": "^4.0.0", "yargs": "^15.3.1" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4777,9 +4904,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4819,41 +4946,41 @@ } }, "jest-serializer": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz", - "integrity": "sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz", + "integrity": "sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w==", "dev": true, "requires": { "graceful-fs": "^4.2.4" } }, "jest-snapshot": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.0.1.tgz", - "integrity": "sha512-jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz", + "integrity": "sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "@types/prettier": "^2.0.0", "chalk": "^4.0.0", - "expect": "^26.0.1", + "expect": "^26.1.0", "graceful-fs": "^4.2.4", - "jest-diff": "^26.0.1", + "jest-diff": "^26.1.0", "jest-get-type": "^26.0.0", - "jest-matcher-utils": "^26.0.1", - "jest-message-util": "^26.0.1", - "jest-resolve": "^26.0.1", - "make-dir": "^3.0.0", + "jest-haste-map": "^26.1.0", + "jest-matcher-utils": "^26.1.0", + "jest-message-util": "^26.1.0", + "jest-resolve": "^26.1.0", "natural-compare": "^1.4.0", - "pretty-format": "^26.0.1", + "pretty-format": "^26.1.0", "semver": "^7.3.2" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4873,9 +5000,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -4910,15 +5037,15 @@ "dev": true }, "jest-diff": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.0.1.tgz", - "integrity": "sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz", + "integrity": "sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg==", "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^26.0.0", "jest-get-type": "^26.0.0", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" } }, "jest-get-type": { @@ -4928,12 +5055,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -4957,22 +5084,22 @@ } }, "jest-util": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz", - "integrity": "sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz", + "integrity": "sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", - "make-dir": "^3.0.0" + "micromatch": "^4.0.2" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -4992,9 +5119,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -5034,23 +5161,23 @@ } }, "jest-validate": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz", - "integrity": "sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz", + "integrity": "sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "camelcase": "^6.0.0", "chalk": "^4.0.0", "jest-get-type": "^26.0.0", "leven": "^3.1.0", - "pretty-format": "^26.0.1" + "pretty-format": "^26.1.0" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5076,9 +5203,9 @@ "dev": true }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -5113,12 +5240,12 @@ "dev": true }, "pretty-format": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", - "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz", + "integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==", "dev": true, "requires": { - "@jest/types": "^26.0.1", + "@jest/types": "^26.1.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -5136,23 +5263,23 @@ } }, "jest-watcher": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.0.1.tgz", - "integrity": "sha512-pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz", + "integrity": "sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ==", "dev": true, "requires": { - "@jest/test-result": "^26.0.1", - "@jest/types": "^26.0.1", + "@jest/test-result": "^26.1.0", + "@jest/types": "^26.1.0", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "jest-util": "^26.0.1", + "jest-util": "^26.1.0", "string-length": "^4.0.1" }, "dependencies": { "@jest/types": { - "version": "26.0.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", - "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz", + "integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5172,9 +5299,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "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", @@ -5214,9 +5341,9 @@ } }, "jest-worker": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz", - "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==", + "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", @@ -5247,9 +5374,9 @@ "dev": true }, "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -5263,9 +5390,9 @@ "dev": true }, "jsdom": { - "version": "16.2.2", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz", - "integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==", + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz", + "integrity": "sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg==", "dev": true, "requires": { "abab": "^2.0.3", @@ -5288,7 +5415,7 @@ "tough-cookie": "^3.0.1", "w3c-hr-time": "^1.0.2", "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.0.0", + "webidl-conversions": "^6.1.0", "whatwg-encoding": "^1.0.5", "whatwg-mimetype": "^2.3.0", "whatwg-url": "^8.0.0", @@ -5391,9 +5518,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, "lodash.sortby": { @@ -5409,6 +5536,14 @@ "dev": true, "requires": { "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "makeerror": { @@ -5452,9 +5587,9 @@ } }, "mime": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", - "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", "dev": true }, "mime-db": { @@ -5589,9 +5724,9 @@ "dev": true }, "node-notifier": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.0.tgz", - "integrity": "sha512-y8ThJESxsHcak81PGpzWwQKxzk+5YtP3IxR8AYdpXQ1IB6FmcVzFdZXrkPin49F/DKUCfeeiziB8ptY9npzGuA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz", + "integrity": "sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==", "dev": true, "optional": true, "requires": { @@ -5613,9 +5748,9 @@ } }, "node-releases": { - "version": "1.1.55", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", - "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==", + "version": "1.1.59", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz", + "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==", "dev": true }, "normalize-package-data": { @@ -5628,14 +5763,6 @@ "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } } }, "normalize-path": { @@ -5899,66 +6026,6 @@ "find-up": "^4.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 - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - } - } - }, "please-upgrade-node": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", @@ -6101,15 +6168,17 @@ "dev": true }, "puppeteer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.0.4.tgz", - "integrity": "sha512-1QEb4tJXXbNId7WSHlcDkS3B4GklTIebKn8Y9D6B7tAdUjQncb+8QlTjbQsAgGX5dhRG32Qycuk5XKzJgLs0sg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.2.0.tgz", + "integrity": "sha512-Hru70mFT+dts5W3l1MVg46EfJiWE63qjmXlDvC2kkCeEzLgt6KrwEkDJcJKKzERTvy9xXhOvjyGNx36fd78mVQ==", "dev": true, "requires": { "debug": "^4.1.0", + "devtools-protocol": "0.0.767361", "extract-zip": "^2.0.0", "https-proxy-agent": "^4.0.0", "mime": "^2.0.3", + "pkg-dir": "^4.2.0", "progress": "^2.0.1", "proxy-from-env": "^1.0.0", "rimraf": "^3.0.2", @@ -6569,12 +6638,6 @@ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -6621,9 +6684,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, "semver-compare": { @@ -6871,9 +6934,9 @@ "dev": true }, "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", @@ -6887,9 +6950,9 @@ "dev": true }, "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { "spdx-exceptions": "^2.1.0", @@ -7086,9 +7149,9 @@ "dev": true }, "tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", + "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", "dev": true, "requires": { "chownr": "^1.1.1", @@ -7098,9 +7161,9 @@ } }, "tar-stream": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz", - "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz", + "integrity": "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==", "dev": true, "requires": { "bl": "^4.0.1", @@ -7262,15 +7325,15 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", "dev": true }, "unbzip2-stream": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz", - "integrity": "sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "dev": true, "requires": { "buffer": "^5.2.1", @@ -7554,9 +7617,9 @@ } }, "ws": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", - "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "dev": true }, "xml-name-validator": { @@ -7587,9 +7650,9 @@ } }, "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "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", @@ -7602,7 +7665,7 @@ "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" + "yargs-parser": "^18.1.2" } }, "yargs-parser": { diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index 196d7f144..56805f553 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -23,20 +23,20 @@ "generate": "stencil generate" }, "devDependencies": { - "@stencil/core": "^1.13.0", + "@stencil/core": "^1.16.4", "@stencil/postcss": "^1.0.1", - "@stencil/sass": "^1.3.1", + "@stencil/sass": "^1.3.2", "@stencil/utils": "0.0.5", - "@types/jest": "25.2.1", - "@types/prismjs": "^1.16.0", - "@types/puppeteer": "2.0.1", - "autoprefixer": "^9.7.6", + "@types/jest": "26.0.5", + "@types/prismjs": "^1.16.1", + "@types/puppeteer": "3.0.1", + "autoprefixer": "^9.8.5", "husky": "^4.2.5", - "jest": "26.0.1", - "jest-cli": "26.0.1", + "jest": "26.1.0", + "jest-cli": "26.1.0", "prettier": "2.0.5", "pretty-quick": "^2.0.1", - "puppeteer": "3.0.4" + "puppeteer": "5.2.0" }, "license": "MIT", "repository": { diff --git a/webcomponents/drag-resize-rotate/src/components.d.ts b/webcomponents/drag-resize-rotate/src/components.d.ts index 5a18c407e..6f7067fa9 100644 --- a/webcomponents/drag-resize-rotate/src/components.d.ts +++ b/webcomponents/drag-resize-rotate/src/components.d.ts @@ -7,11 +7,11 @@ import { HTMLStencilElement, JSXBase } from "@stencil/core/internal"; export namespace Components { interface DeckgoDrr { - "drag": "x-axis" | "y-axis" | "all" | "none"; + "drag": 'x-axis' | 'y-axis' | 'all' | 'none'; "resize": boolean; "rotation": boolean; "text": boolean; - "unit": "percentage" | "viewport" | "px"; + "unit": 'percentage' | 'viewport' | 'px'; } } declare global { @@ -27,13 +27,13 @@ declare global { } declare namespace LocalJSX { interface DeckgoDrr { - "drag"?: "x-axis" | "y-axis" | "all" | "none"; + "drag"?: 'x-axis' | 'y-axis' | 'all' | 'none'; "onDrrDidChange"?: (event: CustomEvent) => void; "onDrrSelect"?: (event: CustomEvent) => void; "resize"?: boolean; "rotation"?: boolean; "text"?: boolean; - "unit"?: "percentage" | "viewport" | "px"; + "unit"?: 'percentage' | 'viewport' | 'px'; } interface IntrinsicElements { "deckgo-drr": DeckgoDrr; From a9f2c0df707e471d3cec809a96fd5bf76f7a0704 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:47:56 +0200 Subject: [PATCH 04/22] release: drag-resize-rotate v1.1.0 --- CHANGELOG.md | 1 + webcomponents/drag-resize-rotate/CHANGELOG.md | 8 +++++++- webcomponents/drag-resize-rotate/package-lock.json | 2 +- webcomponents/drag-resize-rotate/package.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1d73a519..f1c6c7e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ David ### Web Components - core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) +- drag-resize-rotate: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) - highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) - social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md)) diff --git a/webcomponents/drag-resize-rotate/CHANGELOG.md b/webcomponents/drag-resize-rotate/CHANGELOG.md index 3c2cd154d..9953583a7 100644 --- a/webcomponents/drag-resize-rotate/CHANGELOG.md +++ b/webcomponents/drag-resize-rotate/CHANGELOG.md @@ -1,6 +1,12 @@ +# 1.1.0 (2020-07-19) + +### Features + +- support for content editable elements + # 1.0.2 (2020-05-11) -### Feat +### Features - update Stencil for Gatsby build diff --git a/webcomponents/drag-resize-rotate/package-lock.json b/webcomponents/drag-resize-rotate/package-lock.json index d11950308..947f6f60b 100644 --- a/webcomponents/drag-resize-rotate/package-lock.json +++ b/webcomponents/drag-resize-rotate/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.0.2", + "version": "1.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index 56805f553..391c06d96 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.0.2", + "version": "1.1.0", "description": "A Web Component to drag, resize and rotate any element", "main": "dist/index.js", "module": "dist/index.mjs", From ccb866485365782b32feb446acbe23744aa569b6 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:49:32 +0200 Subject: [PATCH 05/22] chore: update drag-resize-rotate v1.1.0 --- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- remote/package-lock.json | 6 +++--- remote/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index d5a3596fd..5accc82f9 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.0.2.tgz", - "integrity": "sha512-0qExMlgaQGU4OTWs7lC/h8a9JCfTv3XtwtWOLjsiMK2eRgUdYXl/fV3x9nW4K6RE2wZO2LXlWFUqVU+wNCwdxg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", + "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/docs/package.json b/docs/package.json index 900c1af65..53c9215e3 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.0.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.0", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", diff --git a/remote/package-lock.json b/remote/package-lock.json index d6811707a..ba6ca712c 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1051,9 +1051,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.0.2.tgz", - "integrity": "sha512-0qExMlgaQGU4OTWs7lC/h8a9JCfTv3XtwtWOLjsiMK2eRgUdYXl/fV3x9nW4K6RE2wZO2LXlWFUqVU+wNCwdxg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", + "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/remote/package.json b/remote/package.json index 64cf6c841..ca2217108 100644 --- a/remote/package.json +++ b/remote/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.0.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.0", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/lazy-img": "^1.0.1", "@deckdeckgo/math": "^1.0.1", From 0f26f5aedf290f2a92a940bf952bdb13c32f58f6 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:50:26 +0200 Subject: [PATCH 06/22] chore: update drag-resize-rotate v1.1.0 --- studio/package-lock.json | 6 +++--- studio/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/studio/package-lock.json b/studio/package-lock.json index 96a63733b..4ae001d42 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.0.2.tgz", - "integrity": "sha512-0qExMlgaQGU4OTWs7lC/h8a9JCfTv3XtwtWOLjsiMK2eRgUdYXl/fV3x9nW4K6RE2wZO2LXlWFUqVU+wNCwdxg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", + "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/studio/package.json b/studio/package.json index 23379a228..cf1450e98 100644 --- a/studio/package.json +++ b/studio/package.json @@ -21,7 +21,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.0.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.0", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", From 06330297bd5b6962f2ac8f0c407a1c62a4dd0605 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 14:54:46 +0200 Subject: [PATCH 07/22] docs: drag-resize-rotate for text edit --- docs/CHANGELOG.md | 1 + .../app-components-drr/app-components-drr.md | 13 +++++++------ .../app-components-drr/app-components-drr.tsx | 9 +++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d7d8ceb23..a9430b16f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -4,6 +4,7 @@ - group `notes` in a single page - add new `header` and `footer` +- property `text` of `@deckdeckgo/drag-resize-rotate` # 1.6.2 (2020-07-02) diff --git a/docs/docs/components/app-components-drr/app-components-drr.md b/docs/docs/components/app-components-drr/app-components-drr.md index 898850d17..4bb434200 100644 --- a/docs/docs/components/app-components-drr/app-components-drr.md +++ b/docs/docs/components/app-components-drr/app-components-drr.md @@ -83,12 +83,13 @@ The default slot is mandatory. This component offers the following options which could be set using attributes: -| Attribute | Type | Default | Description | -| --------- | ----------------------------------- | ------------ | ----------------------------------------------------------------------------------------------------------------- | -| unit | 'percentage', 'viewport' or 'px' | 'percentage' | The component could be use with percentage, viewport (vw/vh) or pixels (px) units. All relative to the container. | -| resize | boolean | true | Allow or not the resize actions | -| drag | 'x-axis', 'y-axis', 'all' or 'none' | 'all' | Allow the component to be dragged in which direction | -| rotation | boolean | true | Allow or not the rotation of the element | +| Attribute | Type | Default | Description | +| --------- | ----------------------------------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| unit | 'percentage', 'viewport' or 'px' | 'percentage' | The component could be use with percentage, viewport (vw/vh) or pixels (px) units. All relative to the container. | +| resize | boolean | true | Allow or not the resize actions | +| drag | 'x-axis', 'y-axis', 'all' or 'none' | 'all' | Allow the component to be dragged in which direction | +| rotation | boolean | true | Allow or not the rotation of the element | +| text | boolean | false | To be used if your slotted element is to be defined as `contentEditable`. Useful for text edition. Note that if turns to `true`, the property `resize` is going to be set to `false` automatically. | ### Event listeners diff --git a/docs/src/app/pages/docs/components/app-components-drr/app-components-drr.tsx b/docs/src/app/pages/docs/components/app-components-drr/app-components-drr.tsx index c4da92686..850d73afb 100644 --- a/docs/src/app/pages/docs/components/app-components-drr/app-components-drr.tsx +++ b/docs/src/app/pages/docs/components/app-components-drr/app-components-drr.tsx @@ -160,6 +160,15 @@ export class AppComponentsDrr { true Allow or not the rotation of the element + + text + boolean + false + + To be used if your slotted element is to be defined as contentEditable. Useful for text edition. Note that if turns to{' '} + true, the property resize is going to be set to false automatically. + +

Event listeners

From dd60fb368df2f1caf44719d3a30c1f4bbacc0a7f Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 15:07:15 +0200 Subject: [PATCH 08/22] refactor: use style class instead of style selector for text --- .../src/components/deckdeckgo-drr.scss | 13 ++++++++++++- .../src/components/deckdeckgo-drr.tsx | 7 +++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss index 9eeae791c..026b33bee 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss @@ -3,7 +3,7 @@ justify-content: center; align-items: center; - contain: var(--contain); + contain: size; width: var(--width); height: var(--height); @@ -18,6 +18,17 @@ user-select: var(--deckgo-drr-user-select, none); } +:host(.text) { + contain: layout; +} + +:host(.editing) { + ::slotted(*) { + pointer-events: all; + user-select: text; + } +} + :host(.selected.draggable:not(.drag)) { cursor: move; } diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx index 64a48f9c6..83888fea5 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx @@ -595,11 +595,10 @@ export class DeckdeckgoDragResizeRotate { '--top': `${this.top}${heightUnit}`, '--left': `${this.left}${widthUnit}`, '--rotate': this.rotate ? `${this.rotate}deg` : `0deg`, - '--contain': this.text ? 'layout' : 'size', - '--pointer-events': `${this.editing ? 'all' : 'none'}`, - '--user-select': `${this.editing ? 'text' : 'none'}`, }} - class={`${this.selected ? 'selected' : ''} ${this.drag !== 'none' ? 'draggable' : ''} ${this.drag !== 'none' && this.moving ? 'drag' : ''}`}> + class={`${this.selected ? 'selected' : ''} ${this.text ? 'text' : ''} ${this.drag !== 'none' ? 'draggable' : ''} ${ + this.drag !== 'none' && this.moving ? 'drag' : '' + } ${this.editing ? 'editing' : ''}`}> {this.renderEdgesAnchors()} {this.renderBorderAnchors()} {this.renderRotateAnchor()} From ddacd59040e070f128f9f0b29ba54ac94381cf7d Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 15:08:57 +0200 Subject: [PATCH 09/22] release: drag-resize-rotate: v1.1.1 --- CHANGELOG.md | 2 +- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- remote/package-lock.json | 6 +++--- remote/package.json | 2 +- studio/package-lock.json | 6 +++--- studio/package.json | 2 +- webcomponents/drag-resize-rotate/CHANGELOG.md | 6 ++++++ webcomponents/drag-resize-rotate/package-lock.json | 2 +- webcomponents/drag-resize-rotate/package.json | 2 +- 10 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1c6c7e57..3214c5461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ David ### Web Components - core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) -- drag-resize-rotate: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) +- drag-resize-rotate: v1.1.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) - highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) - social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md)) diff --git a/docs/package-lock.json b/docs/package-lock.json index 5accc82f9..84e7b41e5 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", - "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", + "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/docs/package.json b/docs/package.json index 53c9215e3..5a05c5b5c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.0", + "@deckdeckgo/drag-resize-rotate": "^1.1.1", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", diff --git a/remote/package-lock.json b/remote/package-lock.json index ba6ca712c..d9f834781 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1051,9 +1051,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", - "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", + "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/remote/package.json b/remote/package.json index ca2217108..1f303cdda 100644 --- a/remote/package.json +++ b/remote/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.0", + "@deckdeckgo/drag-resize-rotate": "^1.1.1", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/lazy-img": "^1.0.1", "@deckdeckgo/math": "^1.0.1", diff --git a/studio/package-lock.json b/studio/package-lock.json index 4ae001d42..860bca00d 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.0.tgz", - "integrity": "sha512-ozsSrHLsrFHXY5XJNW2Kbjx8q3eMWaSNya7rWDwpr0aIhSqYyOtWLGvnefQ4U6cbncaukcm+n4ZLf1B2weqZEA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", + "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/studio/package.json b/studio/package.json index cf1450e98..bc09e35fe 100644 --- a/studio/package.json +++ b/studio/package.json @@ -21,7 +21,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.0", + "@deckdeckgo/drag-resize-rotate": "^1.1.1", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", diff --git a/webcomponents/drag-resize-rotate/CHANGELOG.md b/webcomponents/drag-resize-rotate/CHANGELOG.md index 9953583a7..26593c7dc 100644 --- a/webcomponents/drag-resize-rotate/CHANGELOG.md +++ b/webcomponents/drag-resize-rotate/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.1.1 (2020-07-19) + +### Refactoring + +- use style class instead of style selector for text + # 1.1.0 (2020-07-19) ### Features diff --git a/webcomponents/drag-resize-rotate/package-lock.json b/webcomponents/drag-resize-rotate/package-lock.json index 947f6f60b..6b55cb700 100644 --- a/webcomponents/drag-resize-rotate/package-lock.json +++ b/webcomponents/drag-resize-rotate/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.0", + "version": "1.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index 391c06d96..dcd25f848 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.0", + "version": "1.1.1", "description": "A Web Component to drag, resize and rotate any element", "main": "dist/index.js", "module": "dist/index.mjs", From b27d64ac2c6011894b1ea434e6d6575e0f3cc36d Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 15:16:08 +0200 Subject: [PATCH 10/22] release: starter v2.6.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3214c5461..3fda7d5a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ David - gatsby-remark-highlight-code: v1.4.4 ([CHANGELOG](https://github.com/deckgo/gatsby-remark-highlight-code/blob/master/CHANGELOG.md)) - slide-utils: v2.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/slide/CHANGELOG.md)) -- starter kit: v2.6.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md)) +- starter kit: v2.6.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md)) From 15e89f4ae6de1921851eff3c2f5b15ff67c74d6b Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 17:15:23 +0200 Subject: [PATCH 11/22] feat: add and clone floating text with aspect ratio template --- .../app-actions-element.tsx | 12 +++- .../events/deck/deck-events.handler.tsx | 2 +- .../src/app/helpers/editor/shape.helper.tsx | 65 +++++++++++++++---- studio/src/app/utils/editor/slot.utils.tsx | 4 ++ studio/src/assets/assets.json | 3 +- studio/src/assets/icons/text.svg | 24 +++++++ 6 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 studio/src/assets/icons/text.svg diff --git a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx index e3e01878b..ec4255e35 100644 --- a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx +++ b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx @@ -533,6 +533,10 @@ export class AppActionsElement { await popover.present(); } + private async appendText() { + await this.shapeHelper.appendText(this.selectedElement); + } + private async getImagePopover(): Promise { const popover: HTMLIonPopoverElement = await popoverController.create({ component: 'app-image-element', @@ -1003,7 +1007,7 @@ export class AppActionsElement { {this.renderStyle()} {this.renderEdit()} - {this.renderShapes()} + {this.renderAspectRatio()} {this.renderImages()} {this.renderCodeOptions()} {this.renderMathOptions()} @@ -1103,7 +1107,7 @@ export class AppActionsElement { ); } - private renderShapes() { + private renderAspectRatio() { const classSlide: string | undefined = this.slideNodeName === 'deckgo-slide-aspect-ratio' ? undefined : 'hidden'; return [ @@ -1111,6 +1115,10 @@ export class AppActionsElement { Add shape , + this.appendText()} color="primary" aria-label="Add a text" mode="md" class={classSlide}> + + Add text + , ]; } diff --git a/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx b/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx index bc489fd84..f88526496 100644 --- a/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx +++ b/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx @@ -145,7 +145,7 @@ export class DeckEventsHandler { let parent: HTMLElement = element.parentElement; - if (SlotUtils.isNodeReveal(parent)) { + if (SlotUtils.isNodeReveal(parent) || SlotUtils.isNodeDragDropResize(parent)) { parent = parent.parentElement; } diff --git a/studio/src/app/helpers/editor/shape.helper.tsx b/studio/src/app/helpers/editor/shape.helper.tsx index 5c0ce27da..b4d402853 100644 --- a/studio/src/app/helpers/editor/shape.helper.tsx +++ b/studio/src/app/helpers/editor/shape.helper.tsx @@ -22,6 +22,10 @@ export class ShapeHelper { } } + async appendText(slideElement: HTMLElement) { + await this.appendContentText(slideElement); + } + private async appendShapeSVG(slideElement: HTMLElement, shapeAction: ShapeActionSVG) { busyStore.state.deckBusy = true; @@ -79,7 +83,7 @@ export class ShapeHelper { private appendContentShape(slideElement: HTMLElement, ratio: number, src: string, label: string, type: 'svg' | 'img'): Promise { return new Promise(async (resolve) => { - const deckGoDrr: HTMLElement = document.createElement(SlotType.DRAG_RESIZE_ROTATE); + const deckGoDrr: HTMLElement = this.initDeckGoDrr(); const size: number = 10; // percent @@ -102,34 +106,59 @@ export class ShapeHelper { }); } - private cloneShapeElement(shapeElement: HTMLElement): Promise { - return new Promise(async (resolve) => { - const deckGoDrr: HTMLElement = document.createElement(SlotType.DRAG_RESIZE_ROTATE); + private async appendContentText(slideElement: HTMLElement) { + const deckGoDrr: HTMLElement = this.initDeckGoDrr(); - deckGoDrr.setAttribute('style', shapeElement.getAttribute('style')); + deckGoDrr.setAttribute('text', 'true'); - const img: HTMLElement = shapeElement.querySelector(SlotType.IMG); + const size: number = 10; // percent - if (!img) { - resolve(); - return; - } + deckGoDrr.style.setProperty('--left', `${50 - size / 2}`); // vw center + deckGoDrr.style.setProperty('--top', `${50 - size / 2}`); // vh center + + const section = document.createElement(SlotType.SECTION); + section.innerHTML = 'Edit me'; + section.setAttribute('contentEditable', 'true'); + + this.addSection(deckGoDrr, slideElement, section); + } + + private async cloneShapeElement(shapeElement: HTMLElement) { + const deckGoDrr: HTMLElement = this.initDeckGoDrr(); + deckGoDrr.setAttribute('style', shapeElement.getAttribute('style')); + + const img: HTMLElement = shapeElement.querySelector(SlotType.IMG); + + if (img) { const type: 'svg' | 'img' = (img as any).imgSrc !== undefined && (img as any).imgSrc !== '' ? 'img' : 'svg'; const src: string = type === 'img' ? (img as any).imgSrc : (img as any).svgSrc; const label: string = type === 'img' ? (img as any).svgAlt : (img as any).svgAlt; this.addShape(deckGoDrr, shapeElement.parentElement, src, label, type); - resolve(); - }); + return; + } + + const section: HTMLElement = shapeElement.querySelector(SlotType.SECTION); + + if (section) { + deckGoDrr.setAttribute('text', 'true'); + + this.addSection(deckGoDrr, shapeElement.parentElement, section.cloneNode(true)); + } } - private addShape(deckGoDrr: HTMLElement, slideElement: HTMLElement, src: string, label: string, type: 'svg' | 'img') { - deckGoDrr.setAttribute('slot', ''); + private initDeckGoDrr(): HTMLElement { + const deckGoDrr: HTMLElement = document.createElement(SlotType.DRAG_RESIZE_ROTATE); + deckGoDrr.setAttribute('slot', ''); deckGoDrr.setAttribute('contentEditable', 'false'); + return deckGoDrr; + } + + private addShape(deckGoDrr: HTMLElement, slideElement: HTMLElement, src: string, label: string, type: 'svg' | 'img') { const deckgoImg: HTMLElement = document.createElement(SlotType.IMG); if (type === 'img') { @@ -146,4 +175,12 @@ export class ShapeHelper { this.didChange.emit(slideElement); } + + private addSection(deckGoDrr: HTMLElement, slideElement: HTMLElement, section: HTMLElement | Node) { + deckGoDrr.appendChild(section); + + slideElement.appendChild(deckGoDrr); + + this.didChange.emit(slideElement); + } } diff --git a/studio/src/app/utils/editor/slot.utils.tsx b/studio/src/app/utils/editor/slot.utils.tsx index 4e30a4761..23ca5c01b 100644 --- a/studio/src/app/utils/editor/slot.utils.tsx +++ b/studio/src/app/utils/editor/slot.utils.tsx @@ -30,4 +30,8 @@ export class SlotUtils { static isSlotTypeEditable(type: SlotType): boolean { return type !== SlotType.IMG && type !== SlotType.SOCIAL && type !== SlotType.DEMO; } + + static isNodeDragDropResize(selectedElement: HTMLElement): boolean { + return selectedElement && selectedElement.nodeName && selectedElement.nodeName.toLowerCase() === SlotType.DRAG_RESIZE_ROTATE; + } } diff --git a/studio/src/assets/assets.json b/studio/src/assets/assets.json index c4e3ff935..0b8fbf3fb 100644 --- a/studio/src/assets/assets.json +++ b/studio/src/assets/assets.json @@ -236,6 +236,7 @@ {"src": "/icons/math.svg", "ariaLabel": "Math"}, {"src": "/icons/ionicons/color-wand.svg", "ariaLabel": "Transform element"}, {"src": "/icons/ionicons/chevron-down.svg", "ariaLabel": "Chevron down"}, - {"src": "/icons/ionicons/settings.svg", "ariaLabel": "Settings"} + {"src": "/icons/ionicons/settings.svg", "ariaLabel": "Settings"}, + {"src": "/icons/text.svg", "ariaLabel": "Text"} ] } diff --git a/studio/src/assets/icons/text.svg b/studio/src/assets/icons/text.svg new file mode 100644 index 000000000..ed4cc1aa8 --- /dev/null +++ b/studio/src/assets/icons/text.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + From abe81a06c3b651fa42911a3a50025a1fb3476d24 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 17:34:37 +0200 Subject: [PATCH 12/22] feat: edit text placeholder --- studio/src/app/helpers/editor/shape.helper.tsx | 1 - .../theme/editor/editor-deck-placeholder.scss | 13 +++++++++++++ studio/src/global/theme/editor/editor-deck.scss | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/studio/src/app/helpers/editor/shape.helper.tsx b/studio/src/app/helpers/editor/shape.helper.tsx index b4d402853..3ef5ef9a7 100644 --- a/studio/src/app/helpers/editor/shape.helper.tsx +++ b/studio/src/app/helpers/editor/shape.helper.tsx @@ -117,7 +117,6 @@ export class ShapeHelper { deckGoDrr.style.setProperty('--top', `${50 - size / 2}`); // vh center const section = document.createElement(SlotType.SECTION); - section.innerHTML = 'Edit me'; section.setAttribute('contentEditable', 'true'); this.addSection(deckGoDrr, slideElement, section); diff --git a/studio/src/global/theme/editor/editor-deck-placeholder.scss b/studio/src/global/theme/editor/editor-deck-placeholder.scss index 7ea026ea9..61de6d73f 100644 --- a/studio/src/global/theme/editor/editor-deck-placeholder.scss +++ b/studio/src/global/theme/editor/editor-deck-placeholder.scss @@ -58,6 +58,19 @@ deckgo-deck { } } + deckgo-slide-aspect-ratio { + section { + &:empty:not(:focus):after { + content: "Double click to\A edit text"; + white-space: pre; + } + + &:empty { + min-width: 48px; + } + } + } + deckgo-slide-gif { h1, h2, diff --git a/studio/src/global/theme/editor/editor-deck.scss b/studio/src/global/theme/editor/editor-deck.scss index c5f535b7f..e96b95774 100644 --- a/studio/src/global/theme/editor/editor-deck.scss +++ b/studio/src/global/theme/editor/editor-deck.scss @@ -52,6 +52,12 @@ deckgo-deck { } } + deckgo-drr { + section { + border: none; + } + } + a { cursor: pointer; } From 1209f5455a0a95902098b040b69d3d84fca63fed Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 17:57:52 +0200 Subject: [PATCH 13/22] fix: webkit workaround :( --- .../src/components/deckdeckgo-drr.scss | 9 +++++++-- .../drag-resize-rotate/src/components/deckdeckgo-drr.tsx | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss index 026b33bee..d529d7cea 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss @@ -29,6 +29,13 @@ } } +:host(:not(.editing)) { + ::slotted(*) { + pointer-events: none; + user-select: none; + } +} + :host(.selected.draggable:not(.drag)) { cursor: move; } @@ -41,9 +48,7 @@ width: 100%; height: 100%; - user-select: var(--user-select, none); touch-action: none; - pointer-events: var(--pointer-events, none); } div.anchor { diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx index 83888fea5..61bb44019 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx @@ -564,9 +564,12 @@ export class DeckdeckgoDragResizeRotate { const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *'); if (element) { - element.focus(); + // Webkit workaround otherwise element is not focused + setTimeout(async () => { + element.focus(); - await this.moveCursorToEnd(element); + await this.moveCursorToEnd(element); + }); } }; From ae65ea07d77954e3f7ec4522f01f83b5764f7f17 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 17:58:36 +0200 Subject: [PATCH 14/22] release: drag-resize-rotate v1.1.2 --- CHANGELOG.md | 2 +- webcomponents/drag-resize-rotate/CHANGELOG.md | 6 ++++++ webcomponents/drag-resize-rotate/package-lock.json | 2 +- webcomponents/drag-resize-rotate/package.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fda7d5a3..d16f1cfc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ David ### Web Components - core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) -- drag-resize-rotate: v1.1.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) +- drag-resize-rotate: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) - highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) - social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md)) diff --git a/webcomponents/drag-resize-rotate/CHANGELOG.md b/webcomponents/drag-resize-rotate/CHANGELOG.md index 26593c7dc..60b8eb954 100644 --- a/webcomponents/drag-resize-rotate/CHANGELOG.md +++ b/webcomponents/drag-resize-rotate/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.1.2 (2020-07-19) + +### Fix + +- webkit workaround :( + # 1.1.1 (2020-07-19) ### Refactoring diff --git a/webcomponents/drag-resize-rotate/package-lock.json b/webcomponents/drag-resize-rotate/package-lock.json index 6b55cb700..979bb5e4d 100644 --- a/webcomponents/drag-resize-rotate/package-lock.json +++ b/webcomponents/drag-resize-rotate/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index dcd25f848..e2bacb55b 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.1", + "version": "1.1.2", "description": "A Web Component to drag, resize and rotate any element", "main": "dist/index.js", "module": "dist/index.mjs", From 7369d5149f2be623f2d8bb2a4aa143de361d508c Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 18:02:40 +0200 Subject: [PATCH 15/22] feat: update drag-resize-rotate v1.1.2 --- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- remote/package-lock.json | 6 +++--- remote/package.json | 2 +- studio/package-lock.json | 6 +++--- studio/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 84e7b41e5..96869e3da 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", - "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", + "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/docs/package.json b/docs/package.json index 5a05c5b5c..c14acf168 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.1", + "@deckdeckgo/drag-resize-rotate": "^1.1.2", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", diff --git a/remote/package-lock.json b/remote/package-lock.json index d9f834781..d2c1455d8 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1051,9 +1051,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", - "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", + "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/remote/package.json b/remote/package.json index 1f303cdda..b4faa2776 100644 --- a/remote/package.json +++ b/remote/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.1", + "@deckdeckgo/drag-resize-rotate": "^1.1.2", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/lazy-img": "^1.0.1", "@deckdeckgo/math": "^1.0.1", diff --git a/studio/package-lock.json b/studio/package-lock.json index 860bca00d..b5670fad8 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.1.tgz", - "integrity": "sha512-BvF0K3qJL73hi20mCb3UnNNj6aQYcq6ajgQwYvuwJQIbSC+46JnHG8ygyRtlBZf5wfQQVyxmGNtzG0BO+J5A4Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", + "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/studio/package.json b/studio/package.json index bc09e35fe..d879f4aaa 100644 --- a/studio/package.json +++ b/studio/package.json @@ -21,7 +21,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.1", + "@deckdeckgo/drag-resize-rotate": "^1.1.2", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", From 3518a1e1cc846567a500a6d32f6e7763b1af7a9a Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 21:01:18 +0200 Subject: [PATCH 16/22] fix: iOS --- .../src/components/deckdeckgo-drr.scss | 16 +------ .../src/components/deckdeckgo-drr.tsx | 42 +++++++++++-------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss index d529d7cea..3f8163415 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.scss @@ -22,20 +22,6 @@ contain: layout; } -:host(.editing) { - ::slotted(*) { - pointer-events: all; - user-select: text; - } -} - -:host(:not(.editing)) { - ::slotted(*) { - pointer-events: none; - user-select: none; - } -} - :host(.selected.draggable:not(.drag)) { cursor: move; } @@ -48,7 +34,9 @@ width: 100%; height: 100%; + user-select: var(--user-select, none); touch-action: none; + pointer-events: var(--pointer-events, none); } div.anchor { diff --git a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx index 61bb44019..641f4adfd 100644 --- a/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx +++ b/webcomponents/drag-resize-rotate/src/components/deckdeckgo-drr.tsx @@ -152,10 +152,7 @@ export class DeckdeckgoDragResizeRotate { document.removeEventListener('touchmove', this.transform, true); document.removeEventListener('mouseup', this.stop, true); document.removeEventListener('touchend', this.stop, true); - } - - if (this.el) { - this.el.removeEventListener('dblclick', this.dbclick, true); + document.removeEventListener('dblclick', this.dbclick, true); } } @@ -184,10 +181,8 @@ export class DeckdeckgoDragResizeRotate { return; } - const selected: HTMLElement = ($event.target as HTMLElement).closest('deckgo-drr'); - // If we click elsewhere or select another component, then this component should loose focus and values need to be reset for next usage - if (!selected || !selected.isEqualNode(this.el)) { + if (!this.isTargetEvent($event)) { this.stopAndReset(false); if (this.selected) { @@ -202,6 +197,8 @@ export class DeckdeckgoDragResizeRotate { } if (!this.editing) { + const selected: HTMLElement = ($event.target as HTMLElement).closest('deckgo-drr'); + this.drrSelect.emit(selected); this.selected = true; @@ -214,12 +211,18 @@ export class DeckdeckgoDragResizeRotate { await this.initStartPositions($event); }; + private isTargetEvent($event: MouseEvent | TouchEvent): boolean { + const selected: HTMLElement = ($event.target as HTMLElement).closest('deckgo-drr'); + + return selected && selected.isEqualNode(this.el); + } + private initTextEditable() { if (!this.text || !this.el) { return; } - this.el.addEventListener('dblclick', this.dbclick, {once: true}); + document.addEventListener('dblclick', this.dbclick.bind(this), {once: true}); const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *'); if (element) { @@ -228,13 +231,15 @@ export class DeckdeckgoDragResizeRotate { } private resetTextEditable() { - if (!this.text || !this.el) { + if (!this.text) { return; } this.editing = false; - this.el.removeEventListener('dblclick', this.dbclick, true); + if (document) { + document.removeEventListener('dblclick', this.dbclick, true); + } } private async initStartPositions($event: MouseEvent | TouchEvent) { @@ -559,17 +564,18 @@ export class DeckdeckgoDragResizeRotate { }; } - private dbclick = async () => { + private dbclick = async ($event: MouseEvent | TouchEvent) => { + if (!this.isTargetEvent($event)) { + return; + } + this.editing = true; const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *'); if (element) { - // Webkit workaround otherwise element is not focused - setTimeout(async () => { - element.focus(); + element.focus(); - await this.moveCursorToEnd(element); - }); + await this.moveCursorToEnd(element); } }; @@ -598,10 +604,12 @@ export class DeckdeckgoDragResizeRotate { '--top': `${this.top}${heightUnit}`, '--left': `${this.left}${widthUnit}`, '--rotate': this.rotate ? `${this.rotate}deg` : `0deg`, + '--pointer-events': `${this.editing ? 'all' : 'none'}`, + '--user-select': `${this.text ? 'text' : 'none'}`, }} class={`${this.selected ? 'selected' : ''} ${this.text ? 'text' : ''} ${this.drag !== 'none' ? 'draggable' : ''} ${ this.drag !== 'none' && this.moving ? 'drag' : '' - } ${this.editing ? 'editing' : ''}`}> + }`}> {this.renderEdgesAnchors()} {this.renderBorderAnchors()} {this.renderRotateAnchor()} From cd758da073c25304389f8127decc8a42fb1e1a04 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 21:02:03 +0200 Subject: [PATCH 17/22] release: drag-resize-rotate v1.1.3 --- CHANGELOG.md | 2 +- webcomponents/drag-resize-rotate/CHANGELOG.md | 6 ++++++ webcomponents/drag-resize-rotate/package-lock.json | 2 +- webcomponents/drag-resize-rotate/package.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d16f1cfc4..b6958f495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ David ### Web Components - core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) -- drag-resize-rotate: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) +- drag-resize-rotate: v1.1.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md)) - highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) - social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md)) diff --git a/webcomponents/drag-resize-rotate/CHANGELOG.md b/webcomponents/drag-resize-rotate/CHANGELOG.md index 60b8eb954..a99c7c273 100644 --- a/webcomponents/drag-resize-rotate/CHANGELOG.md +++ b/webcomponents/drag-resize-rotate/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.1.3 (2020-07-19) + +### Fix + +- iOS :( + # 1.1.2 (2020-07-19) ### Fix diff --git a/webcomponents/drag-resize-rotate/package-lock.json b/webcomponents/drag-resize-rotate/package-lock.json index 979bb5e4d..1b0e2ffd8 100644 --- a/webcomponents/drag-resize-rotate/package-lock.json +++ b/webcomponents/drag-resize-rotate/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/drag-resize-rotate/package.json b/webcomponents/drag-resize-rotate/package.json index e2bacb55b..19f4bab47 100644 --- a/webcomponents/drag-resize-rotate/package.json +++ b/webcomponents/drag-resize-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/drag-resize-rotate", - "version": "1.1.2", + "version": "1.1.3", "description": "A Web Component to drag, resize and rotate any element", "main": "dist/index.js", "module": "dist/index.mjs", From f9be927ec190be64739271a9671e7b9decdc50a8 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Sun, 19 Jul 2020 21:03:44 +0200 Subject: [PATCH 18/22] feat: drag-resize-rotate v1.1.3 --- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- remote/package-lock.json | 6 +++--- remote/package.json | 2 +- studio/package-lock.json | 6 +++--- studio/package.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 96869e3da..7a9bb2dfa 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", - "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.3.tgz", + "integrity": "sha512-5uC3LLH/P6KK+JPCCNHQC1ih3GuuoRP55KU1rloXmlcl1WjAAJfzXgDpgqFidsCzR809CIkQH328//nbQ2A0Eg==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/docs/package.json b/docs/package.json index c14acf168..d711bb184 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.3", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", diff --git a/remote/package-lock.json b/remote/package-lock.json index d2c1455d8..515729c6c 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1051,9 +1051,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", - "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.3.tgz", + "integrity": "sha512-5uC3LLH/P6KK+JPCCNHQC1ih3GuuoRP55KU1rloXmlcl1WjAAJfzXgDpgqFidsCzR809CIkQH328//nbQ2A0Eg==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/remote/package.json b/remote/package.json index b4faa2776..b23c83c33 100644 --- a/remote/package.json +++ b/remote/package.json @@ -19,7 +19,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.3", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/lazy-img": "^1.0.1", "@deckdeckgo/math": "^1.0.1", diff --git a/studio/package-lock.json b/studio/package-lock.json index b5670fad8..9785e5fd0 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -88,9 +88,9 @@ } }, "@deckdeckgo/drag-resize-rotate": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.2.tgz", - "integrity": "sha512-ZP6E5AiUqaj8HjFVl2RoJ6Cw1UfYsHRSQzSX/T0vjrc6gPYqfUDzJ1QDV57llrPBTY269VhIU/L/BgINrJ/unA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@deckdeckgo/drag-resize-rotate/-/drag-resize-rotate-1.1.3.tgz", + "integrity": "sha512-5uC3LLH/P6KK+JPCCNHQC1ih3GuuoRP55KU1rloXmlcl1WjAAJfzXgDpgqFidsCzR809CIkQH328//nbQ2A0Eg==", "requires": { "@deckdeckgo/utils": "^1.1.0" } diff --git a/studio/package.json b/studio/package.json index d879f4aaa..aec535bf3 100644 --- a/studio/package.json +++ b/studio/package.json @@ -21,7 +21,7 @@ "@deckdeckgo/core": "^1.1.0", "@deckdeckgo/deck-utils": "^2.3.1", "@deckdeckgo/demo": "^1.0.4", - "@deckdeckgo/drag-resize-rotate": "^1.1.2", + "@deckdeckgo/drag-resize-rotate": "^1.1.3", "@deckdeckgo/highlight-code": "^1.1.2", "@deckdeckgo/inline-editor": "^1.4.0", "@deckdeckgo/lazy-img": "^1.0.1", From 3c34816b83c121c0979973be6678cda3f96c7e52 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Mon, 20 Jul 2020 18:34:33 +0200 Subject: [PATCH 19/22] feat: split add shape and image in two actions --- .../app-actions-element.tsx | 41 +++++++++++------- .../app-select-target-element.tsx | 36 ---------------- .../app-more-element-actions.tsx | 16 +++++++ .../popovers/editor/app-shape/app-shape.tsx | 43 ------------------- studio/src/app/utils/editor/more-action.tsx | 3 +- .../src/app/utils/editor/target-element.tsx | 2 - studio/src/components.d.ts | 6 +-- .../theme/editor/editor-deck-placeholder.scss | 2 +- 8 files changed, 46 insertions(+), 103 deletions(-) diff --git a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx index ec4255e35..bb49e50b7 100644 --- a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx +++ b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx @@ -190,10 +190,6 @@ export class AppActionsElement { await this.openImage(); } - if (autoOpen && this.isSlideAspectRatioEmpty(selected)) { - await this.openShape(); - } - this.blockSlide.emit(!this.slide); resolve(); @@ -204,10 +200,6 @@ export class AppActionsElement { return element && element.nodeName && element.nodeName.toLowerCase() === SlotType.IMG && !element.hasAttribute('img-src'); } - private isSlideAspectRatioEmpty(element: HTMLElement): boolean { - return element && element.nodeName && this.slideNodeName === 'deckgo-slide-aspect-ratio' && !element.hasChildNodes(); - } - @Method() unSelect(): Promise { return new Promise(async (resolve) => { @@ -509,13 +501,13 @@ export class AppActionsElement { await popover.present(); } - private async openShape() { + private async openShape(component: 'app-shape' | 'app-image-element') { if (!this.slide || this.slideNodeName !== 'deckgo-slide-aspect-ratio') { return; } const popover: HTMLIonPopoverElement = await popoverController.create({ - component: 'app-shape', + component: component, componentProps: { selectedElement: this.selectedElement, }, @@ -526,7 +518,14 @@ export class AppActionsElement { popover.onWillDismiss().then(async (detail: OverlayEventDetail) => { if (detail.data) { - await this.shapeHelper.appendShape(this.selectedElement, detail.data); + await this.shapeHelper.appendShape( + this.selectedElement, + component === 'app-image-element' + ? { + img: detail.data, + } + : detail.data + ); } }); @@ -981,6 +980,7 @@ export class AppActionsElement { componentProps: { notes: this.slide, copy: this.slide || this.shape, + images: this.slideNodeName === 'deckgo-slide-aspect-ratio', }, event: $event, mode: 'ios', @@ -994,6 +994,8 @@ export class AppActionsElement { await this.clone(); } else if (detail.data.action === MoreAction.DELETE) { await this.confirmDeleteElement($event); + } else if (detail.data.action === MoreAction.IMAGES) { + await this.openShape('app-image-element'); } } }); @@ -1111,14 +1113,23 @@ export class AppActionsElement { const classSlide: string | undefined = this.slideNodeName === 'deckgo-slide-aspect-ratio' ? undefined : 'hidden'; return [ - this.openShape()} color="primary" aria-label="Add a shape" mode="md" class={classSlide}> - - Add shape - , this.appendText()} color="primary" aria-label="Add a text" mode="md" class={classSlide}> Add text , + this.openShape('app-shape')} color="primary" aria-label="Add a shape" mode="md" class={classSlide}> + + Add shape + , + this.openShape('app-image-element')} + aria-label="Add an image" + color="primary" + mode="md" + class={`wider-devices ${classSlide}`}> + + Add image + , ]; } diff --git a/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx b/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx index 6130b1721..9fc6f9e99 100644 --- a/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx +++ b/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx @@ -35,12 +35,6 @@ export class AppSelectTargetElement { @Prop() headerFooter: boolean = false; - @Prop() - shapes: boolean = false; - - @Prop() - images: boolean = false; - @Prop() image: boolean = false; @@ -66,10 +60,6 @@ export class AppSelectTargetElement { ? TargetElement.QR_CODE : this.chart ? TargetElement.CHART - : this.shapes - ? TargetElement.SHAPES - : this.images - ? TargetElement.IMAGES : TargetElement.SLIDE; return ( @@ -84,8 +74,6 @@ export class AppSelectTargetElement { {this.renderBackground()} {this.renderHeaderFooter()} {this.renderTransition()} - {this.renderShapes()} - {this.renderImages()} ); } @@ -209,28 +197,4 @@ export class AppSelectTargetElement { return undefined; } } - - private renderShapes() { - if (this.shapes) { - return ( - - Shapes - - ); - } else { - return undefined; - } - } - - private renderImages() { - if (this.images) { - return ( - - Images - - ); - } else { - return undefined; - } - } } diff --git a/studio/src/app/popovers/editor/actions/app-more-element-actions/app-more-element-actions.tsx b/studio/src/app/popovers/editor/actions/app-more-element-actions/app-more-element-actions.tsx index 0bebbea0e..b874e954f 100644 --- a/studio/src/app/popovers/editor/actions/app-more-element-actions/app-more-element-actions.tsx +++ b/studio/src/app/popovers/editor/actions/app-more-element-actions/app-more-element-actions.tsx @@ -14,6 +14,9 @@ export class AppMoreElementActions { @Prop() copy: boolean = false; + @Prop() + images: boolean = false; + private async closePopover(action: MoreAction) { await (this.el.closest('ion-popover') as HTMLIonPopoverElement).dismiss({ action: action, @@ -23,6 +26,7 @@ export class AppMoreElementActions { render() { return (
+ {this.renderImages()} {this.renderNotes()} {this.renderCopy()} {this.renderDelete()} @@ -61,4 +65,16 @@ export class AppMoreElementActions { ); } + + private renderImages() { + if (!this.images) { + return undefined; + } + + return ( + this.closePopover(MoreAction.IMAGES)} aria-label="Add an image"> +

Add image

+ + ); + } } diff --git a/studio/src/app/popovers/editor/app-shape/app-shape.tsx b/studio/src/app/popovers/editor/app-shape/app-shape.tsx index 09739a596..b8b700f87 100644 --- a/studio/src/app/popovers/editor/app-shape/app-shape.tsx +++ b/studio/src/app/popovers/editor/app-shape/app-shape.tsx @@ -1,8 +1,5 @@ import {Component, Element, h, Prop, State} from '@stencil/core'; -import {TargetElement} from '../../../utils/editor/target-element'; -import {ImageAction} from '../../../utils/editor/image-action'; - import {EnvironmentDeckDeckGoConfig} from '../../../services/core/environment/environment-config'; import {EnvironmentConfigService} from '../../../services/core/environment/environment-config.service'; import {AssetsService} from '../../../services/core/assets/assets.service'; @@ -17,9 +14,6 @@ export class AppShape { @Prop() selectedElement: HTMLElement; - @State() - private applyToTargetElement: TargetElement = TargetElement.SHAPES; - @State() private assets: Assets | undefined = undefined; @@ -33,12 +27,6 @@ export class AppShape { await (this.el.closest('ion-popover') as HTMLIonPopoverElement).dismiss(); } - private async selectApplyToTargetElement($event: CustomEvent) { - if ($event && $event.detail) { - this.applyToTargetElement = $event.detail; - } - } - private async selectShape(src: string, label: string) { const lazyImgElement: HTMLElement = this.el.querySelector(`deckgo-lazy-img[svg-src='${src}']`); const ratio: number = @@ -55,14 +43,6 @@ export class AppShape { }); } - private async selectImage($event: CustomEvent) { - if ($event && $event.detail) { - await (this.el.closest('ion-popover') as HTMLIonPopoverElement).dismiss({ - img: $event.detail, - }); - } - } - render() { return [ @@ -71,34 +51,11 @@ export class AppShape { , - ) => this.selectApplyToTargetElement($event)}>, this.renderShapes(), - this.renderImages(), ]; } - private renderImages() { - if (this.applyToTargetElement !== TargetElement.IMAGES) { - return undefined; - } - - return ( - ) => this.selectImage($event)}> - ); - } - private renderShapes() { - if (this.applyToTargetElement !== TargetElement.SHAPES) { - return undefined; - } - return (
diff --git a/studio/src/app/utils/editor/more-action.tsx b/studio/src/app/utils/editor/more-action.tsx index 878c036d6..55df862ed 100644 --- a/studio/src/app/utils/editor/more-action.tsx +++ b/studio/src/app/utils/editor/more-action.tsx @@ -10,6 +10,5 @@ export enum MoreAction { DELETE, HELP, OFFLINE, - LIST, - REVEAL, + IMAGES, } diff --git a/studio/src/app/utils/editor/target-element.tsx b/studio/src/app/utils/editor/target-element.tsx index c675b6cfc..d38191e76 100644 --- a/studio/src/app/utils/editor/target-element.tsx +++ b/studio/src/app/utils/editor/target-element.tsx @@ -8,8 +8,6 @@ export enum TargetElement { BACKGROUND = 'background', TRANSITION = 'transition', SIDES = 'sides', - SHAPES = 'shapes', - IMAGES = 'images', IMAGE = 'image', HEADER_FOOTER = 'header-footer', } diff --git a/studio/src/components.d.ts b/studio/src/components.d.ts index eb1715fca..0d46eec1a 100644 --- a/studio/src/components.d.ts +++ b/studio/src/components.d.ts @@ -264,6 +264,7 @@ export namespace Components { } interface AppMoreElementActions { "copy": boolean; + "images": boolean; "notes": boolean; } interface AppMoreShareOptions { @@ -338,9 +339,7 @@ export namespace Components { "code": boolean; "headerFooter": boolean; "image": boolean; - "images": boolean; "qrCode": boolean; - "shapes": boolean; "sides": boolean; "slide": boolean; "textTarget": boolean; @@ -1428,6 +1427,7 @@ declare namespace LocalJSX { } interface AppMoreElementActions { "copy"?: boolean; + "images"?: boolean; "notes"?: boolean; } interface AppMoreShareOptions { @@ -1506,10 +1506,8 @@ declare namespace LocalJSX { "code"?: boolean; "headerFooter"?: boolean; "image"?: boolean; - "images"?: boolean; "onApplyTo"?: (event: CustomEvent) => void; "qrCode"?: boolean; - "shapes"?: boolean; "sides"?: boolean; "slide"?: boolean; "textTarget"?: boolean; diff --git a/studio/src/global/theme/editor/editor-deck-placeholder.scss b/studio/src/global/theme/editor/editor-deck-placeholder.scss index 61de6d73f..646375605 100644 --- a/studio/src/global/theme/editor/editor-deck-placeholder.scss +++ b/studio/src/global/theme/editor/editor-deck-placeholder.scss @@ -95,7 +95,7 @@ deckgo-deck { deckgo-slide-aspect-ratio { &:empty:not(:focus):after { - content: "Click to add a shape"; + content: "Add text, shapes or images"; font-size: 2em; min-height: 1.7em; position: absolute; From 1ac254a41b679ff8c0d8d74dc74351a35947114f Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Mon, 20 Jul 2020 18:57:05 +0200 Subject: [PATCH 20/22] feat: add text to slide demo --- .../editor/app-create-slide/app-create-slide.scss | 8 ++++++++ .../popovers/editor/app-create-slide/app-create-slide.tsx | 1 + 2 files changed, 9 insertions(+) diff --git a/studio/src/app/popovers/editor/app-create-slide/app-create-slide.scss b/studio/src/app/popovers/editor/app-create-slide/app-create-slide.scss index e1ec57006..3507e0868 100644 --- a/studio/src/app/popovers/editor/app-create-slide/app-create-slide.scss +++ b/studio/src/app/popovers/editor/app-create-slide/app-create-slide.scss @@ -421,6 +421,14 @@ app-create-slide { transform: translate(-50%, -50%); } } + + span { + font-size: var(--font-size-very-small); + top: 5%; + position: absolute; + left: 40%; + transform: translate(-50%, -50%) rotate(-15deg); + } } deckgo-slide-split[type="demo"] { diff --git a/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx b/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx index e9b2a71f6..b6587f0ea 100644 --- a/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx +++ b/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx @@ -590,6 +590,7 @@ export class AppCreateSlide { class="arrow-end-bottom"> + Diagrams
); From 7c2f91d534d1156d0469182683e20c4d1b8197ff Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Mon, 20 Jul 2020 20:28:19 +0200 Subject: [PATCH 21/22] feat: more options to shape text --- .../app-actions-element.tsx | 20 +++++++++++-------- .../app-select-target-element.tsx | 5 ++++- .../app-color-text-background.tsx | 3 --- .../app-element-style/app-element-style.tsx | 8 ++++---- studio/src/app/utils/editor/align.utils.tsx | 6 +++++- studio/src/components.d.ts | 8 ++++---- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx index bb49e50b7..d1cdfce50 100644 --- a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx +++ b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx @@ -55,7 +55,7 @@ export class AppActionsElement { private image: boolean = false; @State() - private shape: boolean = false; + private shape: 'shape' | 'text' | undefined = undefined; @Event() private blockSlide: EventEmitter; @@ -249,8 +249,12 @@ export class AppActionsElement { return element && element.nodeName && element.nodeName.toLowerCase() === SlotType.MATH; } - private isElementShape(element: HTMLElement): boolean { - return element && element.nodeName && element.nodeName.toLowerCase() === SlotType.DRAG_RESIZE_ROTATE; + private isElementShape(element: HTMLElement): 'shape' | 'text' | undefined { + if (!element || !element.nodeName || element.nodeName.toLowerCase() !== SlotType.DRAG_RESIZE_ROTATE) { + return undefined; + } + + return element.hasAttribute('text') ? 'text' : 'shape'; } private isElementImage(element: HTMLElement): boolean { @@ -393,7 +397,7 @@ export class AppActionsElement { } private async clone() { - if (this.shape) { + if (this.shape !== undefined) { await this.cloneShape(); } else { await this.cloneSlide(); @@ -407,7 +411,7 @@ export class AppActionsElement { return; } - if (store.state.deckBusy || !this.shape) { + if (store.state.deckBusy || this.shape === undefined) { resolve(); return; } @@ -979,7 +983,7 @@ export class AppActionsElement { component: 'app-more-element-actions', componentProps: { notes: this.slide, - copy: this.slide || this.shape, + copy: this.slide || this.shape !== undefined, images: this.slideNodeName === 'deckgo-slide-aspect-ratio', }, event: $event, @@ -1053,7 +1057,7 @@ export class AppActionsElement { } private renderCopy() { - const classSlide: string | undefined = `wider-devices ${this.slide || this.shape ? '' : 'hidden'}`; + const classSlide: string | undefined = `wider-devices ${this.slide || this.shape !== undefined ? '' : 'hidden'}`; return ( this.clone()} aria-label="Copy" color="primary" mode="md" disabled={store.state.deckBusy} class={classSlide}> @@ -1099,7 +1103,7 @@ export class AppActionsElement { } private renderTransform() { - const classToggle: string | undefined = !this.slide && !this.shape ? undefined : 'hidden'; + const classToggle: string | undefined = !this.slide && this.shape === undefined ? undefined : 'hidden'; return ( this.openTransform()} aria-label="Toggle element type" color="primary" mode="md" class={classToggle}> diff --git a/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx b/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx index 9fc6f9e99..1da83f53e 100644 --- a/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx +++ b/studio/src/app/components/editor/app-select-target-element/app-select-target-element.tsx @@ -38,6 +38,9 @@ export class AppSelectTargetElement { @Prop() image: boolean = false; + @Prop() + shape: boolean = false; + @Event() applyTo: EventEmitter; @@ -142,7 +145,7 @@ export class AppSelectTargetElement { if (this.background) { return ( - Background + {this.shape ? 'Color' : 'Background'} ); } else { diff --git a/studio/src/app/components/editor/styles/app-color-text-background/app-color-text-background.tsx b/studio/src/app/components/editor/styles/app-color-text-background/app-color-text-background.tsx index 188e130a2..92f38aa3d 100644 --- a/studio/src/app/components/editor/styles/app-color-text-background/app-color-text-background.tsx +++ b/studio/src/app/components/editor/styles/app-color-text-background/app-color-text-background.tsx @@ -21,9 +21,6 @@ export class AppColorTextBackground { @Prop() deck: boolean = false; - @Prop() - shape: boolean = false; - @Prop() colorType: 'text' | 'background' = 'text'; diff --git a/studio/src/app/popovers/editor/style/app-element-style/app-element-style.tsx b/studio/src/app/popovers/editor/style/app-element-style/app-element-style.tsx index 6a1cd1860..736dd28a3 100644 --- a/studio/src/app/popovers/editor/style/app-element-style/app-element-style.tsx +++ b/studio/src/app/popovers/editor/style/app-element-style/app-element-style.tsx @@ -35,7 +35,7 @@ export class AppElementStyle { math: boolean = false; @Prop() - shape: boolean = false; + shape: 'shape' | 'text' | undefined = undefined; @Prop() image: boolean = false; @@ -164,8 +164,8 @@ export class AppElementStyle { } private renderSelectTarget() { - const elementTarget: boolean = !this.slide && !this.shape && !this.image; - const transition: boolean = !this.slide && !this.code && !this.math && !this.shape && !this.demo; + const elementTarget: boolean = !this.slide && this.shape !== 'shape' && !this.image; + const transition: boolean = !this.slide && !this.code && !this.math && this.shape === undefined && !this.demo; return ( ) => this.selectApplyToTargetElement($event)}> ); @@ -231,7 +232,6 @@ export class AppElementStyle { selectedElement={this.selectedElement} moreColors={this.moreColors} slide={this.slide} - shape={this.shape} onColorChange={() => this.emitStyleChange()}>, ]; } diff --git a/studio/src/app/utils/editor/align.utils.tsx b/studio/src/app/utils/editor/align.utils.tsx index b89a93f7f..586dc0e08 100644 --- a/studio/src/app/utils/editor/align.utils.tsx +++ b/studio/src/app/utils/editor/align.utils.tsx @@ -9,7 +9,7 @@ export enum TextAlign { export class AlignUtils { static async getAlignment(element: HTMLElement): Promise { - if (!element || !this.isElementText(element)) { + if (!element || (!this.isElementText(element) && !this.isShapeText(element))) { return undefined; } @@ -30,6 +30,10 @@ export class AlignUtils { return isRTL() ? TextAlign.RIGHT : TextAlign.LEFT; } + private static isShapeText(element: HTMLElement): boolean { + return element && element.nodeName && element.nodeName.toLowerCase() && SlotType.DRAG_RESIZE_ROTATE && element.hasAttribute('text'); + } + private static isElementText(element: HTMLElement): boolean { return ( element && diff --git a/studio/src/components.d.ts b/studio/src/components.d.ts index 0d46eec1a..f48c0f694 100644 --- a/studio/src/components.d.ts +++ b/studio/src/components.d.ts @@ -104,7 +104,6 @@ export namespace Components { "initCurrentColors": () => Promise; "moreColors": boolean; "selectedElement": HTMLElement; - "shape": boolean; "slide": boolean; } interface AppContact { @@ -178,7 +177,7 @@ export namespace Components { "imgDidChange": EventEmitter; "math": boolean; "selectedElement": HTMLElement; - "shape": boolean; + "shape": 'shape' | 'text' | undefined; "slide": boolean; } interface AppEmbed { @@ -340,6 +339,7 @@ export namespace Components { "headerFooter": boolean; "image": boolean; "qrCode": boolean; + "shape": boolean; "sides": boolean; "slide": boolean; "textTarget": boolean; @@ -1246,7 +1246,6 @@ declare namespace LocalJSX { "moreColors"?: boolean; "onColorChange"?: (event: CustomEvent) => void; "selectedElement"?: HTMLElement; - "shape"?: boolean; "slide"?: boolean; } interface AppContact { @@ -1330,7 +1329,7 @@ declare namespace LocalJSX { "math"?: boolean; "onStyleDidChange"?: (event: CustomEvent) => void; "selectedElement"?: HTMLElement; - "shape"?: boolean; + "shape"?: 'shape' | 'text' | undefined; "slide"?: boolean; } interface AppEmbed { @@ -1508,6 +1507,7 @@ declare namespace LocalJSX { "image"?: boolean; "onApplyTo"?: (event: CustomEvent) => void; "qrCode"?: boolean; + "shape"?: boolean; "sides"?: boolean; "slide"?: boolean; "textTarget"?: boolean; From 2985cf2096efa653c95df584a984c703731206df Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Mon, 20 Jul 2020 20:54:16 +0200 Subject: [PATCH 22/22] fix: safari behavior with box-shadow and editing text in drr --- studio/src/global/theme/editor/editor-deck-placeholder.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/studio/src/global/theme/editor/editor-deck-placeholder.scss b/studio/src/global/theme/editor/editor-deck-placeholder.scss index 646375605..4bc9fefe8 100644 --- a/studio/src/global/theme/editor/editor-deck-placeholder.scss +++ b/studio/src/global/theme/editor/editor-deck-placeholder.scss @@ -105,6 +105,12 @@ deckgo-deck { width: 100%; text-align: center; } + + [highlighted] { + // Safari issue when typing text + box-shadow: none; + outline: 1px solid var(--ion-color-primary); + } } [highlighted] {