From 66c18459bf88eae191142741b3f592273a9e12f4 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Thu, 9 May 2019 11:51:06 +0200 Subject: [PATCH 01/30] Remove jQuery from dev convenience utilities --- meteor/client/lib/dev.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/meteor/client/lib/dev.ts b/meteor/client/lib/dev.ts index 9e35d718d9..9c7f0dd4ac 100644 --- a/meteor/client/lib/dev.ts +++ b/meteor/client/lib/dev.ts @@ -4,7 +4,6 @@ import { Session } from 'meteor/session' import { Meteor } from 'meteor/meteor' import { Tracker } from 'meteor/tracker' import * as _ from 'underscore' -import * as $ from 'jquery' // Note: These things are convenience functions to be used during development: @@ -14,7 +13,6 @@ Meteor.startup(() => { }) }) -window['$'] = $ window['Collections'] = Collections window['executeFunction'] = PeripheralDeviceAPI.executeFunction window['getCurrentTime'] = getCurrentTime @@ -48,5 +46,4 @@ export function expectToRunWithin (name, time: number = 1000) { console.error('Expected to run within ' + time + 'ms: ' + name) }, time) expectToRunWithinCache[name] = timeout - } From 3610257dcfdeacd22766a18b2fa0e1e1cf6609b3 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Thu, 9 May 2019 12:21:38 +0200 Subject: [PATCH 02/30] Remove jquery and jquery types from dependencies --- meteor/package-lock.json | 5350 +++++++++++++++++++------------------- meteor/package.json | 4 +- 2 files changed, 2671 insertions(+), 2683 deletions(-) diff --git a/meteor/package-lock.json b/meteor/package-lock.json index cbfd673a2c..f3e0979fb9 100644 --- a/meteor/package-lock.json +++ b/meteor/package-lock.json @@ -10,7 +10,7 @@ "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", "dev": true, "requires": { - "@babel/highlight": "7.0.0" + "@babel/highlight": "^7.0.0" } }, "@babel/core": { @@ -19,20 +19,20 @@ "integrity": "sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@babel/generator": "7.4.0", - "@babel/helpers": "7.4.3", - "@babel/parser": "7.4.3", - "@babel/template": "7.4.0", - "@babel/traverse": "7.4.3", - "@babel/types": "7.4.0", - "convert-source-map": "1.6.0", - "debug": "4.1.1", - "json5": "2.1.0", - "lodash": "4.17.11", - "resolve": "1.8.1", - "semver": "5.7.0", - "source-map": "0.5.7" + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.4.0", + "@babel/helpers": "^7.4.3", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "convert-source-map": "^1.1.0", + "debug": "^4.1.0", + "json5": "^2.1.0", + "lodash": "^4.17.11", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" }, "dependencies": { "debug": { @@ -41,7 +41,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "ms": { @@ -70,11 +70,11 @@ "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", "dev": true, "requires": { - "@babel/types": "7.4.0", - "jsesc": "2.5.2", - "lodash": "4.17.11", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "@babel/types": "^7.4.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.11", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -97,9 +97,9 @@ "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.0.0", - "@babel/template": "7.4.0", - "@babel/types": "7.4.0" + "@babel/helper-get-function-arity": "^7.0.0", + "@babel/template": "^7.1.0", + "@babel/types": "^7.0.0" } }, "@babel/helper-get-function-arity": { @@ -108,7 +108,7 @@ "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", "dev": true, "requires": { - "@babel/types": "7.4.0" + "@babel/types": "^7.0.0" } }, "@babel/helper-plugin-utils": { @@ -123,7 +123,7 @@ "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", "dev": true, "requires": { - "@babel/types": "7.4.0" + "@babel/types": "^7.4.0" } }, "@babel/helpers": { @@ -132,9 +132,9 @@ "integrity": "sha512-BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q==", "dev": true, "requires": { - "@babel/template": "7.4.0", - "@babel/traverse": "7.4.3", - "@babel/types": "7.4.0" + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0" } }, "@babel/highlight": { @@ -143,9 +143,9 @@ "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", "dev": true, "requires": { - "chalk": "2.4.2", - "esutils": "2.0.2", - "js-tokens": "4.0.0" + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" }, "dependencies": { "ansi-styles": { @@ -154,7 +154,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -163,9 +163,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -174,7 +174,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -191,7 +191,7 @@ "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.0.0" + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/runtime": { @@ -199,8 +199,8 @@ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.48.tgz", "integrity": "sha512-yzvAaV6DgvFtuhvTWCHKOxTJlrKK/G+Nkd6C84NCpXwGcUfVwRZFjqA+j/fCi1IWxkmDBFeCH+AtD33T+jE/JQ==", "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.5.6", + "regenerator-runtime": "^0.11.1" } }, "@babel/runtime-corejs2": { @@ -208,8 +208,8 @@ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.0.0.tgz", "integrity": "sha512-Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA==", "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.12.1" + "core-js": "^2.5.7", + "regenerator-runtime": "^0.12.0" }, "dependencies": { "regenerator-runtime": { @@ -225,9 +225,9 @@ "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@babel/parser": "7.4.3", - "@babel/types": "7.4.0" + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0" } }, "@babel/traverse": { @@ -236,15 +236,15 @@ "integrity": "sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@babel/generator": "7.4.0", - "@babel/helper-function-name": "7.1.0", - "@babel/helper-split-export-declaration": "7.4.0", - "@babel/parser": "7.4.3", - "@babel/types": "7.4.0", - "debug": "4.1.1", - "globals": "11.11.0", - "lodash": "4.17.11" + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.4.0", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/types": "^7.4.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.11" }, "dependencies": { "debug": { @@ -253,7 +253,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "globals": { @@ -276,9 +276,9 @@ "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", "dev": true, "requires": { - "esutils": "2.0.2", - "lodash": "4.17.11", - "to-fast-properties": "2.0.0" + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" }, "dependencies": { "to-fast-properties": { @@ -295,8 +295,8 @@ "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==", "dev": true, "requires": { - "exec-sh": "0.3.2", - "minimist": "1.2.0" + "exec-sh": "^0.3.2", + "minimist": "^1.2.0" }, "dependencies": { "minimist": { @@ -312,7 +312,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz", "integrity": "sha512-c0/MtkPVT0fmiFcCyYoPjkG9PkMOvfrZw2+0BaJ+Rh6UEcK1AR/LaRgrHHjUkbAbs9LXxQJhFS8CJ4uSnK2+JA==", "requires": { - "@fortawesome/fontawesome-common-types": "0.1.7" + "@fortawesome/fontawesome-common-types": "^0.1.7" } }, "@fortawesome/fontawesome-common-types": { @@ -325,7 +325,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.13.tgz", "integrity": "sha512-b+krVnqkdDt52Yfev0x0ZZgtxBQsLw00Zfa3uaVWIDzpNZVtrEXuxldUSUaN/ihgGhSNi8VpvDAdNPVgCKOSxw==", "requires": { - "@fortawesome/fontawesome-common-types": "0.1.7" + "@fortawesome/fontawesome-common-types": "^0.1.7" } }, "@fortawesome/react-fontawesome": { @@ -333,8 +333,8 @@ "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.0.19.tgz", "integrity": "sha512-bZe2wGeSMNu/HfdW1/xvrZKha8Rwr8ceO57JHasWHhvQBcDiG7bSC1XwrdMVr9rj8tiHyvQhPc5yMPUeUtMAKA==", "requires": { - "humps": "2.0.1", - "prop-types": "15.6.2" + "humps": "^2.0.1", + "prop-types": "^15.5.7" } }, "@jest/console": { @@ -343,9 +343,9 @@ "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==", "dev": true, "requires": { - "@jest/source-map": "24.3.0", - "chalk": "2.4.2", - "slash": "2.0.0" + "@jest/source-map": "^24.3.0", + "chalk": "^2.0.1", + "slash": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -354,7 +354,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -363,9 +363,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "slash": { @@ -380,7 +380,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -391,33 +391,33 @@ "integrity": "sha512-ivlZ8HX/FOASfHcb5DJpSPFps8ydfUYzLZfgFFqjkLijYysnIEOieg72YRhO4ZUB32xu40hsSMmaw+IGYeKONA==", "dev": true, "requires": { - "@jest/console": "24.7.1", - "@jest/reporters": "24.7.1", - "@jest/test-result": "24.7.1", - "@jest/transform": "24.7.1", - "@jest/types": "24.7.0", - "ansi-escapes": "3.2.0", - "chalk": "2.4.2", - "exit": "0.1.2", - "graceful-fs": "4.1.15", - "jest-changed-files": "24.7.0", - "jest-config": "24.7.1", - "jest-haste-map": "24.7.1", - "jest-message-util": "24.7.1", - "jest-regex-util": "24.3.0", - "jest-resolve-dependencies": "24.7.1", - "jest-runner": "24.7.1", - "jest-runtime": "24.7.1", - "jest-snapshot": "24.7.1", - "jest-util": "24.7.1", - "jest-validate": "24.7.0", - "jest-watcher": "24.7.1", - "micromatch": "3.1.10", - "p-each-series": "1.0.0", - "pirates": "4.0.1", - "realpath-native": "1.1.0", - "rimraf": "2.6.3", - "strip-ansi": "5.2.0" + "@jest/console": "^24.7.1", + "@jest/reporters": "^24.7.1", + "@jest/test-result": "^24.7.1", + "@jest/transform": "^24.7.1", + "@jest/types": "^24.7.0", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "graceful-fs": "^4.1.15", + "jest-changed-files": "^24.7.0", + "jest-config": "^24.7.1", + "jest-haste-map": "^24.7.1", + "jest-message-util": "^24.7.1", + "jest-regex-util": "^24.3.0", + "jest-resolve-dependencies": "^24.7.1", + "jest-runner": "^24.7.1", + "jest-runtime": "^24.7.1", + "jest-snapshot": "^24.7.1", + "jest-util": "^24.7.1", + "jest-validate": "^24.7.0", + "jest-watcher": "^24.7.1", + "micromatch": "^3.1.10", + "p-each-series": "^1.0.0", + "pirates": "^4.0.1", + "realpath-native": "^1.1.0", + "rimraf": "^2.5.4", + "strip-ansi": "^5.0.0" }, "dependencies": { "ansi-regex": { @@ -432,7 +432,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "arr-diff": { @@ -453,16 +453,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -471,7 +471,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -482,9 +482,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "expand-brackets": { @@ -493,13 +493,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -508,7 +508,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -517,7 +517,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -526,7 +526,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -535,7 +535,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -546,7 +546,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -555,7 +555,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -566,9 +566,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -585,8 +585,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -595,7 +595,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -606,14 +606,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -622,7 +622,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -631,7 +631,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -642,10 +642,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -654,7 +654,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -671,7 +671,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -680,7 +680,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -689,9 +689,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -700,7 +700,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -709,7 +709,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -732,19 +732,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "strip-ansi": { @@ -753,7 +753,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "supports-color": { @@ -762,7 +762,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -773,10 +773,10 @@ "integrity": "sha512-wmcTTYc4/KqA+U5h1zQd5FXXynfa7VGP2NfF+c6QeGJ7c+2nStgh65RQWNX62SC716dTtqheTRrZl0j+54oGHw==", "dev": true, "requires": { - "@jest/fake-timers": "24.7.1", - "@jest/transform": "24.7.1", - "@jest/types": "24.7.0", - "jest-mock": "24.7.0" + "@jest/fake-timers": "^24.7.1", + "@jest/transform": "^24.7.1", + "@jest/types": "^24.7.0", + "jest-mock": "^24.7.0" } }, "@jest/fake-timers": { @@ -785,9 +785,9 @@ "integrity": "sha512-4vSQJDKfR2jScOe12L9282uiwuwQv9Lk7mgrCSZHA9evB9efB/qx8i0KJxsAKtp8fgJYBJdYY7ZU6u3F4/pyjA==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "jest-message-util": "24.7.1", - "jest-mock": "24.7.0" + "@jest/types": "^24.7.0", + "jest-message-util": "^24.7.1", + "jest-mock": "^24.7.0" } }, "@jest/reporters": { @@ -796,26 +796,26 @@ "integrity": "sha512-bO+WYNwHLNhrjB9EbPL4kX/mCCG4ZhhfWmO3m4FSpbgr7N83MFejayz30kKjgqr7smLyeaRFCBQMbXpUgnhAJw==", "dev": true, "requires": { - "@jest/environment": "24.7.1", - "@jest/test-result": "24.7.1", - "@jest/transform": "24.7.1", - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "exit": "0.1.2", - "glob": "7.1.3", - "istanbul-api": "2.1.1", - "istanbul-lib-coverage": "2.0.3", - "istanbul-lib-instrument": "3.1.0", - "istanbul-lib-source-maps": "3.0.2", - "jest-haste-map": "24.7.1", - "jest-resolve": "24.7.1", - "jest-runtime": "24.7.1", - "jest-util": "24.7.1", - "jest-worker": "24.6.0", - "node-notifier": "5.4.0", - "slash": "2.0.0", - "source-map": "0.6.1", - "string-length": "2.0.0" + "@jest/environment": "^24.7.1", + "@jest/test-result": "^24.7.1", + "@jest/transform": "^24.7.1", + "@jest/types": "^24.7.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "glob": "^7.1.2", + "istanbul-api": "^2.1.1", + "istanbul-lib-coverage": "^2.0.2", + "istanbul-lib-instrument": "^3.0.1", + "istanbul-lib-source-maps": "^3.0.1", + "jest-haste-map": "^24.7.1", + "jest-resolve": "^24.7.1", + "jest-runtime": "^24.7.1", + "jest-util": "^24.7.1", + "jest-worker": "^24.6.0", + "node-notifier": "^5.2.1", + "slash": "^2.0.0", + "source-map": "^0.6.0", + "string-length": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -824,7 +824,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -833,9 +833,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "slash": { @@ -850,7 +850,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -861,9 +861,9 @@ "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==", "dev": true, "requires": { - "callsites": "3.1.0", - "graceful-fs": "4.1.15", - "source-map": "0.6.1" + "callsites": "^3.0.0", + "graceful-fs": "^4.1.15", + "source-map": "^0.6.0" }, "dependencies": { "graceful-fs": { @@ -880,9 +880,9 @@ "integrity": "sha512-3U7wITxstdEc2HMfBX7Yx3JZgiNBubwDqQMh+BXmZXHa3G13YWF3p6cK+5g0hGkN3iufg/vGPl3hLxQXD74Npg==", "dev": true, "requires": { - "@jest/console": "24.7.1", - "@jest/types": "24.7.0", - "@types/istanbul-lib-coverage": "2.0.0" + "@jest/console": "^24.7.1", + "@jest/types": "^24.7.0", + "@types/istanbul-lib-coverage": "^2.0.0" } }, "@jest/test-sequencer": { @@ -891,10 +891,10 @@ "integrity": "sha512-84HQkCpVZI/G1zq53gHJvSmhUer4aMYp9tTaffW28Ih5OxfCg8hGr3nTSbL1OhVDRrFZwvF+/R9gY6JRkDUpUA==", "dev": true, "requires": { - "@jest/test-result": "24.7.1", - "jest-haste-map": "24.7.1", - "jest-runner": "24.7.1", - "jest-runtime": "24.7.1" + "@jest/test-result": "^24.7.1", + "jest-haste-map": "^24.7.1", + "jest-runner": "^24.7.1", + "jest-runtime": "^24.7.1" } }, "@jest/transform": { @@ -903,20 +903,20 @@ "integrity": "sha512-EsOUqP9ULuJ66IkZQhI5LufCHlTbi7hrcllRMUEV/tOgqBVQi93+9qEvkX0n8mYpVXQ8VjwmICeRgg58mrtIEw==", "dev": true, "requires": { - "@babel/core": "7.4.3", - "@jest/types": "24.7.0", - "babel-plugin-istanbul": "5.1.1", - "chalk": "2.4.2", - "convert-source-map": "1.6.0", - "fast-json-stable-stringify": "2.0.0", - "graceful-fs": "4.1.15", - "jest-haste-map": "24.7.1", - "jest-regex-util": "24.3.0", - "jest-util": "24.7.1", - "micromatch": "3.1.10", - "realpath-native": "1.1.0", - "slash": "2.0.0", - "source-map": "0.6.1", + "@babel/core": "^7.1.0", + "@jest/types": "^24.7.0", + "babel-plugin-istanbul": "^5.1.0", + "chalk": "^2.0.1", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.1.15", + "jest-haste-map": "^24.7.1", + "jest-regex-util": "^24.3.0", + "jest-util": "^24.7.1", + "micromatch": "^3.1.10", + "realpath-native": "^1.1.0", + "slash": "^2.0.0", + "source-map": "^0.6.1", "write-file-atomic": "2.4.1" }, "dependencies": { @@ -926,7 +926,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "arr-diff": { @@ -947,16 +947,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -965,7 +965,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -976,9 +976,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "expand-brackets": { @@ -987,13 +987,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -1002,7 +1002,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -1011,7 +1011,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -1020,7 +1020,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1029,7 +1029,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1040,7 +1040,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1049,7 +1049,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1060,9 +1060,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -1079,8 +1079,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -1089,7 +1089,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -1100,14 +1100,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -1116,7 +1116,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -1125,7 +1125,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -1136,10 +1136,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -1148,7 +1148,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -1165,7 +1165,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -1174,7 +1174,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -1183,9 +1183,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -1194,7 +1194,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1203,7 +1203,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1226,19 +1226,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "slash": { @@ -1253,7 +1253,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -1264,8 +1264,8 @@ "integrity": "sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "2.0.0", - "@types/yargs": "12.0.12" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/yargs": "^12.0.9" } }, "@nrk/core-icons": { @@ -1278,29 +1278,29 @@ "resolved": "https://registry.npmjs.org/@slack/client/-/client-4.8.0.tgz", "integrity": "sha512-c4PKsRMtTp3QVYg+6cNqqxbU/50gnYfMlZgPCGUuMDMm9mkx50y0PEuERcVyLIe5j61imrhQx9DoNIfybEhTTw==", "requires": { - "@types/form-data": "2.2.1", - "@types/is-stream": "1.1.0", - "@types/loglevel": "1.5.3", - "@types/node": "9.6.1", - "@types/p-cancelable": "0.3.0", - "@types/p-queue": "2.3.1", - "@types/p-retry": "1.0.1", - "@types/retry": "0.10.2", - "@types/ws": "5.1.2", - "axios": "0.18.0", - "eventemitter3": "3.1.0", - "finity": "0.5.4", - "form-data": "2.3.2", - "is-stream": "1.1.0", - "loglevel": "1.6.1", - "object.entries": "1.0.4", - "object.getownpropertydescriptors": "2.0.3", - "object.values": "1.0.4", - "p-cancelable": "0.3.0", - "p-queue": "2.4.2", - "p-retry": "2.0.0", - "retry": "0.12.0", - "ws": "5.2.2" + "@types/form-data": "^2.2.1", + "@types/is-stream": "^1.1.0", + "@types/loglevel": "^1.5.3", + "@types/node": ">=6.0.0", + "@types/p-cancelable": "^0.3.0", + "@types/p-queue": "^2.3.1", + "@types/p-retry": "^1.0.1", + "@types/retry": "^0.10.2", + "@types/ws": "^5.1.1", + "axios": "^0.18.0", + "eventemitter3": "^3.0.0", + "finity": "^0.5.4", + "form-data": "^2.3.1", + "is-stream": "^1.1.0", + "loglevel": "^1.6.1", + "object.entries": "^1.0.4", + "object.getownpropertydescriptors": "^2.0.3", + "object.values": "^1.0.4", + "p-cancelable": "^0.3.0", + "p-queue": "^2.3.0", + "p-retry": "^2.0.0", + "retry": "^0.12.0", + "ws": "^5.2.0" } }, "@types/amqplib": { @@ -1308,8 +1308,8 @@ "resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.5.9.tgz", "integrity": "sha512-V4OFDKeu8rY2DnbHAh7J7DaJ8L8LZ7EyOLBoXsN2rtlCoB2QwaTgx2SsBd22mPUC9kl+vK7D+nfLq34jLhEjlA==", "requires": { - "@types/bluebird": "3.5.24", - "@types/node": "9.6.1" + "@types/bluebird": "*", + "@types/node": "*" } }, "@types/babel__core": { @@ -1318,11 +1318,11 @@ "integrity": "sha512-+hjBtgcFPYyCTo0A15+nxrCVJL7aC6Acg87TXd5OW3QhHswdrOLoles+ldL2Uk8q++7yIfl4tURtztccdeeyOw==", "dev": true, "requires": { - "@babel/parser": "7.4.3", - "@babel/types": "7.4.0", - "@types/babel__generator": "7.0.2", - "@types/babel__template": "7.0.2", - "@types/babel__traverse": "7.0.6" + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" } }, "@types/babel__generator": { @@ -1331,7 +1331,7 @@ "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==", "dev": true, "requires": { - "@babel/types": "7.4.0" + "@babel/types": "^7.0.0" } }, "@types/babel__template": { @@ -1340,8 +1340,8 @@ "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==", "dev": true, "requires": { - "@babel/parser": "7.4.3", - "@babel/types": "7.4.0" + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" } }, "@types/babel__traverse": { @@ -1350,7 +1350,7 @@ "integrity": "sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==", "dev": true, "requires": { - "@babel/types": "7.4.0" + "@babel/types": "^7.3.0" } }, "@types/bluebird": { @@ -1363,8 +1363,8 @@ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz", "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==", "requires": { - "@types/connect": "3.4.32", - "@types/node": "10.10.3" + "@types/connect": "*", + "@types/node": "*" }, "dependencies": { "@types/node": { @@ -1396,7 +1396,7 @@ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", "requires": { - "@types/node": "10.10.3" + "@types/node": "*" }, "dependencies": { "@types/node": { @@ -1428,7 +1428,7 @@ "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", "requires": { - "@types/node": "9.6.1" + "@types/node": "*" } }, "@types/fs-extra": { @@ -1437,7 +1437,7 @@ "integrity": "sha512-Z5nu9Pbxj9yNeXIK3UwGlRdJth4cZ5sCq05nI7FaI6B0oz28nxkOtp6Lsz0ZnmLHJGvOJfB/VHxSTbVq/i6ujA==", "dev": true, "requires": { - "@types/node": "9.6.1" + "@types/node": "*" } }, "@types/glob": { @@ -1446,9 +1446,9 @@ "integrity": "sha512-k1M3Y8Ge0bOkG7U5IZObIhkrzZHMpuFpd5RJK9Gh8ekq0EhiezLLqv2ow14ylTKqXTHSqM6AMySbWEHRo+7qdQ==", "dev": true, "requires": { - "@types/events": "1.2.0", - "@types/minimatch": "2.0.29", - "@types/node": "9.6.1" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/handlebars": { @@ -1480,7 +1480,7 @@ "resolved": "https://registry.npmjs.org/@types/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==", "requires": { - "@types/node": "9.6.1" + "@types/node": "*" } }, "@types/istanbul-lib-coverage": { @@ -1495,7 +1495,7 @@ "integrity": "sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==", "dev": true, "requires": { - "@types/jest-diff": "20.0.1" + "@types/jest-diff": "*" } }, "@types/jest-diff": { @@ -1504,15 +1504,6 @@ "integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==", "dev": true }, - "@types/jquery": { - "version": "3.3.29", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz", - "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==", - "dev": true, - "requires": { - "@types/sizzle": "2.3.2" - } - }, "@types/lodash": { "version": "4.14.116", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz", @@ -1536,8 +1527,8 @@ "integrity": "sha512-lg19rQDWOiKroRpgrzBfwzsBKTa2AGnfgjdIvGL0Q/XqoTyIAsGzwzd8GfsLbbti6G3vPH8fen7BxBCgxH+S7w==", "dev": true, "requires": { - "@types/connect": "3.4.32", - "@types/underscore": "1.8.9" + "@types/connect": "*", + "@types/underscore": "*" } }, "@types/minimatch": { @@ -1572,7 +1563,7 @@ "resolved": "https://registry.npmjs.org/@types/p-retry/-/p-retry-1.0.1.tgz", "integrity": "sha512-HgQPG9kkUb4EpTeUv2taH2nBZsVUb5aOTSw3X2YozcTG1ttmGcLaLKx1MbAz1evVfUEDTCAPmdz2HiFztIyWrw==", "requires": { - "@types/retry": "0.10.2" + "@types/retry": "*" } }, "@types/prop-types": { @@ -1591,7 +1582,7 @@ "resolved": "https://registry.npmjs.org/@types/react-circular-progressbar/-/react-circular-progressbar-1.0.1.tgz", "integrity": "sha512-Pjms8GK01hKXhY1ASoJmc/Sx559UhQgTlvbUri4OT32seMtSnwqgMSSxu4XS/B7cq1W8HPNBwrlr08gneEWOFw==", "requires": { - "@types/react": "16.3.2" + "@types/react": "*" } }, "@types/react-dom": { @@ -1600,8 +1591,8 @@ "integrity": "sha512-sbz9kOF/1aFlJ+322BLrOhc/ek3G3ADlRtGOjEOhO7c8Z2IVnI4haDGAD/LFwv35e0so+JLe6ovAZ6O0El9n2Q==", "dev": true, "requires": { - "@types/node": "9.6.1", - "@types/react": "16.3.2" + "@types/node": "*", + "@types/react": "*" } }, "@types/react-i18next": { @@ -1610,8 +1601,8 @@ "integrity": "sha512-VPopxbHXz/1Sjl+ljXQQchf6FHXaYLaH0a6TH6KnGOQGD4LzNbUVlofK26S30OIYfYibm8r/sAb2KeTst+AwTQ==", "dev": true, "requires": { - "@types/i18next": "12.1.0", - "@types/react": "16.3.2" + "@types/i18next": "*", + "@types/react": "*" } }, "@types/react-router": { @@ -1620,8 +1611,8 @@ "integrity": "sha512-57Tqu1EDMgDzHhmIEjjQZHrc/N7/+GGv6CtH1wRTLmMIy3UMxX69vQoeEz0AmK0/zkf5ecfEW1ZX8DLVQ6Gl7Q==", "dev": true, "requires": { - "@types/history": "4.7.0", - "@types/react": "16.3.2" + "@types/history": "*", + "@types/react": "*" } }, "@types/react-router-dom": { @@ -1630,9 +1621,9 @@ "integrity": "sha512-K7SdbkF8xgecp2WCeXw51IMySYvQ1EuVPKfjU1fymyTSX9bZk5Qx8T5cipwtAY8Zhb/4GIjhYKm0ZGVEbCKEzQ==", "dev": true, "requires": { - "@types/history": "4.7.0", - "@types/react": "16.3.2", - "@types/react-router": "4.0.31" + "@types/history": "*", + "@types/react": "*", + "@types/react-router": "*" } }, "@types/request": { @@ -1640,10 +1631,10 @@ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz", "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==", "requires": { - "@types/caseless": "0.12.1", - "@types/form-data": "2.2.1", - "@types/node": "9.6.1", - "@types/tough-cookie": "2.3.4" + "@types/caseless": "*", + "@types/form-data": "*", + "@types/node": "*", + "@types/tough-cookie": "*" } }, "@types/retry": { @@ -1662,16 +1653,10 @@ "integrity": "sha512-GwfXBWx+JgH+mrf35NnNFPFl6kQZgDQqZBUdWrHB1phulBbVpOwedZun7hZRyfTOxlicwo4ftsC1fpUZZIiN5w==", "dev": true, "requires": { - "@types/glob": "7.1.0", - "@types/node": "9.6.1" + "@types/glob": "*", + "@types/node": "*" } }, - "@types/sizzle": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", - "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==", - "dev": true - }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -1694,7 +1679,7 @@ "integrity": "sha512-zzruYOEtNgfS3SBjcij1F6HlH6My5n8WrBNhP3fzaRM22ba70QBC2ATs18jGr88Fy43c0z8vFJv5wJankfxv2A==", "dev": true, "requires": { - "@types/node": "9.6.1" + "@types/node": "*" } }, "@types/ws": { @@ -1702,8 +1687,8 @@ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz", "integrity": "sha512-NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg==", "requires": { - "@types/events": "1.2.0", - "@types/node": "9.6.1" + "@types/events": "*", + "@types/node": "*" } }, "@types/xmlbuilder": { @@ -1723,8 +1708,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, "abab": { @@ -1745,8 +1730,8 @@ "integrity": "sha512-gJSiKY8dBIjV/0jagZIFBdVMtfQyA5QHCvAT48H2q8REQoW8Fs5AOjqBql1LgSXgrMWdevcE+8cdZ33NtVbIBA==", "dev": true, "requires": { - "acorn": "6.1.1", - "acorn-walk": "6.1.1" + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" }, "dependencies": { "acorn": { @@ -1768,7 +1753,7 @@ "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz", "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==", "requires": { - "object-assign": "4.1.1" + "object-assign": "4.x" } }, "ajv": { @@ -1776,10 +1761,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "amqplib": { @@ -1787,12 +1772,12 @@ "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.3.tgz", "integrity": "sha512-ZOdUhMxcF+u62rPI+hMtU1NBXSDFQ3eCJJrenamtdQ7YYwh7RZJHOIM1gonVbZ5PyVdYH4xqBPje9OYqk7fnqw==", "requires": { - "bitsyntax": "0.1.0", - "bluebird": "3.5.2", - "buffer-more-ints": "1.0.0", - "readable-stream": "1.1.14", - "safe-buffer": "5.1.2", - "url-parse": "1.4.4" + "bitsyntax": "~0.1.0", + "bluebird": "^3.5.2", + "buffer-more-ints": "~1.0.0", + "readable-stream": "1.x >=1.1.9", + "safe-buffer": "~5.1.2", + "url-parse": "~1.4.3" }, "dependencies": { "readable-stream": { @@ -1800,10 +1785,10 @@ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -1835,8 +1820,8 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "arr-diff": { @@ -1857,16 +1842,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -1875,7 +1860,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -1886,13 +1871,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -1901,7 +1886,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -1910,7 +1895,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -1919,7 +1904,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1928,7 +1913,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1939,7 +1924,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1948,7 +1933,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1959,9 +1944,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -1978,8 +1963,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -1988,7 +1973,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -1999,14 +1984,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -2015,7 +2000,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -2024,7 +2009,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -2035,10 +2020,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -2047,7 +2032,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -2058,7 +2043,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2067,7 +2052,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2076,9 +2061,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -2087,7 +2072,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -2096,7 +2081,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2119,19 +2104,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } } } @@ -2142,7 +2127,7 @@ "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", "dev": true, "requires": { - "default-require-extensions": "2.0.0" + "default-require-extensions": "^2.0.0" } }, "archy": { @@ -2157,7 +2142,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { @@ -2166,7 +2151,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -2221,7 +2206,7 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "assert-plus": { @@ -2282,8 +2267,8 @@ "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.5.9", - "is-buffer": "1.1.6" + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" } }, "babel-code-frame": { @@ -2291,9 +2276,9 @@ "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "js-tokens": { @@ -2308,9 +2293,9 @@ "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -2318,10 +2303,10 @@ "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-define-map": { @@ -2329,10 +2314,10 @@ "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-explode-assignable-expression": { @@ -2340,9 +2325,9 @@ "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -2350,11 +2335,11 @@ "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -2362,8 +2347,8 @@ "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -2371,8 +2356,8 @@ "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-optimise-call-expression": { @@ -2380,8 +2365,8 @@ "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -2389,9 +2374,9 @@ "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -2399,11 +2384,11 @@ "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-replace-supers": { @@ -2411,12 +2396,12 @@ "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-jest": { @@ -2425,13 +2410,13 @@ "integrity": "sha512-GPnLqfk8Mtt0i4OemjWkChi73A3ALs4w2/QbG64uAj8b5mmwzxc7jbJVRZt8NJkxi6FopVHog9S3xX6UJKb2qg==", "dev": true, "requires": { - "@jest/transform": "24.7.1", - "@jest/types": "24.7.0", - "@types/babel__core": "7.1.1", - "babel-plugin-istanbul": "5.1.1", - "babel-preset-jest": "24.6.0", - "chalk": "2.4.2", - "slash": "2.0.0" + "@jest/transform": "^24.7.1", + "@jest/types": "^24.7.0", + "@types/babel__core": "^7.1.0", + "babel-plugin-istanbul": "^5.1.0", + "babel-preset-jest": "^24.6.0", + "chalk": "^2.4.2", + "slash": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -2440,7 +2425,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -2449,9 +2434,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "slash": { @@ -2466,7 +2451,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -2476,7 +2461,7 @@ "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -2484,7 +2469,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-istanbul": { @@ -2493,9 +2478,9 @@ "integrity": "sha512-RNNVv2lsHAXJQsEJ5jonQwrJVWK8AcZpG1oxhnjCUaAjL7xahYLANhPUZbzEQHjKy1NMYUwn+0NPKQc8iSY4xQ==", "dev": true, "requires": { - "find-up": "3.0.0", - "istanbul-lib-instrument": "3.1.0", - "test-exclude": "5.1.0" + "find-up": "^3.0.0", + "istanbul-lib-instrument": "^3.0.0", + "test-exclude": "^5.0.0" }, "dependencies": { "find-up": { @@ -2504,7 +2489,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -2513,8 +2498,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } } } @@ -2525,7 +2510,7 @@ "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==", "dev": true, "requires": { - "@types/babel__traverse": "7.0.6" + "@types/babel__traverse": "^7.0.6" } }, "babel-plugin-syntax-async-functions": { @@ -2553,9 +2538,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-class-properties": { @@ -2563,10 +2548,10 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz", "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-class-properties": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-plugin-syntax-class-properties": "^6.8.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -2574,7 +2559,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -2582,7 +2567,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -2590,11 +2575,11 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-plugin-transform-es2015-classes": { @@ -2602,15 +2587,15 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "requires": { - "babel-helper-define-map": "6.26.0", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -2618,8 +2603,8 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-destructuring": { @@ -2627,7 +2612,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -2635,8 +2620,8 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-for-of": { @@ -2644,7 +2629,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -2652,9 +2637,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-literals": { @@ -2662,7 +2647,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -2670,9 +2655,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -2680,10 +2665,10 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -2691,9 +2676,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -2701,9 +2686,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-object-super": { @@ -2711,8 +2696,8 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.26.0" + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -2720,12 +2705,12 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -2733,8 +2718,8 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -2742,7 +2727,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -2750,9 +2735,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-template-literals": { @@ -2760,7 +2745,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -2768,7 +2753,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -2776,9 +2761,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -2786,9 +2771,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-regenerator": { @@ -2796,7 +2781,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "requires": { - "regenerator-transform": "0.10.1" + "regenerator-transform": "^0.10.0" } }, "babel-plugin-transform-strict-mode": { @@ -2804,8 +2789,8 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-preset-env": { @@ -2813,36 +2798,36 @@ "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.26.0", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-regenerator": "6.26.0", - "browserslist": "3.2.8", - "invariant": "2.2.4", - "semver": "5.7.0" + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-to-generator": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.23.0", + "babel-plugin-transform-es2015-classes": "^6.23.0", + "babel-plugin-transform-es2015-computed-properties": "^6.22.0", + "babel-plugin-transform-es2015-destructuring": "^6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", + "babel-plugin-transform-es2015-for-of": "^6.23.0", + "babel-plugin-transform-es2015-function-name": "^6.22.0", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.22.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", + "babel-plugin-transform-es2015-modules-umd": "^6.23.0", + "babel-plugin-transform-es2015-object-super": "^6.22.0", + "babel-plugin-transform-es2015-parameters": "^6.23.0", + "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", + "babel-plugin-transform-exponentiation-operator": "^6.22.0", + "babel-plugin-transform-regenerator": "^6.22.0", + "browserslist": "^3.2.6", + "invariant": "^2.2.2", + "semver": "^5.3.0" }, "dependencies": { "semver": { @@ -2858,8 +2843,8 @@ "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==", "dev": true, "requires": { - "@babel/plugin-syntax-object-rest-spread": "7.2.0", - "babel-plugin-jest-hoist": "24.6.0" + "@babel/plugin-syntax-object-rest-spread": "^7.0.0", + "babel-plugin-jest-hoist": "^24.6.0" } }, "babel-runtime": { @@ -2867,8 +2852,8 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -2876,11 +2861,11 @@ "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -2888,15 +2873,15 @@ "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.11" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -2904,10 +2889,10 @@ "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.11", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -2927,13 +2912,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -2942,7 +2927,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -2951,7 +2936,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2960,7 +2945,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2969,9 +2954,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "isobject": { @@ -2994,7 +2979,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "bindings": { @@ -3007,9 +2992,9 @@ "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz", "integrity": "sha512-ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==", "requires": { - "buffer-more-ints": "1.0.0", - "debug": "2.6.9", - "safe-buffer": "5.1.2" + "buffer-more-ints": "~1.0.0", + "debug": "~2.6.9", + "safe-buffer": "~5.1.2" } }, "bluebird": { @@ -3023,15 +3008,15 @@ "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", "requires": { "bytes": "3.0.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", + "depd": "~1.1.2", + "http-errors": "~1.6.3", "iconv-lite": "0.4.23", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.5.2", "raw-body": "2.3.3", - "type-is": "1.6.16" + "type-is": "~1.6.16" } }, "brace-expansion": { @@ -3040,7 +3025,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3050,9 +3035,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.3" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "browser-process-hrtime": { @@ -3083,8 +3068,8 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", "requires": { - "caniuse-lite": "1.0.30000887", - "electron-to-chromium": "1.3.70" + "caniuse-lite": "^1.0.30000844", + "electron-to-chromium": "^1.3.47" } }, "bs-logger": { @@ -3093,7 +3078,7 @@ "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", "dev": true, "requires": { - "fast-json-stable-stringify": "2.0.0" + "fast-json-stable-stringify": "2.x" } }, "bser": { @@ -3102,7 +3087,7 @@ "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=", "dev": true, "requires": { - "node-int64": "0.4.0" + "node-int64": "^0.4.0" } }, "buffer-from": { @@ -3132,15 +3117,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" }, "dependencies": { "isobject": { @@ -3169,9 +3154,9 @@ "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", "dev": true, "requires": { - "camelcase": "4.1.0", - "map-obj": "2.0.0", - "quick-lru": "1.1.0" + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" }, "dependencies": { "camelcase": { @@ -3193,7 +3178,7 @@ "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==", "dev": true, "requires": { - "rsvp": "4.8.4" + "rsvp": "^4.8.4" } }, "caseless": { @@ -3206,12 +3191,12 @@ "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", "requires": { - "assertion-error": "1.1.0", - "check-error": "1.0.2", - "deep-eql": "3.0.1", - "get-func-name": "2.0.0", - "pathval": "1.1.0", - "type-detect": "4.0.8" + "assertion-error": "^1.0.1", + "check-error": "^1.0.1", + "deep-eql": "^3.0.0", + "get-func-name": "^2.0.0", + "pathval": "^1.0.0", + "type-detect": "^4.0.0" } }, "chalk": { @@ -3219,11 +3204,11 @@ "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "check-error": { @@ -3243,10 +3228,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3255,7 +3240,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "isobject": { @@ -3277,9 +3262,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -3306,9 +3291,9 @@ "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "dev": true, "requires": { - "inherits": "2.0.3", - "process-nextick-args": "2.0.0", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "process-nextick-args": "^2.0.0", + "readable-stream": "^2.3.5" } }, "clones": { @@ -3333,8 +3318,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -3362,7 +3347,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3377,8 +3362,8 @@ "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", "dev": true, "requires": { - "array-ify": "1.0.0", - "dot-prop": "3.0.0" + "array-ify": "^1.0.0", + "dot-prop": "^3.0.0" } }, "compare-versions": { @@ -3417,10 +3402,10 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "content-type": { @@ -3434,17 +3419,17 @@ "integrity": "sha512-JBfdDSdSGasTNaBRZbOeFn8CJTIpP/sB/kiawmWAiLapLZ+wCDVDZR6Q+Hh9rjh3dxNAFR03bWTeqjKajXvPYA==", "dev": true, "requires": { - "conventional-changelog-angular": "5.0.3", - "conventional-changelog-atom": "2.0.1", - "conventional-changelog-codemirror": "2.0.1", - "conventional-changelog-conventionalcommits": "1.1.1", - "conventional-changelog-core": "3.2.2", - "conventional-changelog-ember": "2.0.2", - "conventional-changelog-eslint": "3.0.2", - "conventional-changelog-express": "2.0.1", - "conventional-changelog-jquery": "3.0.4", - "conventional-changelog-jshint": "2.0.1", - "conventional-changelog-preset-loader": "2.1.1" + "conventional-changelog-angular": "^5.0.3", + "conventional-changelog-atom": "^2.0.1", + "conventional-changelog-codemirror": "^2.0.1", + "conventional-changelog-conventionalcommits": "^1.1.1", + "conventional-changelog-core": "^3.2.2", + "conventional-changelog-ember": "^2.0.2", + "conventional-changelog-eslint": "^3.0.2", + "conventional-changelog-express": "^2.0.1", + "conventional-changelog-jquery": "^3.0.4", + "conventional-changelog-jshint": "^2.0.1", + "conventional-changelog-preset-loader": "^2.1.1" } }, "conventional-changelog-angular": { @@ -3453,8 +3438,8 @@ "integrity": "sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==", "dev": true, "requires": { - "compare-func": "1.3.2", - "q": "1.5.1" + "compare-func": "^1.3.1", + "q": "^1.5.1" } }, "conventional-changelog-atom": { @@ -3463,7 +3448,7 @@ "integrity": "sha512-9BniJa4gLwL20Sm7HWSNXd0gd9c5qo49gCi8nylLFpqAHhkFTj7NQfROq3f1VpffRtzfTQp4VKU5nxbe2v+eZQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-codemirror": { @@ -3472,7 +3457,7 @@ "integrity": "sha512-23kT5IZWa+oNoUaDUzVXMYn60MCdOygTA2I+UjnOMiYVhZgmVwNd6ri/yDlmQGXHqbKhNR5NoXdBzSOSGxsgIQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-conventionalcommits": { @@ -3481,8 +3466,8 @@ "integrity": "sha512-21BcbiSfvYIon7sF80Rwn6vnfhaiuZUyHHFYr9Zz8H2B+O/3grud5TbEYpU1/SFXD5aD48IdSme/KkJl9wCsCw==", "dev": true, "requires": { - "compare-func": "1.3.2", - "q": "1.5.1" + "compare-func": "^1.3.1", + "q": "^1.5.1" } }, "conventional-changelog-core": { @@ -3491,19 +3476,19 @@ "integrity": "sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==", "dev": true, "requires": { - "conventional-changelog-writer": "4.0.5", - "conventional-commits-parser": "3.0.2", - "dateformat": "3.0.3", - "get-pkg-repo": "1.4.0", + "conventional-changelog-writer": "^4.0.5", + "conventional-commits-parser": "^3.0.2", + "dateformat": "^3.0.0", + "get-pkg-repo": "^1.0.0", "git-raw-commits": "2.0.0", - "git-remote-origin-url": "2.0.0", - "git-semver-tags": "2.0.2", - "lodash": "4.17.11", - "normalize-package-data": "2.4.0", - "q": "1.5.1", - "read-pkg": "3.0.0", - "read-pkg-up": "3.0.0", - "through2": "3.0.1" + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^2.0.2", + "lodash": "^4.2.1", + "normalize-package-data": "^2.3.5", + "q": "^1.5.1", + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0", + "through2": "^3.0.0" }, "dependencies": { "read-pkg-up": { @@ -3512,8 +3497,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "3.0.0" + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" } }, "through2": { @@ -3522,7 +3507,7 @@ "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "2 || 3" } } } @@ -3533,7 +3518,7 @@ "integrity": "sha512-qtZbA3XefO/n6DDmkYywDYi6wDKNNc98MMl2F9PKSaheJ25Trpi3336W8fDlBhq0X+EJRuseceAdKLEMmuX2tg==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-eslint": { @@ -3542,7 +3527,7 @@ "integrity": "sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-express": { @@ -3551,7 +3536,7 @@ "integrity": "sha512-G6uCuCaQhLxdb4eEfAIHpcfcJ2+ao3hJkbLrw/jSK/eROeNfnxCJasaWdDAfFkxsbpzvQT4W01iSynU3OoPLIw==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-jquery": { @@ -3560,7 +3545,7 @@ "integrity": "sha512-IVJGI3MseYoY6eybknnTf9WzeQIKZv7aNTm2KQsiFVJH21bfP2q7XVjfoMibdCg95GmgeFlaygMdeoDDa+ZbEQ==", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.5.1" } }, "conventional-changelog-jshint": { @@ -3569,8 +3554,8 @@ "integrity": "sha512-kRFJsCOZzPFm2tzRHULWP4tauGMvccOlXYf3zGeuSW4U0mZhk5NsjnRZ7xFWrTFPlCLV+PNmHMuXp5atdoZmEg==", "dev": true, "requires": { - "compare-func": "1.3.2", - "q": "1.5.1" + "compare-func": "^1.3.1", + "q": "^1.5.1" } }, "conventional-changelog-preset-loader": { @@ -3585,16 +3570,16 @@ "integrity": "sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==", "dev": true, "requires": { - "compare-func": "1.3.2", - "conventional-commits-filter": "2.0.2", - "dateformat": "3.0.3", - "handlebars": "4.1.0", - "json-stringify-safe": "5.0.1", - "lodash": "4.17.11", - "meow": "4.0.1", - "semver": "5.7.0", - "split": "1.0.1", - "through2": "3.0.1" + "compare-func": "^1.3.1", + "conventional-commits-filter": "^2.0.2", + "dateformat": "^3.0.0", + "handlebars": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.2.1", + "meow": "^4.0.0", + "semver": "^5.5.0", + "split": "^1.0.0", + "through2": "^3.0.0" }, "dependencies": { "semver": { @@ -3609,7 +3594,7 @@ "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "2 || 3" } } } @@ -3620,8 +3605,8 @@ "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==", "dev": true, "requires": { - "lodash.ismatch": "4.4.0", - "modify-values": "1.0.1" + "lodash.ismatch": "^4.4.0", + "modify-values": "^1.0.0" } }, "conventional-commits-parser": { @@ -3630,13 +3615,13 @@ "integrity": "sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==", "dev": true, "requires": { - "JSONStream": "1.3.5", - "is-text-path": "1.0.1", - "lodash": "4.17.11", - "meow": "4.0.1", - "split2": "2.2.0", - "through2": "3.0.1", - "trim-off-newlines": "1.0.1" + "JSONStream": "^1.0.4", + "is-text-path": "^1.0.0", + "lodash": "^4.2.1", + "meow": "^4.0.0", + "split2": "^2.0.0", + "through2": "^3.0.0", + "trim-off-newlines": "^1.0.0" }, "dependencies": { "through2": { @@ -3645,7 +3630,7 @@ "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "2 || 3" } } } @@ -3656,14 +3641,14 @@ "integrity": "sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA==", "dev": true, "requires": { - "concat-stream": "2.0.0", - "conventional-changelog-preset-loader": "2.1.1", - "conventional-commits-filter": "2.0.2", - "conventional-commits-parser": "3.0.2", + "concat-stream": "^2.0.0", + "conventional-changelog-preset-loader": "^2.1.1", + "conventional-commits-filter": "^2.0.2", + "conventional-commits-parser": "^3.0.2", "git-raw-commits": "2.0.0", - "git-semver-tags": "2.0.2", - "meow": "4.0.1", - "q": "1.5.1" + "git-semver-tags": "^2.0.2", + "meow": "^4.0.0", + "q": "^1.5.1" }, "dependencies": { "concat-stream": { @@ -3672,10 +3657,10 @@ "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "3.3.0", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" } }, "readable-stream": { @@ -3684,9 +3669,9 @@ "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", "dev": true, "requires": { - "inherits": "2.0.3", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -3697,7 +3682,7 @@ "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "copy-descriptor": { @@ -3721,9 +3706,9 @@ "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==", "requires": { - "fbjs": "0.8.17", - "loose-envify": "1.4.0", - "object-assign": "4.1.1" + "fbjs": "^0.8.9", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" } }, "cross-spawn": { @@ -3732,11 +3717,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "dependencies": { "semver": { @@ -3752,8 +3737,8 @@ "resolved": "https://registry.npmjs.org/css-animation/-/css-animation-1.4.1.tgz", "integrity": "sha1-W4gTEl3g+7uwu+G0cq6EIhRpt6g=", "requires": { - "babel-runtime": "6.26.0", - "component-classes": "1.2.6" + "babel-runtime": "6.x", + "component-classes": "^1.2.5" } }, "cssom": { @@ -3768,7 +3753,7 @@ "integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==", "dev": true, "requires": { - "cssom": "0.3.6" + "cssom": "0.3.x" } }, "currently-unhandled": { @@ -3777,7 +3762,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "cycle": { @@ -3791,7 +3776,7 @@ "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "dashdash": { @@ -3799,7 +3784,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "data-urls": { @@ -3808,9 +3793,9 @@ "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", "dev": true, "requires": { - "abab": "2.0.0", - "whatwg-mimetype": "2.3.0", - "whatwg-url": "7.0.0" + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" }, "dependencies": { "whatwg-url": { @@ -3819,9 +3804,9 @@ "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", "dev": true, "requires": { - "lodash.sortby": "4.7.0", - "tr46": "1.0.1", - "webidl-conversions": "4.0.2" + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } } } @@ -3858,8 +3843,8 @@ "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", "dev": true, "requires": { - "decamelize": "1.2.0", - "map-obj": "1.0.1" + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" }, "dependencies": { "map-obj": { @@ -3880,7 +3865,7 @@ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", "requires": { - "type-detect": "4.0.8" + "type-detect": "^4.0.0" } }, "deep-is": { @@ -3895,7 +3880,7 @@ "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "dev": true, "requires": { - "strip-bom": "3.0.0" + "strip-bom": "^3.0.0" }, "dependencies": { "strip-bom": { @@ -3911,7 +3896,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "requires": { - "object-keys": "1.0.12" + "object-keys": "^1.0.12" } }, "define-property": { @@ -3920,8 +3905,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -3930,7 +3915,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3939,7 +3924,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3948,9 +3933,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "isobject": { @@ -4006,8 +3991,8 @@ "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", "dev": true, "requires": { - "asap": "2.0.6", - "wrappy": "1.0.2" + "asap": "^2.0.0", + "wrappy": "1" } }, "diff": { @@ -4028,7 +4013,7 @@ "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", "dev": true, "requires": { - "esutils": "1.1.6", + "esutils": "^1.1.6", "isarray": "0.0.1" }, "dependencies": { @@ -4056,7 +4041,7 @@ "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", "dev": true, "requires": { - "webidl-conversions": "4.0.2" + "webidl-conversions": "^4.0.2" } }, "dot-prop": { @@ -4065,7 +4050,7 @@ "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=", "dev": true, "requires": { - "is-obj": "1.0.1" + "is-obj": "^1.0.0" } }, "dotgitignore": { @@ -4074,8 +4059,8 @@ "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==", "dev": true, "requires": { - "find-up": "3.0.0", - "minimatch": "3.0.4" + "find-up": "^3.0.0", + "minimatch": "^3.0.4" }, "dependencies": { "find-up": { @@ -4084,7 +4069,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -4093,8 +4078,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } } } @@ -4105,10 +4090,10 @@ "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "ecc-jsbn": { @@ -4117,8 +4102,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "optional": true, "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -4151,7 +4136,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { - "iconv-lite": "0.4.23" + "iconv-lite": "~0.4.13" } }, "end-of-stream": { @@ -4160,7 +4145,7 @@ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "error-ex": { @@ -4169,7 +4154,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -4177,11 +4162,11 @@ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "requires": { - "es-to-primitive": "1.2.0", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4" + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.1", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" } }, "es-to-primitive": { @@ -4189,9 +4174,9 @@ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.2" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "escape-html": { @@ -4210,11 +4195,11 @@ "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==", "dev": true, "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "dependencies": { "esprima": { @@ -4264,13 +4249,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "exit": { @@ -4285,7 +4270,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -4294,7 +4279,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" } }, "expect": { @@ -4303,12 +4288,12 @@ "integrity": "sha512-mGfvMTPduksV3xoI0xur56pQsg2vJjNf5+a+bXOjqCkiCBbmCayrBbHS/75y9K430cfqyocPr2ZjiNiRx4SRKw==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "ansi-styles": "3.2.1", - "jest-get-type": "24.3.0", - "jest-matcher-utils": "24.7.0", - "jest-message-util": "24.7.1", - "jest-regex-util": "24.3.0" + "@jest/types": "^24.7.0", + "ansi-styles": "^3.2.0", + "jest-get-type": "^24.3.0", + "jest-matcher-utils": "^24.7.0", + "jest-message-util": "^24.7.1", + "jest-regex-util": "^24.3.0" }, "dependencies": { "ansi-styles": { @@ -4317,7 +4302,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } } } @@ -4333,7 +4318,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "extglob": { @@ -4342,7 +4327,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" }, "dependencies": { "is-extglob": { @@ -4390,7 +4375,7 @@ "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=", "dev": true, "requires": { - "bser": "2.0.0" + "bser": "^2.0.0" } }, "fbjs": { @@ -4398,13 +4383,13 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", "requires": { - "core-js": "1.2.7", - "isomorphic-fetch": "2.2.1", - "loose-envify": "1.4.0", - "object-assign": "4.1.1", - "promise": "7.3.1", - "setimmediate": "1.0.5", - "ua-parser-js": "0.7.18" + "core-js": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" }, "dependencies": { "core-js": { @@ -4420,7 +4405,7 @@ "integrity": "sha512-dl3Ukt08rHVQfY8xGD0ODwyjwrRALtaghuqGH2jByYX1wpY+nAnRQjJ6Dbqq0DnVgNVQ9yibObzbF4IlPyiwPw==", "dev": true, "requires": { - "detect-libc": "1.0.3" + "detect-libc": "^1.0.3" } }, "figures": { @@ -4429,7 +4414,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-type": { @@ -4450,8 +4435,8 @@ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "7.1.3", - "minimatch": "3.0.4" + "glob": "^7.0.3", + "minimatch": "^3.0.3" } }, "fill-range": { @@ -4460,11 +4445,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.1.0", - "repeat-element": "1.1.3", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "finalhandler": { @@ -4473,12 +4458,12 @@ "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.4.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.4.0", + "unpipe": "~1.0.0" }, "dependencies": { "statuses": { @@ -4494,7 +4479,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "finity": { @@ -4512,7 +4497,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", "requires": { - "debug": "3.1.0" + "debug": "=3.1.0" }, "dependencies": { "debug": { @@ -4537,7 +4522,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "forever-agent": { @@ -4550,9 +4535,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.20" + "mime-types": "^2.1.12" }, "dependencies": { "combined-stream": { @@ -4560,7 +4545,7 @@ "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } } } @@ -4571,7 +4556,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -4585,7 +4570,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "1.0.0" + "null-check": "^1.0.0" } }, "fs-extra": { @@ -4594,9 +4579,9 @@ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -4612,8 +4597,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.11.0", - "node-pre-gyp": "0.10.3" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -4625,7 +4610,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4639,21 +4625,23 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -4666,17 +4654,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4717,7 +4708,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.3.5" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -4732,14 +4723,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -4748,12 +4739,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -4768,7 +4759,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -4777,7 +4768,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -4786,14 +4777,15 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4805,8 +4797,9 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -4819,22 +4812,25 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.0.3" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, "minizlib": { @@ -4843,13 +4839,14 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.3.5" + "minipass": "^2.2.1" } }, "mkdirp": { "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4866,9 +4863,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.24", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -4877,16 +4874,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.4", - "nopt": "4.0.1", - "npm-packlist": "1.2.0", - "npmlog": "4.1.2", - "rc": "1.2.8", - "rimraf": "2.6.3", - "semver": "5.6.0", - "tar": "4.4.8" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -4895,8 +4892,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -4911,8 +4908,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.5" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -4921,16 +4918,17 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4942,8 +4940,9 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -4964,8 +4963,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -4986,10 +4985,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5006,13 +5005,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -5021,13 +5020,14 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.3" } }, "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5063,10 +5063,11 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5075,15 +5076,16 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5098,13 +5100,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.1.1", - "fs-minipass": "1.2.5", - "minipass": "2.3.5", - "minizlib": "1.2.1", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.3" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -5119,18 +5121,20 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -5156,11 +5160,11 @@ "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "meow": "3.7.0", - "normalize-package-data": "2.4.0", - "parse-github-repo-url": "1.4.1", - "through2": "2.0.3" + "hosted-git-info": "^2.1.4", + "meow": "^3.3.0", + "normalize-package-data": "^2.3.0", + "parse-github-repo-url": "^1.3.0", + "through2": "^2.0.0" }, "dependencies": { "camelcase-keys": { @@ -5169,8 +5173,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "find-up": { @@ -5179,8 +5183,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "indent-string": { @@ -5189,7 +5193,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "load-json-file": { @@ -5198,11 +5202,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "map-obj": { @@ -5217,16 +5221,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "minimist": { @@ -5241,7 +5245,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "path-exists": { @@ -5250,7 +5254,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -5259,9 +5263,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -5276,9 +5280,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -5287,8 +5291,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "redent": { @@ -5297,8 +5301,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "strip-bom": { @@ -5307,7 +5311,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-indent": { @@ -5316,7 +5320,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "trim-newlines": { @@ -5339,7 +5343,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "get-value": { @@ -5353,7 +5357,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "gettext-parser": { @@ -5362,8 +5366,8 @@ "integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==", "dev": true, "requires": { - "encoding": "0.1.12", - "safe-buffer": "5.1.2" + "encoding": "^0.1.12", + "safe-buffer": "^5.1.1" } }, "git-raw-commits": { @@ -5372,11 +5376,11 @@ "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==", "dev": true, "requires": { - "dargs": "4.1.0", - "lodash.template": "4.4.0", - "meow": "4.0.1", - "split2": "2.2.0", - "through2": "2.0.3" + "dargs": "^4.0.1", + "lodash.template": "^4.0.2", + "meow": "^4.0.0", + "split2": "^2.0.0", + "through2": "^2.0.0" } }, "git-remote-origin-url": { @@ -5385,8 +5389,8 @@ "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=", "dev": true, "requires": { - "gitconfiglocal": "1.0.0", - "pify": "2.3.0" + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" }, "dependencies": { "pify": { @@ -5403,8 +5407,8 @@ "integrity": "sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==", "dev": true, "requires": { - "meow": "4.0.1", - "semver": "5.7.0" + "meow": "^4.0.0", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -5421,7 +5425,7 @@ "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=", "dev": true, "requires": { - "ini": "1.3.5" + "ini": "^1.3.2" } }, "glob": { @@ -5430,12 +5434,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-all": { @@ -5444,8 +5448,8 @@ "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=", "dev": true, "requires": { - "glob": "7.1.3", - "yargs": "1.2.6" + "glob": "^7.0.5", + "yargs": "~1.2.6" }, "dependencies": { "minimist": { @@ -5460,7 +5464,7 @@ "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=", "dev": true, "requires": { - "minimist": "0.1.0" + "minimist": "^0.1.0" } } } @@ -5471,8 +5475,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5481,7 +5485,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5496,7 +5500,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5507,8 +5511,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" } }, "glob-stream": { @@ -5517,14 +5521,14 @@ "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", "dev": true, "requires": { - "extend": "3.0.2", - "glob": "5.0.15", - "glob-parent": "3.1.0", - "micromatch": "2.3.11", - "ordered-read-streams": "0.3.0", - "through2": "0.6.5", - "to-absolute-glob": "0.1.1", - "unique-stream": "2.2.1" + "extend": "^3.0.0", + "glob": "^5.0.3", + "glob-parent": "^3.0.0", + "micromatch": "^2.3.7", + "ordered-read-streams": "^0.3.0", + "through2": "^0.6.0", + "to-absolute-glob": "^0.1.1", + "unique-stream": "^2.0.2" }, "dependencies": { "glob": { @@ -5533,11 +5537,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "readable-stream": { @@ -5546,10 +5550,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5564,8 +5568,8 @@ "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" } } } @@ -5599,11 +5603,11 @@ "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { - "convert-source-map": "1.6.0", - "graceful-fs": "4.1.11", - "strip-bom": "2.0.0", - "through2": "2.0.3", - "vinyl": "1.2.0" + "convert-source-map": "^1.1.1", + "graceful-fs": "^4.1.2", + "strip-bom": "^2.0.0", + "through2": "^2.0.0", + "vinyl": "^1.0.0" }, "dependencies": { "clone": { @@ -5630,7 +5634,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "vinyl": { @@ -5639,8 +5643,8 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } } @@ -5652,10 +5656,10 @@ "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==", "dev": true, "requires": { - "async": "2.6.2", - "optimist": "0.6.1", - "source-map": "0.6.1", - "uglify-js": "3.4.9" + "async": "^2.5.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" }, "dependencies": { "async": { @@ -5664,7 +5668,7 @@ "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } } } @@ -5679,8 +5683,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.3.0", + "har-schema": "^2.0.0" } }, "has": { @@ -5688,7 +5692,7 @@ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -5696,7 +5700,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -5716,9 +5720,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" }, "dependencies": { "isobject": { @@ -5735,8 +5739,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -5745,7 +5749,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -5754,7 +5758,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5765,7 +5769,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -5781,11 +5785,11 @@ "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", "requires": { - "invariant": "2.2.4", - "loose-envify": "1.4.0", - "resolve-pathname": "2.2.0", - "value-equal": "0.4.0", - "warning": "3.0.0" + "invariant": "^2.2.1", + "loose-envify": "^1.2.0", + "resolve-pathname": "^2.2.0", + "value-equal": "^0.4.0", + "warning": "^3.0.0" } }, "hoek": { @@ -5810,7 +5814,7 @@ "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", "dev": true, "requires": { - "whatwg-encoding": "1.0.5" + "whatwg-encoding": "^1.0.1" } }, "html-entities": { @@ -5823,7 +5827,7 @@ "resolved": "https://registry.npmjs.org/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz", "integrity": "sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=", "requires": { - "void-elements": "2.0.1" + "void-elements": "^2.0.1" } }, "http-errors": { @@ -5831,10 +5835,10 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "http-signature": { @@ -5842,9 +5846,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.2" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "humps": { @@ -5868,12 +5872,12 @@ "integrity": "sha512-gZnFt3MMont23iIXb//i+TyZataV0hsJYisiArBOIScJxr6Ke6l9ccpqVJ8Vq0rC0MNNMZxI4sYUXhGm/J2Fzw==", "dev": true, "requires": { - "bluebird": "3.5.2", - "chalk": "2.4.2", - "commander": "2.20.0", - "gettext-parser": "2.1.0", - "mkdirp": "0.5.1", - "node-gettext": "2.0.0" + "bluebird": "^3.5.2", + "chalk": "^2.4.1", + "commander": "^2.19.0", + "gettext-parser": "^2.0.0", + "mkdirp": "^0.5.1", + "node-gettext": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -5882,7 +5886,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -5891,9 +5895,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "commander": { @@ -5908,9 +5912,9 @@ "integrity": "sha512-YGmu8DSm7PBnwItT+aOiqejOogqctHFzn+wBKUzjDFQP00psAtn/W2paWQxqE5eA5Ijrqaf7xuTKqyCHpuxnrg==", "dev": true, "requires": { - "encoding": "0.1.12", - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2" + "encoding": "^0.1.12", + "readable-stream": "^2.0.0", + "safe-buffer": "^5.1.2" } }, "supports-color": { @@ -5919,7 +5923,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -5930,11 +5934,11 @@ "integrity": "sha512-HpJEYpT8fQUsyjZfECtBgsVyjyooAXgEon4MzFC9cc6U80/PWVNUoEeIsBYFVwCnqGBNORS4pP9AvEFmbqfG8A==", "dev": true, "requires": { - "debug": "2.6.9", - "glob": "7.1.3", - "i18next-conv": "3.0.3", - "i18next-scanner": "1.9.4", - "minimist": "1.2.0" + "debug": "^2.2.0", + "glob": "^7.0.3", + "i18next-conv": "^3.0.1", + "i18next-scanner": "^1.4.1", + "minimist": "^1.2.0" }, "dependencies": { "i18next-conv": { @@ -5943,14 +5947,14 @@ "integrity": "sha1-yOZgaS3H3WgvWdkO6czcV61meW4=", "dev": true, "requires": { - "bluebird": "3.5.2", - "chalk": "1.1.3", - "commander": "2.18.0", - "gettext-parser": "1.4.0", - "mkdirp": "0.5.1", - "node-gettext": "1.1.0", - "object-assign": "4.1.1", - "pkginfo": "0.4.1" + "bluebird": "^3.4.1", + "chalk": "^1.1.3", + "commander": "^2.9.0", + "gettext-parser": "^1.2.0", + "mkdirp": "^0.5.1", + "node-gettext": "^1.1.0", + "object-assign": "^4.1.0", + "pkginfo": "^0.4.0" } }, "minimist": { @@ -5965,7 +5969,7 @@ "integrity": "sha1-6WzZeyiShxNzgdZLbTPKThkfKfo=", "dev": true, "requires": { - "gettext-parser": "1.4.0" + "gettext-parser": "^1.1.2" } } } @@ -5976,11 +5980,11 @@ "integrity": "sha512-g6ksOGP3rPijxpl+Sqa0VHCuKmJTbD1pHX4KhlFeE2mpLW+MF0mmHL6GdlDo4edefWEWYjVQyezHUXp83cV0Kg==", "dev": true, "requires": { - "esprima": "4.0.1", - "lodash": "4.17.11", - "through2": "2.0.3", - "vinyl": "2.2.0", - "vinyl-fs": "2.4.4" + "esprima": "^4.0.0", + "lodash": "^4.17.4", + "through2": "^2.0.3", + "vinyl": "^2.0.2", + "vinyl-fs": "^2.4.4" } }, "i18next-xhr-backend": { @@ -5993,7 +5997,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "import-local": { @@ -6002,8 +6006,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -6029,8 +6033,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6055,7 +6059,7 @@ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -6070,7 +6074,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-arrayish": { @@ -6090,7 +6094,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-callable": { @@ -6104,7 +6108,7 @@ "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", "dev": true, "requires": { - "ci-info": "2.0.0" + "ci-info": "^2.0.0" } }, "is-data-descriptor": { @@ -6113,7 +6117,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-date-object": { @@ -6127,9 +6131,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -6152,7 +6156,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -6173,7 +6177,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -6182,7 +6186,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-generator-fn": { @@ -6197,7 +6201,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } }, "is-number": { @@ -6206,7 +6210,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-obj": { @@ -6227,7 +6231,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" }, "dependencies": { "isobject": { @@ -6255,7 +6259,7 @@ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "requires": { - "has": "1.0.3" + "has": "^1.0.1" } }, "is-stream": { @@ -6268,7 +6272,7 @@ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", "requires": { - "has-symbols": "1.0.0" + "has-symbols": "^1.0.0" } }, "is-text-path": { @@ -6277,7 +6281,7 @@ "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=", "dev": true, "requires": { - "text-extensions": "1.9.0" + "text-extensions": "^1.0.0" } }, "is-typedarray": { @@ -6318,7 +6322,7 @@ "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.1.3.tgz", "integrity": "sha512-5xbsG5wYADIcB+mfLsd+nst1V/D+I7EU7LEZPo2GOIMu4JzfcRs5yQoypP4avA7QtUqgxYLKBYNv4IdzBmbhdw==", "requires": { - "punycode": "2.1.1" + "punycode": "2.x.x" } }, "isexe": { @@ -6349,8 +6353,8 @@ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "requires": { - "node-fetch": "1.7.3", - "whatwg-fetch": "3.0.0" + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" } }, "isstream": { @@ -6364,19 +6368,19 @@ "integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==", "dev": true, "requires": { - "async": "2.6.2", - "compare-versions": "3.4.0", - "fileset": "2.0.3", - "istanbul-lib-coverage": "2.0.3", - "istanbul-lib-hook": "2.0.3", - "istanbul-lib-instrument": "3.1.0", - "istanbul-lib-report": "2.0.4", - "istanbul-lib-source-maps": "3.0.2", - "istanbul-reports": "2.1.1", - "js-yaml": "3.13.1", - "make-dir": "1.3.0", - "minimatch": "3.0.4", - "once": "1.4.0" + "async": "^2.6.1", + "compare-versions": "^3.2.1", + "fileset": "^2.0.3", + "istanbul-lib-coverage": "^2.0.3", + "istanbul-lib-hook": "^2.0.3", + "istanbul-lib-instrument": "^3.1.0", + "istanbul-lib-report": "^2.0.4", + "istanbul-lib-source-maps": "^3.0.2", + "istanbul-reports": "^2.1.1", + "js-yaml": "^3.12.0", + "make-dir": "^1.3.0", + "minimatch": "^3.0.4", + "once": "^1.4.0" }, "dependencies": { "async": { @@ -6385,7 +6389,7 @@ "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } }, "compare-versions": { @@ -6408,7 +6412,7 @@ "integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==", "dev": true, "requires": { - "append-transform": "1.0.0" + "append-transform": "^1.0.0" } }, "istanbul-lib-instrument": { @@ -6417,13 +6421,13 @@ "integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==", "dev": true, "requires": { - "@babel/generator": "7.4.0", - "@babel/parser": "7.4.3", - "@babel/template": "7.4.0", - "@babel/traverse": "7.4.3", - "@babel/types": "7.4.0", - "istanbul-lib-coverage": "2.0.3", - "semver": "5.7.0" + "@babel/generator": "^7.0.0", + "@babel/parser": "^7.0.0", + "@babel/template": "^7.0.0", + "@babel/traverse": "^7.0.0", + "@babel/types": "^7.0.0", + "istanbul-lib-coverage": "^2.0.3", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -6440,9 +6444,9 @@ "integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==", "dev": true, "requires": { - "istanbul-lib-coverage": "2.0.3", - "make-dir": "1.3.0", - "supports-color": "6.1.0" + "istanbul-lib-coverage": "^2.0.3", + "make-dir": "^1.3.0", + "supports-color": "^6.0.0" }, "dependencies": { "supports-color": { @@ -6451,7 +6455,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -6462,11 +6466,11 @@ "integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==", "dev": true, "requires": { - "debug": "4.1.1", - "istanbul-lib-coverage": "2.0.3", - "make-dir": "1.3.0", - "rimraf": "2.6.3", - "source-map": "0.6.1" + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.3", + "make-dir": "^1.3.0", + "rimraf": "^2.6.2", + "source-map": "^0.6.1" }, "dependencies": { "debug": { @@ -6475,7 +6479,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "ms": { @@ -6492,7 +6496,7 @@ "integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==", "dev": true, "requires": { - "handlebars": "4.1.0" + "handlebars": "^4.1.0" } }, "jest": { @@ -6501,8 +6505,8 @@ "integrity": "sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==", "dev": true, "requires": { - "import-local": "2.0.0", - "jest-cli": "24.7.1" + "import-local": "^2.0.0", + "jest-cli": "^24.7.1" }, "dependencies": { "ansi-regex": { @@ -6517,7 +6521,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -6526,9 +6530,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cliui": { @@ -6537,9 +6541,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "find-up": { @@ -6548,7 +6552,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "invert-kv": { @@ -6569,19 +6573,19 @@ "integrity": "sha512-32OBoSCVPzcTslGFl6yVCMzB2SqX3IrWwZCY5mZYkb0D2WsogmU3eV2o8z7+gRQa4o4sZPX/k7GU+II7CxM6WQ==", "dev": true, "requires": { - "@jest/core": "24.7.1", - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "exit": "0.1.2", - "import-local": "2.0.0", - "is-ci": "2.0.0", - "jest-config": "24.7.1", - "jest-util": "24.7.1", - "jest-validate": "24.7.0", - "prompts": "2.0.4", - "realpath-native": "1.1.0", - "yargs": "12.0.5" + "@jest/core": "^24.7.1", + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "import-local": "^2.0.0", + "is-ci": "^2.0.0", + "jest-config": "^24.7.1", + "jest-util": "^24.7.1", + "jest-validate": "^24.7.0", + "prompts": "^2.0.1", + "realpath-native": "^1.1.0", + "yargs": "^12.0.2" } }, "lcid": { @@ -6590,7 +6594,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -6599,8 +6603,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -6609,9 +6613,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "string-width": { @@ -6620,8 +6624,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -6630,7 +6634,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -6639,7 +6643,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "yargs": { @@ -6648,18 +6652,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } } } @@ -6670,9 +6674,9 @@ "integrity": "sha512-33BgewurnwSfJrW7T5/ZAXGE44o7swLslwh8aUckzq2e17/2Os1V0QU506ZNik3hjs8MgnEMKNkcud442NCDTw==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "execa": "1.0.0", - "throat": "4.1.0" + "@jest/types": "^24.7.0", + "execa": "^1.0.0", + "throat": "^4.0.0" } }, "jest-config": { @@ -6681,23 +6685,23 @@ "integrity": "sha512-8FlJNLI+X+MU37j7j8RE4DnJkvAghXmBWdArVzypW6WxfGuxiL/CCkzBg0gHtXhD2rxla3IMOSUAHylSKYJ83g==", "dev": true, "requires": { - "@babel/core": "7.4.3", - "@jest/test-sequencer": "24.7.1", - "@jest/types": "24.7.0", - "babel-jest": "24.7.1", - "chalk": "2.4.2", - "glob": "7.1.3", - "jest-environment-jsdom": "24.7.1", - "jest-environment-node": "24.7.1", - "jest-get-type": "24.3.0", - "jest-jasmine2": "24.7.1", - "jest-regex-util": "24.3.0", - "jest-resolve": "24.7.1", - "jest-util": "24.7.1", - "jest-validate": "24.7.0", - "micromatch": "3.1.10", - "pretty-format": "24.7.0", - "realpath-native": "1.1.0" + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^24.7.1", + "@jest/types": "^24.7.0", + "babel-jest": "^24.7.1", + "chalk": "^2.0.1", + "glob": "^7.1.1", + "jest-environment-jsdom": "^24.7.1", + "jest-environment-node": "^24.7.1", + "jest-get-type": "^24.3.0", + "jest-jasmine2": "^24.7.1", + "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.7.1", + "jest-util": "^24.7.1", + "jest-validate": "^24.7.0", + "micromatch": "^3.1.10", + "pretty-format": "^24.7.0", + "realpath-native": "^1.1.0" }, "dependencies": { "ansi-styles": { @@ -6706,7 +6710,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "arr-diff": { @@ -6727,16 +6731,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -6745,7 +6749,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6756,9 +6760,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "expand-brackets": { @@ -6767,13 +6771,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -6782,7 +6786,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -6791,7 +6795,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -6800,7 +6804,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6809,7 +6813,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6820,7 +6824,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6829,7 +6833,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6840,9 +6844,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -6859,8 +6863,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -6869,7 +6873,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -6880,14 +6884,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -6896,7 +6900,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -6905,7 +6909,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6916,10 +6920,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -6928,7 +6932,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6939,7 +6943,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -6948,7 +6952,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -6957,9 +6961,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -6968,7 +6972,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6977,7 +6981,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7000,19 +7004,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "supports-color": { @@ -7021,7 +7025,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7032,10 +7036,10 @@ "integrity": "sha512-ULQZ5B1lWpH70O4xsANC4tf4Ko6RrpwhE3PtG6ERjMg1TiYTC2Wp4IntJVGro6a8HG9luYHhhmF4grF0Pltckg==", "dev": true, "requires": { - "chalk": "2.4.2", - "diff-sequences": "24.3.0", - "jest-get-type": "24.3.0", - "pretty-format": "24.7.0" + "chalk": "^2.0.1", + "diff-sequences": "^24.3.0", + "jest-get-type": "^24.3.0", + "pretty-format": "^24.7.0" }, "dependencies": { "ansi-styles": { @@ -7044,7 +7048,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7053,9 +7057,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -7064,7 +7068,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7075,7 +7079,7 @@ "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==", "dev": true, "requires": { - "detect-newline": "2.1.0" + "detect-newline": "^2.1.0" } }, "jest-each": { @@ -7084,11 +7088,11 @@ "integrity": "sha512-4fsS8fEfLa3lfnI1Jw6NxjhyRTgfpuOVTeUZZFyVYqeTa4hPhr2YkToUhouuLTrL2eMGOfpbdMyRx0GQ/VooKA==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "jest-get-type": "24.3.0", - "jest-util": "24.7.1", - "pretty-format": "24.7.0" + "@jest/types": "^24.7.0", + "chalk": "^2.0.1", + "jest-get-type": "^24.3.0", + "jest-util": "^24.7.1", + "pretty-format": "^24.7.0" }, "dependencies": { "ansi-styles": { @@ -7097,7 +7101,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7106,9 +7110,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -7117,7 +7121,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7128,12 +7132,12 @@ "integrity": "sha512-Gnhb+RqE2JuQGb3kJsLF8vfqjt3PHKSstq4Xc8ic+ax7QKo4Z0RWGucU3YV+DwKR3T9SYc+3YCUQEJs8r7+Jxg==", "dev": true, "requires": { - "@jest/environment": "24.7.1", - "@jest/fake-timers": "24.7.1", - "@jest/types": "24.7.0", - "jest-mock": "24.7.0", - "jest-util": "24.7.1", - "jsdom": "11.12.0" + "@jest/environment": "^24.7.1", + "@jest/fake-timers": "^24.7.1", + "@jest/types": "^24.7.0", + "jest-mock": "^24.7.0", + "jest-util": "^24.7.1", + "jsdom": "^11.5.1" } }, "jest-environment-node": { @@ -7142,11 +7146,11 @@ "integrity": "sha512-GJJQt1p9/C6aj6yNZMvovZuxTUd+BEJprETdvTKSb4kHcw4mFj8777USQV0FJoJ4V3djpOwA5eWyPwfq//PFBA==", "dev": true, "requires": { - "@jest/environment": "24.7.1", - "@jest/fake-timers": "24.7.1", - "@jest/types": "24.7.0", - "jest-mock": "24.7.0", - "jest-util": "24.7.1" + "@jest/environment": "^24.7.1", + "@jest/fake-timers": "^24.7.1", + "@jest/types": "^24.7.0", + "jest-mock": "^24.7.0", + "jest-util": "^24.7.1" } }, "jest-get-type": { @@ -7161,18 +7165,18 @@ "integrity": "sha512-g0tWkzjpHD2qa03mTKhlydbmmYiA2KdcJe762SbfFo/7NIMgBWAA0XqQlApPwkWOF7Cxoi/gUqL0i6DIoLpMBw==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "anymatch": "2.0.0", - "fb-watchman": "2.0.0", - "fsevents": "1.2.7", - "graceful-fs": "4.1.15", - "invariant": "2.2.4", - "jest-serializer": "24.4.0", - "jest-util": "24.7.1", - "jest-worker": "24.6.0", - "micromatch": "3.1.10", - "sane": "4.1.0", - "walker": "1.0.7" + "@jest/types": "^24.7.0", + "anymatch": "^2.0.0", + "fb-watchman": "^2.0.0", + "fsevents": "^1.2.7", + "graceful-fs": "^4.1.15", + "invariant": "^2.2.4", + "jest-serializer": "^24.4.0", + "jest-util": "^24.7.1", + "jest-worker": "^24.6.0", + "micromatch": "^3.1.10", + "sane": "^4.0.3", + "walker": "^1.0.7" }, "dependencies": { "arr-diff": { @@ -7193,16 +7197,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -7211,7 +7215,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7222,13 +7226,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -7237,7 +7241,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -7246,7 +7250,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -7255,7 +7259,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7264,7 +7268,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7275,7 +7279,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7284,7 +7288,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7295,9 +7299,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -7314,8 +7318,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7324,7 +7328,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7335,14 +7339,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -7351,7 +7355,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -7360,7 +7364,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7371,10 +7375,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -7383,7 +7387,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7400,7 +7404,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -7409,7 +7413,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -7418,9 +7422,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -7429,7 +7433,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7438,7 +7442,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7461,19 +7465,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } } } @@ -7484,22 +7488,22 @@ "integrity": "sha512-Y/9AOJDV1XS44wNwCaThq4Pw3gBPiOv/s6NcbOAkVRRUEPu+36L2xoPsqQXsDrxoBerqeyslpn2TpCI8Zr6J2w==", "dev": true, "requires": { - "@babel/traverse": "7.4.3", - "@jest/environment": "24.7.1", - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "co": "4.6.0", - "expect": "24.7.1", - "is-generator-fn": "2.1.0", - "jest-each": "24.7.1", - "jest-matcher-utils": "24.7.0", - "jest-message-util": "24.7.1", - "jest-runtime": "24.7.1", - "jest-snapshot": "24.7.1", - "jest-util": "24.7.1", - "pretty-format": "24.7.0", - "throat": "4.1.0" + "@babel/traverse": "^7.1.0", + "@jest/environment": "^24.7.1", + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "chalk": "^2.0.1", + "co": "^4.6.0", + "expect": "^24.7.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^24.7.1", + "jest-matcher-utils": "^24.7.0", + "jest-message-util": "^24.7.1", + "jest-runtime": "^24.7.1", + "jest-snapshot": "^24.7.1", + "jest-util": "^24.7.1", + "pretty-format": "^24.7.0", + "throat": "^4.0.0" }, "dependencies": { "ansi-styles": { @@ -7508,7 +7512,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7517,9 +7521,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -7528,7 +7532,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7539,7 +7543,7 @@ "integrity": "sha512-zV0qHKZGXtmPVVzT99CVEcHE9XDf+8LwiE0Ob7jjezERiGVljmqKFWpV2IkG+rkFIEUHFEkMiICu7wnoPM/RoQ==", "dev": true, "requires": { - "pretty-format": "24.7.0" + "pretty-format": "^24.7.0" } }, "jest-matcher-utils": { @@ -7548,10 +7552,10 @@ "integrity": "sha512-158ieSgk3LNXeUhbVJYRXyTPSCqNgVXOp/GT7O94mYd3pk/8+odKTyR1JLtNOQSPzNi8NFYVONtvSWA/e1RDXg==", "dev": true, "requires": { - "chalk": "2.4.2", - "jest-diff": "24.7.0", - "jest-get-type": "24.3.0", - "pretty-format": "24.7.0" + "chalk": "^2.0.1", + "jest-diff": "^24.7.0", + "jest-get-type": "^24.3.0", + "pretty-format": "^24.7.0" }, "dependencies": { "ansi-styles": { @@ -7560,7 +7564,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7569,9 +7573,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -7580,7 +7584,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7591,14 +7595,14 @@ "integrity": "sha512-dk0gqVtyqezCHbcbk60CdIf+8UHgD+lmRHifeH3JRcnAqh4nEyPytSc9/L1+cQyxC+ceaeP696N4ATe7L+omcg==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "@types/stack-utils": "1.0.1", - "chalk": "2.4.2", - "micromatch": "3.1.10", - "slash": "2.0.0", - "stack-utils": "1.0.2" + "@babel/code-frame": "^7.0.0", + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^2.0.1", + "micromatch": "^3.1.10", + "slash": "^2.0.0", + "stack-utils": "^1.0.1" }, "dependencies": { "ansi-styles": { @@ -7607,7 +7611,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "arr-diff": { @@ -7628,16 +7632,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -7646,7 +7650,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7657,9 +7661,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "expand-brackets": { @@ -7668,13 +7672,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -7683,7 +7687,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -7692,7 +7696,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -7701,7 +7705,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7710,7 +7714,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7721,7 +7725,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7730,7 +7734,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7741,9 +7745,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -7760,8 +7764,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7770,7 +7774,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7781,14 +7785,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -7797,7 +7801,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -7806,7 +7810,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7817,10 +7821,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -7829,7 +7833,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7840,7 +7844,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -7849,7 +7853,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -7858,9 +7862,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -7869,7 +7873,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7878,7 +7882,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7901,19 +7905,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "slash": { @@ -7928,7 +7932,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -7945,7 +7949,7 @@ "integrity": "sha512-6taW4B4WUcEiT2V9BbOmwyGuwuAFT2G8yghF7nyNW1/2gq5+6aTqSPcS9lS6ArvEkX55vbPAS/Jarx5LSm4Fng==", "dev": true, "requires": { - "@jest/types": "24.7.0" + "@jest/types": "^24.7.0" } }, "jest-pnp-resolver": { @@ -7966,11 +7970,11 @@ "integrity": "sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "browser-resolve": "1.11.3", - "chalk": "2.4.2", - "jest-pnp-resolver": "1.2.1", - "realpath-native": "1.1.0" + "@jest/types": "^24.7.0", + "browser-resolve": "^1.11.3", + "chalk": "^2.0.1", + "jest-pnp-resolver": "^1.2.1", + "realpath-native": "^1.1.0" }, "dependencies": { "ansi-styles": { @@ -7979,7 +7983,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7988,9 +7992,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -7999,7 +8003,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8010,9 +8014,9 @@ "integrity": "sha512-2Eyh5LJB2liNzfk4eo7bD1ZyBbqEJIyyrFtZG555cSWW9xVHxII2NuOkSl1yUYTAYCAmM2f2aIT5A7HzNmubyg==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "jest-regex-util": "24.3.0", - "jest-snapshot": "24.7.1" + "@jest/types": "^24.7.0", + "jest-regex-util": "^24.3.0", + "jest-snapshot": "^24.7.1" } }, "jest-runner": { @@ -8021,25 +8025,25 @@ "integrity": "sha512-aNFc9liWU/xt+G9pobdKZ4qTeG/wnJrJna3VqunziDNsWT3EBpmxXZRBMKCsNMyfy+A/XHiV+tsMLufdsNdgCw==", "dev": true, "requires": { - "@jest/console": "24.7.1", - "@jest/environment": "24.7.1", - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "exit": "0.1.2", - "graceful-fs": "4.1.15", - "jest-config": "24.7.1", - "jest-docblock": "24.3.0", - "jest-haste-map": "24.7.1", - "jest-jasmine2": "24.7.1", - "jest-leak-detector": "24.7.0", - "jest-message-util": "24.7.1", - "jest-resolve": "24.7.1", - "jest-runtime": "24.7.1", - "jest-util": "24.7.1", - "jest-worker": "24.6.0", - "source-map-support": "0.5.12", - "throat": "4.1.0" + "@jest/console": "^24.7.1", + "@jest/environment": "^24.7.1", + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "chalk": "^2.4.2", + "exit": "^0.1.2", + "graceful-fs": "^4.1.15", + "jest-config": "^24.7.1", + "jest-docblock": "^24.3.0", + "jest-haste-map": "^24.7.1", + "jest-jasmine2": "^24.7.1", + "jest-leak-detector": "^24.7.0", + "jest-message-util": "^24.7.1", + "jest-resolve": "^24.7.1", + "jest-runtime": "^24.7.1", + "jest-util": "^24.7.1", + "jest-worker": "^24.6.0", + "source-map-support": "^0.5.6", + "throat": "^4.0.0" }, "dependencies": { "ansi-styles": { @@ -8048,7 +8052,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8057,9 +8061,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "graceful-fs": { @@ -8074,7 +8078,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8085,29 +8089,29 @@ "integrity": "sha512-0VAbyBy7tll3R+82IPJpf6QZkokzXPIS71aDeqh+WzPRXRCNz6StQ45otFariPdJ4FmXpDiArdhZrzNAC3sj6A==", "dev": true, "requires": { - "@jest/console": "24.7.1", - "@jest/environment": "24.7.1", - "@jest/source-map": "24.3.0", - "@jest/transform": "24.7.1", - "@jest/types": "24.7.0", - "@types/yargs": "12.0.12", - "chalk": "2.4.2", - "exit": "0.1.2", - "glob": "7.1.3", - "graceful-fs": "4.1.15", - "jest-config": "24.7.1", - "jest-haste-map": "24.7.1", - "jest-message-util": "24.7.1", - "jest-mock": "24.7.0", - "jest-regex-util": "24.3.0", - "jest-resolve": "24.7.1", - "jest-snapshot": "24.7.1", - "jest-util": "24.7.1", - "jest-validate": "24.7.0", - "realpath-native": "1.1.0", - "slash": "2.0.0", - "strip-bom": "3.0.0", - "yargs": "12.0.5" + "@jest/console": "^24.7.1", + "@jest/environment": "^24.7.1", + "@jest/source-map": "^24.3.0", + "@jest/transform": "^24.7.1", + "@jest/types": "^24.7.0", + "@types/yargs": "^12.0.2", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "jest-config": "^24.7.1", + "jest-haste-map": "^24.7.1", + "jest-message-util": "^24.7.1", + "jest-mock": "^24.7.0", + "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.7.1", + "jest-snapshot": "^24.7.1", + "jest-util": "^24.7.1", + "jest-validate": "^24.7.0", + "realpath-native": "^1.1.0", + "slash": "^2.0.0", + "strip-bom": "^3.0.0", + "yargs": "^12.0.2" }, "dependencies": { "ansi-regex": { @@ -8122,7 +8126,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8131,9 +8135,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cliui": { @@ -8142,9 +8146,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "find-up": { @@ -8153,7 +8157,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "graceful-fs": { @@ -8180,7 +8184,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -8189,8 +8193,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -8199,9 +8203,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "slash": { @@ -8216,8 +8220,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -8226,7 +8230,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "strip-bom": { @@ -8241,7 +8245,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "yargs": { @@ -8250,18 +8254,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } } } @@ -8278,18 +8282,18 @@ "integrity": "sha512-8Xk5O4p+JsZZn4RCNUS3pxA+ORKpEKepE+a5ejIKrId9CwrVN0NY+vkqEkXqlstA5NMBkNahXkR/4qEBy0t5yA==", "dev": true, "requires": { - "@babel/types": "7.4.0", - "@jest/types": "24.7.0", - "chalk": "2.4.2", - "expect": "24.7.1", - "jest-diff": "24.7.0", - "jest-matcher-utils": "24.7.0", - "jest-message-util": "24.7.1", - "jest-resolve": "24.7.1", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "pretty-format": "24.7.0", - "semver": "5.7.0" + "@babel/types": "^7.0.0", + "@jest/types": "^24.7.0", + "chalk": "^2.0.1", + "expect": "^24.7.1", + "jest-diff": "^24.7.0", + "jest-matcher-utils": "^24.7.0", + "jest-message-util": "^24.7.1", + "jest-resolve": "^24.7.1", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "pretty-format": "^24.7.0", + "semver": "^5.5.0" }, "dependencies": { "ansi-styles": { @@ -8298,7 +8302,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8307,9 +8311,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "semver": { @@ -8324,7 +8328,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8335,18 +8339,18 @@ "integrity": "sha512-/KilOue2n2rZ5AnEBYoxOXkeTu6vi7cjgQ8MXEkih0oeAXT6JkS3fr7/j8+engCjciOU1Nq5loMSKe0A1oeX0A==", "dev": true, "requires": { - "@jest/console": "24.7.1", - "@jest/fake-timers": "24.7.1", - "@jest/source-map": "24.3.0", - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "callsites": "3.1.0", - "chalk": "2.4.2", - "graceful-fs": "4.1.15", - "is-ci": "2.0.0", - "mkdirp": "0.5.1", - "slash": "2.0.0", - "source-map": "0.6.1" + "@jest/console": "^24.7.1", + "@jest/fake-timers": "^24.7.1", + "@jest/source-map": "^24.3.0", + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "callsites": "^3.0.0", + "chalk": "^2.0.1", + "graceful-fs": "^4.1.15", + "is-ci": "^2.0.0", + "mkdirp": "^0.5.1", + "slash": "^2.0.0", + "source-map": "^0.6.0" }, "dependencies": { "ansi-styles": { @@ -8355,7 +8359,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8364,9 +8368,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "graceful-fs": { @@ -8387,7 +8391,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8398,12 +8402,12 @@ "integrity": "sha512-cgai/gts9B2chz1rqVdmLhzYxQbgQurh1PEQSvSgPZ8KGa1AqXsqC45W5wKEwzxKrWqypuQrQxnF4+G9VejJJA==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "camelcase": "5.3.1", - "chalk": "2.4.2", - "jest-get-type": "24.3.0", - "leven": "2.1.0", - "pretty-format": "24.7.0" + "@jest/types": "^24.7.0", + "camelcase": "^5.0.0", + "chalk": "^2.0.1", + "jest-get-type": "^24.3.0", + "leven": "^2.1.0", + "pretty-format": "^24.7.0" }, "dependencies": { "ansi-styles": { @@ -8412,7 +8416,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "camelcase": { @@ -8427,9 +8431,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -8438,7 +8442,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8449,13 +8453,13 @@ "integrity": "sha512-Wd6TepHLRHVKLNPacEsBwlp9raeBIO+01xrN24Dek4ggTS8HHnOzYSFnvp+6MtkkJ3KfMzy220KTi95e2rRkrw==", "dev": true, "requires": { - "@jest/test-result": "24.7.1", - "@jest/types": "24.7.0", - "@types/yargs": "12.0.12", - "ansi-escapes": "3.2.0", - "chalk": "2.4.2", - "jest-util": "24.7.1", - "string-length": "2.0.0" + "@jest/test-result": "^24.7.1", + "@jest/types": "^24.7.0", + "@types/yargs": "^12.0.9", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "jest-util": "^24.7.1", + "string-length": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -8464,7 +8468,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8473,9 +8477,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { @@ -8484,7 +8488,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8495,8 +8499,8 @@ "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==", "dev": true, "requires": { - "merge-stream": "1.0.1", - "supports-color": "6.1.0" + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" }, "dependencies": { "supports-color": { @@ -8505,7 +8509,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8515,9 +8519,9 @@ "resolved": "https://registry.npmjs.org/joi/-/joi-13.6.0.tgz", "integrity": "sha512-E4QB0yRgEa6ZZKcSHJuBC+QeAwy+akCG0Bsa9edLqljyhlr+GuGDSmXYW1q7sj/FuAPy+ECUI3evVtK52tVfwg==", "requires": { - "hoek": "5.0.4", - "isemail": "3.1.3", - "topo": "3.0.0" + "hoek": "5.x.x", + "isemail": "3.x.x", + "topo": "3.x.x" }, "dependencies": { "hoek": { @@ -8527,11 +8531,6 @@ } } }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -8543,8 +8542,8 @@ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -8559,32 +8558,32 @@ "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==", "dev": true, "requires": { - "abab": "2.0.0", - "acorn": "5.7.3", - "acorn-globals": "4.3.1", - "array-equal": "1.0.0", - "cssom": "0.3.6", - "cssstyle": "1.2.2", - "data-urls": "1.1.0", - "domexception": "1.0.1", - "escodegen": "1.11.1", - "html-encoding-sniffer": "1.0.2", - "left-pad": "1.3.0", - "nwsapi": "2.1.3", + "abab": "^2.0.0", + "acorn": "^5.5.3", + "acorn-globals": "^4.1.0", + "array-equal": "^1.0.0", + "cssom": ">= 0.3.2 < 0.4.0", + "cssstyle": "^1.0.0", + "data-urls": "^1.0.0", + "domexception": "^1.0.1", + "escodegen": "^1.9.1", + "html-encoding-sniffer": "^1.0.2", + "left-pad": "^1.3.0", + "nwsapi": "^2.0.7", "parse5": "4.0.0", - "pn": "1.1.0", - "request": "2.88.0", - "request-promise-native": "1.0.7", - "sax": "1.2.4", - "symbol-tree": "3.2.2", - "tough-cookie": "2.4.3", - "w3c-hr-time": "1.0.1", - "webidl-conversions": "4.0.2", - "whatwg-encoding": "1.0.5", - "whatwg-mimetype": "2.3.0", - "whatwg-url": "6.5.0", - "ws": "5.2.2", - "xml-name-validator": "3.0.0" + "pn": "^1.1.0", + "request": "^2.87.0", + "request-promise-native": "^1.0.5", + "sax": "^1.2.4", + "symbol-tree": "^3.2.2", + "tough-cookie": "^2.3.4", + "w3c-hr-time": "^1.0.1", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.3", + "whatwg-mimetype": "^2.1.0", + "whatwg-url": "^6.4.1", + "ws": "^5.2.0", + "xml-name-validator": "^3.0.0" } }, "jsesc": { @@ -8614,7 +8613,7 @@ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -8628,7 +8627,7 @@ "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", "dev": true, "requires": { - "minimist": "1.2.0" + "minimist": "^1.2.0" }, "dependencies": { "minimist": { @@ -8645,7 +8644,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsonify": { @@ -8682,7 +8681,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "kleur": { @@ -8697,7 +8696,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.5" } }, "lcid": { @@ -8706,7 +8705,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "left-pad": { @@ -8727,8 +8726,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -8737,10 +8736,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" }, "dependencies": { "strip-bom": { @@ -8757,8 +8756,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "p-locate": { @@ -8767,7 +8766,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } } } @@ -8821,9 +8820,9 @@ "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, "lodash.sortby": { @@ -8838,8 +8837,8 @@ "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.1.0" + "lodash._reinterpolate": "~3.0.0", + "lodash.templatesettings": "^4.0.0" } }, "lodash.templatesettings": { @@ -8848,7 +8847,7 @@ "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0" + "lodash._reinterpolate": "~3.0.0" } }, "loglevel": { @@ -8861,7 +8860,7 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { - "js-tokens": "4.0.0" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "lottie-web": { @@ -8875,8 +8874,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "make-dir": { @@ -8885,7 +8884,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "make-error": { @@ -8900,7 +8899,7 @@ "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", "dev": true, "requires": { - "tmpl": "1.0.4" + "tmpl": "1.0.x" } }, "map-age-cleaner": { @@ -8909,7 +8908,7 @@ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "map-cache": { @@ -8930,7 +8929,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "marked": { @@ -8956,9 +8955,9 @@ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, "requires": { - "map-age-cleaner": "0.1.3", - "mimic-fn": "2.1.0", - "p-is-promise": "2.1.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" }, "dependencies": { "mimic-fn": { @@ -8975,15 +8974,15 @@ "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==", "dev": true, "requires": { - "camelcase-keys": "4.2.0", - "decamelize-keys": "1.1.0", - "loud-rejection": "1.6.0", - "minimist": "1.2.0", - "minimist-options": "3.0.2", - "normalize-package-data": "2.4.0", - "read-pkg-up": "3.0.0", - "redent": "2.0.0", - "trim-newlines": "2.0.0" + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist": "^1.1.3", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0" }, "dependencies": { "minimist": { @@ -8998,8 +8997,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "3.0.0" + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" } } } @@ -9010,7 +9009,7 @@ "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "meteor-node-stubs": { @@ -9018,28 +9017,28 @@ "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz", "integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==", "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.1.4", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", + "assert": "^1.4.1", + "browserify-zlib": "^0.1.4", + "buffer": "^4.9.1", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.7", + "events": "^1.1.1", "https-browserify": "0.0.1", - "os-browserify": "0.2.1", + "os-browserify": "^0.2.1", "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12", - "stream-browserify": "2.0.1", - "stream-http": "2.8.0", - "string_decoder": "1.1.0", - "timers-browserify": "1.4.2", + "process": "^0.11.9", + "punycode": "^1.4.1", + "querystring-es3": "^0.2.1", + "readable-stream": "git+https://github.com/meteor/readable-stream.git", + "stream-browserify": "^2.0.1", + "stream-http": "^2.8.0", + "string_decoder": "^1.1.0", + "timers-browserify": "^1.4.2", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", + "url": "^0.11.0", + "util": "^0.10.3", "vm-browserify": "0.0.4" }, "dependencies": { @@ -9048,9 +9047,9 @@ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.1", - "minimalistic-assert": "1.0.0" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "assert": { @@ -9081,7 +9080,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -9095,12 +9094,12 @@ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.1", - "safe-buffer": "5.1.1" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -9108,9 +9107,9 @@ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", "requires": { - "browserify-aes": "1.1.1", - "browserify-des": "1.0.0", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -9118,9 +9117,9 @@ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.1" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1" } }, "browserify-rsa": { @@ -9128,8 +9127,8 @@ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "requires": { - "bn.js": "4.11.8", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" } }, "browserify-sign": { @@ -9137,13 +9136,13 @@ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "elliptic": "6.4.0", - "inherits": "2.0.1", - "parse-asn1": "5.1.0" + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" } }, "browserify-zlib": { @@ -9151,7 +9150,7 @@ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", "requires": { - "pako": "0.2.9" + "pako": "~0.2.0" } }, "buffer": { @@ -9159,9 +9158,9 @@ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "requires": { - "base64-js": "1.2.3", - "ieee754": "1.1.8", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "buffer-xor": { @@ -9179,8 +9178,8 @@ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "requires": { - "inherits": "2.0.1", - "safe-buffer": "5.1.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "concat-map": { @@ -9193,7 +9192,7 @@ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "requires": { - "date-now": "0.1.4" + "date-now": "^0.1.4" } }, "constants-browserify": { @@ -9206,8 +9205,8 @@ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.0" + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" } }, "create-hash": { @@ -9215,10 +9214,10 @@ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.1", - "ripemd160": "2.0.1", - "sha.js": "2.4.10" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -9226,12 +9225,12 @@ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "inherits": "2.0.1", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.10" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "crypto-browserify": { @@ -9239,17 +9238,17 @@ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "requires": { - "browserify-cipher": "1.0.0", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.0", - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "diffie-hellman": "5.0.2", - "inherits": "2.0.1", - "pbkdf2": "3.0.14", - "public-encrypt": "4.0.0", - "randombytes": "2.0.6", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "date-now": { @@ -9262,8 +9261,8 @@ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "requires": { - "inherits": "2.0.1", - "minimalistic-assert": "1.0.0" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "diffie-hellman": { @@ -9271,9 +9270,9 @@ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" } }, "domain-browser": { @@ -9286,13 +9285,13 @@ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.3", - "hmac-drbg": "1.0.1", - "inherits": "2.0.1", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" } }, "events": { @@ -9305,8 +9304,8 @@ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "requires": { - "md5.js": "1.3.4", - "safe-buffer": "5.1.1" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "fs.realpath": { @@ -9319,12 +9318,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.1", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "hash-base": { @@ -9332,7 +9331,7 @@ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", "requires": { - "inherits": "2.0.1" + "inherits": "^2.0.1" } }, "hash.js": { @@ -9340,8 +9339,8 @@ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.0" }, "dependencies": { "inherits": { @@ -9356,9 +9355,9 @@ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "requires": { - "hash.js": "1.1.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "https-browserify": { @@ -9381,8 +9380,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -9400,8 +9399,8 @@ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.1" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" }, "dependencies": { "hash-base": { @@ -9409,8 +9408,8 @@ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "requires": { - "inherits": "2.0.1", - "safe-buffer": "5.1.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } } } @@ -9420,8 +9419,8 @@ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" } }, "minimalistic-assert": { @@ -9439,7 +9438,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "once": { @@ -9447,7 +9446,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-browserify": { @@ -9465,11 +9464,11 @@ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.1.1", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.14" + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3" } }, "path-browserify": { @@ -9487,11 +9486,11 @@ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", "requires": { - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.10" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "process": { @@ -9499,21 +9498,16 @@ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, "public-encrypt": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.1.3", - "parse-asn1": "5.1.0", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1" } }, "punycode": { @@ -9536,7 +9530,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -9544,19 +9538,20 @@ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "requires": { - "randombytes": "2.0.6", - "safe-buffer": "5.1.1" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "readable-stream": { "version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12", - "requires": { - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.0", - "util-deprecate": "1.0.2" + "from": "git+https://github.com/meteor/readable-stream.git", + "requires": { + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.0", + "util-deprecate": "~1.0.1" }, "dependencies": { "inherits": { @@ -9571,7 +9566,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "ripemd160": { @@ -9579,8 +9574,8 @@ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", "requires": { - "hash-base": "2.0.2", - "inherits": "2.0.1" + "hash-base": "^2.0.0", + "inherits": "^2.0.1" } }, "safe-buffer": { @@ -9593,8 +9588,8 @@ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz", "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==", "requires": { - "inherits": "2.0.1", - "safe-buffer": "5.1.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "stream-browserify": { @@ -9602,8 +9597,8 @@ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "requires": { - "inherits": "2.0.1", - "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-http": { @@ -9611,11 +9606,11 @@ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz", "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==", "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.1", - "readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.3", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "string_decoder": { @@ -9623,7 +9618,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz", "integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "timers-browserify": { @@ -9631,7 +9626,7 @@ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=", "requires": { - "process": "0.11.10" + "process": "~0.11.0" } }, "to-arraybuffer": { @@ -9668,11 +9663,6 @@ "inherits": "2.0.1" } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", @@ -9705,19 +9695,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" }, "dependencies": { "is-extglob": { @@ -9732,7 +9722,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -9752,7 +9742,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", "requires": { - "mime-db": "1.36.0" + "mime-db": "~1.36.0" } }, "minimatch": { @@ -9761,7 +9751,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -9776,8 +9766,8 @@ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", "dev": true, "requires": { - "arrify": "1.0.1", - "is-plain-obj": "1.1.0" + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" } }, "mixin-deep": { @@ -9786,8 +9776,8 @@ "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -9796,7 +9786,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -9826,12 +9816,12 @@ "resolved": "https://registry.npmjs.org/mos-connection/-/mos-connection-0.7.0.tgz", "integrity": "sha512-TKrTF1PUyE/Yai/4noA6jXOv/X0i2cG8jySgi+6n/zYrcdfBQQjCMHTHMsDAZmc7fNDWs4EFO0oqHqQd+gjFgA==", "requires": { - "@types/xmlbuilder": "0.0.34", - "iconv-lite": "0.4.24", - "moment": "2.22.2", - "tslib": "1.9.3", - "xml-js": "1.6.11", - "xmlbuilder": "10.1.1" + "@types/xmlbuilder": "^0.0.34", + "iconv-lite": "^0.4.24", + "moment": "^2.22.2", + "tslib": "^1.9.3", + "xml-js": "^1.6.8", + "xmlbuilder": "^10.1.1" }, "dependencies": { "iconv-lite": { @@ -9839,7 +9829,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } } } @@ -9865,17 +9855,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "arr-diff": { @@ -9896,8 +9886,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, "is-extendable": { @@ -9906,7 +9896,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } }, "kind-of": { @@ -9938,7 +9928,7 @@ "archy": "1.0.0", "commander": "2.9.0", "compare-versions": "3.0.0", - "glob-all": "3.1.0", + "glob-all": "3.1.0 ", "read-installed": "4.0.3" }, "dependencies": { @@ -9948,7 +9938,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } } } @@ -9958,8 +9948,8 @@ "resolved": "https://registry.npmjs.org/node-expat/-/node-expat-2.3.17.tgz", "integrity": "sha512-mNTxY/GMiZGayqdKZXyf6lJR7OM1JqyL0EISjE4XF7Ov7+X4zJjmlnfxCi6Gml90IEOyiYBcyJg9MHDsDp6YHw==", "requires": { - "bindings": "1.3.0", - "nan": "2.11.0" + "bindings": "^1.2.1", + "nan": "^2.10.0" } }, "node-fetch": { @@ -9967,8 +9957,8 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" } }, "node-gettext": { @@ -9977,7 +9967,7 @@ "integrity": "sha1-8dwSN83FRvUVk9o0AwS4vrpbhSU=", "dev": true, "requires": { - "lodash.get": "4.4.2" + "lodash.get": "^4.4.2" } }, "node-int64": { @@ -9992,12 +9982,12 @@ "integrity": "sha1-xJ0zmcy2CHYFpEZOlxbYJCo29FQ=", "dev": true, "requires": { - "nlf": "1.4.3", - "npm-package-arg": "4.2.1", - "semver": "4.3.6", - "spdx-expression-validate": "1.0.2", - "spdx-satisfies": "0.1.3", - "yargs": "3.32.0" + "nlf": "^1.4.2", + "npm-package-arg": "^4.2.0", + "semver": "^4.3.6", + "spdx-expression-validate": "^1.0.1", + "spdx-satisfies": "^0.1.3", + "yargs": "^3.32.0" }, "dependencies": { "semver": { @@ -10020,11 +10010,11 @@ "integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==", "dev": true, "requires": { - "growly": "1.3.0", - "is-wsl": "1.1.0", - "semver": "5.7.0", - "shellwords": "0.1.1", - "which": "1.3.1" + "growly": "^1.3.0", + "is-wsl": "^1.1.0", + "semver": "^5.5.0", + "shellwords": "^0.1.1", + "which": "^1.3.0" }, "dependencies": { "semver": { @@ -10041,10 +10031,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "is-builtin-module": "1.0.0", - "semver": "5.7.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" }, "dependencies": { "semver": { @@ -10061,7 +10051,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "npm-package-arg": { @@ -10070,8 +10060,8 @@ "integrity": "sha1-WTMD/eqF98Qid18X+et2cPaA4+w=", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "semver": "5.7.0" + "hosted-git-info": "^2.1.5", + "semver": "^5.1.0" }, "dependencies": { "semver": { @@ -10088,7 +10078,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "ntp-client": { @@ -10130,9 +10120,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -10141,7 +10131,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -10162,7 +10152,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" }, "dependencies": { "isobject": { @@ -10178,10 +10168,10 @@ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=", "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.12.0", - "function-bind": "1.1.1", - "has": "1.0.3" + "define-properties": "^1.1.2", + "es-abstract": "^1.6.1", + "function-bind": "^1.1.0", + "has": "^1.0.1" } }, "object.getownpropertydescriptors": { @@ -10189,8 +10179,8 @@ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.12.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.5.1" } }, "object.omit": { @@ -10199,8 +10189,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "object.pick": { @@ -10209,7 +10199,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" }, "dependencies": { "isobject": { @@ -10225,10 +10215,10 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz", "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=", "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.12.0", - "function-bind": "1.1.1", - "has": "1.0.3" + "define-properties": "^1.1.2", + "es-abstract": "^1.6.1", + "function-bind": "^1.1.0", + "has": "^1.0.1" } }, "on-finished": { @@ -10245,7 +10235,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "open": { @@ -10254,7 +10244,7 @@ "integrity": "sha512-Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "opn-cli": { @@ -10263,11 +10253,11 @@ "integrity": "sha512-nVJ9dVb4fEKtmACWxUql+hhQxVWMt7BSRT+6TnB85W3xs5Pgk9sKW3icYeCIwOtOKALBw/6WUCoNmI1+ADfAow==", "dev": true, "requires": { - "file-type": "10.11.0", - "get-stdin": "6.0.0", - "meow": "5.0.0", - "open": "6.1.0", - "temp-write": "3.4.0" + "file-type": "^10.10.0", + "get-stdin": "^6.0.0", + "meow": "^5.0.0", + "open": "^6.1.0", + "temp-write": "^3.4.0" }, "dependencies": { "camelcase": { @@ -10288,15 +10278,15 @@ "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", "dev": true, "requires": { - "camelcase-keys": "4.2.0", - "decamelize-keys": "1.1.0", - "loud-rejection": "1.6.0", - "minimist-options": "3.0.2", - "normalize-package-data": "2.4.0", - "read-pkg-up": "3.0.0", - "redent": "2.0.0", - "trim-newlines": "2.0.0", - "yargs-parser": "10.1.0" + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0", + "yargs-parser": "^10.0.0" } }, "read-pkg-up": { @@ -10305,8 +10295,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "3.0.0" + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" } }, "yargs-parser": { @@ -10315,7 +10305,7 @@ "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -10326,8 +10316,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "optionator": { @@ -10336,12 +10326,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -10358,8 +10348,8 @@ "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, "requires": { - "is-stream": "1.1.0", - "readable-stream": "2.3.6" + "is-stream": "^1.0.1", + "readable-stream": "^2.0.1" } }, "os-locale": { @@ -10368,7 +10358,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "p-cancelable": { @@ -10388,7 +10378,7 @@ "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=", "dev": true, "requires": { - "p-reduce": "1.0.0" + "p-reduce": "^1.0.0" } }, "p-finally": { @@ -10409,7 +10399,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -10418,7 +10408,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.2.0" + "p-limit": "^2.0.0" }, "dependencies": { "p-limit": { @@ -10427,7 +10417,7 @@ "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-try": { @@ -10454,7 +10444,7 @@ "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-2.0.0.tgz", "integrity": "sha512-ZbCuzAmiwJ45q4evp/IG9D+5MUllGSUeCWwPt3j/tdYSi1KPkSD+46uqmAA1LhccDhOXv8kYZKNb8x78VflzfA==", "requires": { - "retry": "0.12.0" + "retry": "^0.12.0" } }, "p-try": { @@ -10475,10 +10465,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -10493,7 +10483,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -10504,8 +10494,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "parse5": { @@ -10569,7 +10559,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "pathval": { @@ -10600,7 +10590,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pirates": { @@ -10609,7 +10599,7 @@ "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", "dev": true, "requires": { - "node-modules-regexp": "1.0.0" + "node-modules-regexp": "^1.0.0" } }, "pkg-dir": { @@ -10618,7 +10608,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" }, "dependencies": { "find-up": { @@ -10627,7 +10617,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -10636,8 +10626,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } } } @@ -10683,10 +10673,10 @@ "integrity": "sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==", "dev": true, "requires": { - "@jest/types": "24.7.0", - "ansi-regex": "4.1.0", - "ansi-styles": "3.2.1", - "react-is": "16.8.6" + "@jest/types": "^24.7.0", + "ansi-regex": "^4.0.0", + "ansi-styles": "^3.2.0", + "react-is": "^16.8.4" }, "dependencies": { "ansi-regex": { @@ -10701,7 +10691,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "react-is": { @@ -10733,7 +10723,7 @@ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "prompts": { @@ -10742,8 +10732,8 @@ "integrity": "sha512-HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA==", "dev": true, "requires": { - "kleur": "3.0.3", - "sisteransi": "1.0.0" + "kleur": "^3.0.2", + "sisteransi": "^1.0.0" } }, "prop-types": { @@ -10751,8 +10741,8 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", "requires": { - "loose-envify": "1.4.0", - "object-assign": "4.1.1" + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" } }, "prop-types-extra": { @@ -10760,8 +10750,8 @@ "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz", "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==", "requires": { - "react-is": "16.5.2", - "warning": "3.0.0" + "react-is": "^16.3.2", + "warning": "^3.0.0" } }, "psl": { @@ -10775,8 +10765,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "punycode": { @@ -10800,9 +10790,9 @@ "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.4.2.tgz", "integrity": "sha512-DfJqAen17LfLA3rQ+H5S4uXphrF+ANU1lT2ijds4V/Tj4gZxA3gx5/tg1bz7kYCmwna7LyJNCYqO7jNRzo3aLw==", "requires": { - "decode-uri-component": "0.2.0", - "split-on-first": "1.0.0", - "strict-uri-encode": "2.0.0" + "decode-uri-component": "^0.2.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" } }, "querystringify": { @@ -10821,7 +10811,7 @@ "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==", "requires": { - "performance-now": "2.1.0" + "performance-now": "^2.1.0" } }, "randomatic": { @@ -10830,9 +10820,9 @@ "integrity": "sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -10870,10 +10860,10 @@ "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-2.4.3.tgz", "integrity": "sha512-h5KgyB5IXYR7iKpYFcMr54cuQ2eozPCZ11kbXPG5+6CWvmyJ+c0R/yjndVndiNk2G3MKcTMbJNdDv5DIckLAxQ==", "requires": { - "babel-runtime": "6.26.0", - "dom-align": "1.8.0", - "prop-types": "15.6.2", - "rc-util": "4.6.0" + "babel-runtime": "^6.26.0", + "dom-align": "^1.7.0", + "prop-types": "^15.5.8", + "rc-util": "^4.0.4" } }, "rc-animate": { @@ -10881,12 +10871,12 @@ "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.5.4.tgz", "integrity": "sha512-aYisNYRuOvH+r5/nxEHHUzk1celxPg4nMUOuBGHd77c6NZbZ5fcjHFgWF3/nPdRPbLaqY4Z7Q317EcLO41fOvQ==", "requires": { - "babel-runtime": "6.26.0", - "classnames": "2.2.6", - "css-animation": "1.4.1", - "prop-types": "15.6.2", - "raf": "3.4.0", - "react-lifecycles-compat": "3.0.4" + "babel-runtime": "6.x", + "classnames": "^2.2.6", + "css-animation": "^1.3.2", + "prop-types": "15.x", + "raf": "^3.4.0", + "react-lifecycles-compat": "^3.0.4" } }, "rc-tooltip": { @@ -10894,9 +10884,9 @@ "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz", "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==", "requires": { - "babel-runtime": "6.26.0", - "prop-types": "15.6.2", - "rc-trigger": "2.6.2" + "babel-runtime": "6.x", + "prop-types": "^15.5.8", + "rc-trigger": "^2.2.2" } }, "rc-trigger": { @@ -10904,12 +10894,12 @@ "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-2.6.2.tgz", "integrity": "sha512-op4xCu95/gdHVaysyxxiYxbY+Z+UcIBSUY9nQfLqm1FlitdtnAN+owD5iMPfnnsRXntgcQ5+RdYKNUFQT5DjzA==", "requires": { - "babel-runtime": "6.26.0", - "classnames": "2.2.6", - "prop-types": "15.6.2", - "rc-align": "2.4.3", - "rc-animate": "2.5.4", - "rc-util": "4.6.0" + "babel-runtime": "6.x", + "classnames": "^2.2.6", + "prop-types": "15.x", + "rc-align": "^2.4.0", + "rc-animate": "2.x", + "rc-util": "^4.4.0" } }, "rc-util": { @@ -10917,10 +10907,10 @@ "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.6.0.tgz", "integrity": "sha512-rbgrzm1/i8mgfwOI4t1CwWK7wGe+OwX+dNa7PVMgxZYPBADGh86eD4OcJO1UKGeajIMDUUKMluaZxvgraQIOmw==", "requires": { - "add-dom-event-listener": "1.1.0", - "babel-runtime": "6.26.0", - "prop-types": "15.6.2", - "shallowequal": "0.2.2" + "add-dom-event-listener": "^1.1.0", + "babel-runtime": "6.x", + "prop-types": "^15.5.10", + "shallowequal": "^0.2.2" } }, "react": { @@ -10928,10 +10918,10 @@ "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz", "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==", "requires": { - "loose-envify": "1.4.0", - "object-assign": "4.1.1", - "prop-types": "15.6.2", - "schedule": "0.5.0" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "schedule": "^0.5.0" } }, "react-bootstrap": { @@ -10939,18 +10929,18 @@ "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.4.tgz", "integrity": "sha512-xj+JfaPOvnvr3ow0aHC7Y3HaBKZNR1mm361hVxVzVX3fcdJNIrfiodbQ0m9nLBpNxiKG6FTU2lq/SbTDYT2vew==", "requires": { - "@babel/runtime-corejs2": "7.0.0", - "classnames": "2.2.6", - "dom-helpers": "3.3.1", - "invariant": "2.2.4", - "keycode": "2.2.0", - "prop-types": "15.6.2", - "prop-types-extra": "1.1.0", - "react-overlays": "0.8.3", - "react-prop-types": "0.4.0", - "react-transition-group": "2.4.0", - "uncontrollable": "5.1.0", - "warning": "3.0.0" + "@babel/runtime-corejs2": "^7.0.0", + "classnames": "^2.2.5", + "dom-helpers": "^3.2.0", + "invariant": "^2.2.4", + "keycode": "^2.2.0", + "prop-types": "^15.6.1", + "prop-types-extra": "^1.0.1", + "react-overlays": "^0.8.0", + "react-prop-types": "^0.4.0", + "react-transition-group": "^2.0.0", + "uncontrollable": "^5.0.0", + "warning": "^3.0.0" } }, "react-circular-progressbar": { @@ -10958,7 +10948,7 @@ "resolved": "https://registry.npmjs.org/react-circular-progressbar/-/react-circular-progressbar-1.0.0.tgz", "integrity": "sha512-6QOqwsYJCeFDPYTparTS3FdFGlSItafJWD8BloLG3k1sW8ZG7JGdHo7FQsqtGEIK0bldwTO9v+nD2nEYAU1OYg==", "requires": { - "prop-types": "15.6.2" + "prop-types": "^15.5.10" } }, "react-contextmenu": { @@ -10966,8 +10956,8 @@ "resolved": "https://registry.npmjs.org/react-contextmenu/-/react-contextmenu-2.9.3.tgz", "integrity": "sha512-KFufA4xbBLyJOcWtw6fpM3nW7GcnRIbP1iv7hzJi4Wt1SN7iV62okubjFOk7GOi6Nz3QHncHIcvtX4NRiqMbmA==", "requires": { - "classnames": "2.2.6", - "object-assign": "4.1.1" + "classnames": "^2.2.5", + "object-assign": "^4.1.0" } }, "react-datepicker": { @@ -10975,10 +10965,10 @@ "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-1.6.0.tgz", "integrity": "sha512-wfFfw3Tn+CCTtP7PPPhSAfkfVT3UTifFb8BmuhtwWKK3g4S83EEPRQE18XFtxd22dKGqp336NVtDTTyUJ1p9+g==", "requires": { - "classnames": "2.2.6", - "prop-types": "15.6.2", - "react-onclickoutside": "6.7.1", - "react-popper": "0.9.5" + "classnames": "^2.2.5", + "prop-types": "^15.6.0", + "react-onclickoutside": "^6.7.1", + "react-popper": "^0.9.1" } }, "react-dom": { @@ -10986,10 +10976,10 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.5.2.tgz", "integrity": "sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==", "requires": { - "loose-envify": "1.4.0", - "object-assign": "4.1.1", - "prop-types": "15.6.2", - "schedule": "0.5.0" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "schedule": "^0.5.0" } }, "react-escape": { @@ -10997,9 +10987,9 @@ "resolved": "https://registry.npmjs.org/react-escape/-/react-escape-0.0.8.tgz", "integrity": "sha1-ncFwCZ07gW66hTFm78wtNh4A8UA=", "requires": { - "babel-plugin-transform-class-properties": "6.24.1", - "babel-preset-env": "1.7.0", - "object-assign": "4.1.1" + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-preset-env": "^1.6.1", + "object-assign": "^4.0.1" } }, "react-hotkeys": { @@ -11007,10 +10997,10 @@ "resolved": "https://registry.npmjs.org/react-hotkeys/-/react-hotkeys-0.10.0.tgz", "integrity": "sha1-0eeL1j8W1ttY1VDTPI6wcfNdlPs=", "requires": { - "create-react-class": "15.6.3", - "lodash": "4.17.11", - "mousetrap": "1.6.2", - "prop-types": "15.6.2" + "create-react-class": "^15.5.2", + "lodash": "^4.13.1", + "mousetrap": "^1.5.2", + "prop-types": "^15.5.8" } }, "react-i18next": { @@ -11018,9 +11008,9 @@ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-7.13.0.tgz", "integrity": "sha512-35M+MZFPqHwVIas7tXWQKFrf+ozCJukNplUTiGqL8mczSk+VRBsHxxXuuQKRkz/4CcWkONGWbp/AzxfM6wZncg==", "requires": { - "hoist-non-react-statics": "2.5.5", + "hoist-non-react-statics": "^2.3.1", "html-parse-stringify2": "2.0.1", - "prop-types": "15.6.2" + "prop-types": "^15.6.0" } }, "react-is": { @@ -11038,8 +11028,8 @@ "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.3.tgz", "integrity": "sha512-qLCERxUr8M+4mm1LU0Ruxw5Y5Fn/OmYkGfnA+JDM/dZb3oKwVAJCjwnjkj9TMHtzR2U6sMEUD3ZZ1RaHagM7kA==", "requires": { - "babel-runtime": "6.26.0", - "lottie-web": "5.3.1" + "babel-runtime": "^6.26.0", + "lottie-web": "^5.1.3" } }, "react-moment": { @@ -11057,12 +11047,12 @@ "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.8.3.tgz", "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==", "requires": { - "classnames": "2.2.6", - "dom-helpers": "3.3.1", - "prop-types": "15.6.2", - "prop-types-extra": "1.1.0", - "react-transition-group": "2.4.0", - "warning": "3.0.0" + "classnames": "^2.2.5", + "dom-helpers": "^3.2.1", + "prop-types": "^15.5.10", + "prop-types-extra": "^1.0.1", + "react-transition-group": "^2.2.0", + "warning": "^3.0.0" } }, "react-popper": { @@ -11070,8 +11060,8 @@ "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.9.5.tgz", "integrity": "sha1-AqJO8+7DOvnlToNYq3DrDjMe3QU=", "requires": { - "popper.js": "1.14.4", - "prop-types": "15.6.2" + "popper.js": "^1.14.1", + "prop-types": "^15.6.1" } }, "react-prop-types": { @@ -11079,7 +11069,7 @@ "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz", "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=", "requires": { - "warning": "3.0.0" + "warning": "^3.0.0" } }, "react-router": { @@ -11087,13 +11077,13 @@ "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", "requires": { - "history": "4.7.2", - "hoist-non-react-statics": "2.5.5", - "invariant": "2.2.4", - "loose-envify": "1.4.0", - "path-to-regexp": "1.7.0", - "prop-types": "15.6.2", - "warning": "4.0.2" + "history": "^4.7.2", + "hoist-non-react-statics": "^2.5.0", + "invariant": "^2.2.4", + "loose-envify": "^1.3.1", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.1", + "warning": "^4.0.1" }, "dependencies": { "warning": { @@ -11101,7 +11091,7 @@ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } } } @@ -11111,12 +11101,12 @@ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz", "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==", "requires": { - "history": "4.7.2", - "invariant": "2.2.4", - "loose-envify": "1.4.0", - "prop-types": "15.6.2", - "react-router": "4.3.1", - "warning": "4.0.2" + "history": "^4.7.2", + "invariant": "^2.2.4", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.1", + "react-router": "^4.3.1", + "warning": "^4.0.1" }, "dependencies": { "warning": { @@ -11124,7 +11114,7 @@ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } } } @@ -11134,8 +11124,8 @@ "resolved": "https://registry.npmjs.org/react-timer-hoc/-/react-timer-hoc-2.3.0.tgz", "integrity": "sha512-kaN08l87U15IhiWlZ8d0cLqnHRgFT3GascKjCHMl6Ff1SK9cXJJQm4+n+aqOO0gAJXNimYY2nTN22HyiFegKQw==", "requires": { - "invariant": "2.2.4", - "prop-types": "15.6.2" + "invariant": "~2.2.2", + "prop-types": "^15.6.0" } }, "react-transition-group": { @@ -11143,10 +11133,10 @@ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz", "integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==", "requires": { - "dom-helpers": "3.3.1", - "loose-envify": "1.4.0", - "prop-types": "15.6.2", - "react-lifecycles-compat": "3.0.4" + "dom-helpers": "^3.3.1", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" } }, "read-installed": { @@ -11155,13 +11145,13 @@ "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", "dev": true, "requires": { - "debuglog": "1.0.1", - "graceful-fs": "4.1.11", - "read-package-json": "2.0.13", - "readdir-scoped-modules": "1.0.2", - "semver": "5.7.0", - "slide": "1.1.6", - "util-extend": "1.0.3" + "debuglog": "^1.0.1", + "graceful-fs": "^4.1.2", + "read-package-json": "^2.0.0", + "readdir-scoped-modules": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "slide": "~1.1.3", + "util-extend": "^1.0.1" }, "dependencies": { "semver": { @@ -11178,11 +11168,11 @@ "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==", "dev": true, "requires": { - "glob": "7.1.3", - "graceful-fs": "4.1.11", - "json-parse-better-errors": "1.0.2", - "normalize-package-data": "2.4.0", - "slash": "1.0.0" + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "json-parse-better-errors": "^1.0.1", + "normalize-package-data": "^2.0.0", + "slash": "^1.0.0" } }, "read-pkg": { @@ -11191,9 +11181,9 @@ "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "4.0.0", - "normalize-package-data": "2.4.0", - "path-type": "3.0.0" + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" } }, "read-pkg-up": { @@ -11202,8 +11192,8 @@ "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", "dev": true, "requires": { - "find-up": "3.0.0", - "read-pkg": "3.0.0" + "find-up": "^3.0.0", + "read-pkg": "^3.0.0" }, "dependencies": { "find-up": { @@ -11212,7 +11202,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "locate-path": { @@ -11221,8 +11211,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } } } @@ -11232,13 +11222,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" }, "dependencies": { "isarray": { @@ -11254,10 +11244,10 @@ "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=", "dev": true, "requires": { - "debuglog": "1.0.1", - "dezalgo": "1.0.3", - "graceful-fs": "4.1.11", - "once": "1.4.0" + "debuglog": "^1.0.1", + "dezalgo": "^1.0.0", + "graceful-fs": "^4.1.2", + "once": "^1.3.0" } }, "realpath-native": { @@ -11266,7 +11256,7 @@ "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==", "dev": true, "requires": { - "util.promisify": "1.0.0" + "util.promisify": "^1.0.0" } }, "rechoir": { @@ -11275,7 +11265,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.8.1" + "resolve": "^1.1.6" } }, "redent": { @@ -11284,8 +11274,8 @@ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", "dev": true, "requires": { - "indent-string": "3.2.0", - "strip-indent": "2.0.0" + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" } }, "regenerate": { @@ -11303,9 +11293,9 @@ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "private": "0.1.8" + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" } }, "regex-cache": { @@ -11314,7 +11304,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { @@ -11323,8 +11313,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" }, "dependencies": { "extend-shallow": { @@ -11333,8 +11323,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, "is-extendable": { @@ -11343,7 +11333,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -11353,9 +11343,9 @@ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -11368,7 +11358,7 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" } }, "remove-trailing-separator": { @@ -11395,7 +11385,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "replace-ext": { @@ -11409,26 +11399,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.8.0", - "caseless": "0.12.0", - "combined-stream": "1.0.7", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.1.0", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.20", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "request-promise-core": { @@ -11437,7 +11427,7 @@ "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.11" } }, "request-promise-native": { @@ -11447,8 +11437,8 @@ "dev": true, "requires": { "request-promise-core": "1.1.2", - "stealthy-require": "1.1.1", - "tough-cookie": "2.4.3" + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" } }, "require-directory": { @@ -11474,7 +11464,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.5" } }, "resolve-cwd": { @@ -11483,7 +11473,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -11520,7 +11510,7 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.3" } }, "rsvp": { @@ -11540,7 +11530,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -11553,7 +11543,7 @@ "resolved": "https://registry.npmjs.org/safer-eval/-/safer-eval-1.2.3.tgz", "integrity": "sha512-nDwXOhiheoaBT6op02n8wzsshjLXHhh4YAeqsDEoVmy1k2+lGv/ENLsGaWqkaKArUkUx48VO12/ZPa3sI/OEqQ==", "requires": { - "clones": "1.1.0" + "clones": "^1.1.0" } }, "sane": { @@ -11562,15 +11552,15 @@ "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==", "dev": true, "requires": { - "@cnakazawa/watch": "1.0.3", - "anymatch": "2.0.0", - "capture-exit": "2.0.0", - "exec-sh": "0.3.2", - "execa": "1.0.0", - "fb-watchman": "2.0.0", - "micromatch": "3.1.10", - "minimist": "1.2.0", - "walker": "1.0.7" + "@cnakazawa/watch": "^1.0.3", + "anymatch": "^2.0.0", + "capture-exit": "^2.0.0", + "exec-sh": "^0.3.2", + "execa": "^1.0.0", + "fb-watchman": "^2.0.0", + "micromatch": "^3.1.4", + "minimist": "^1.1.1", + "walker": "~1.0.5" }, "dependencies": { "arr-diff": { @@ -11591,16 +11581,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11609,7 +11599,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11620,13 +11610,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -11635,7 +11625,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11644,7 +11634,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -11653,7 +11643,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -11662,7 +11652,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11673,7 +11663,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -11682,7 +11672,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11693,9 +11683,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" } }, "kind-of": { @@ -11712,8 +11702,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -11722,7 +11712,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -11733,14 +11723,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -11749,7 +11739,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -11758,7 +11748,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11769,10 +11759,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -11781,7 +11771,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11792,7 +11782,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11801,7 +11791,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11810,9 +11800,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "is-number": { @@ -11821,7 +11811,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -11830,7 +11820,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11853,19 +11843,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "minimist": { @@ -11886,7 +11876,7 @@ "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.5.0.tgz", "integrity": "sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==", "requires": { - "object-assign": "4.1.1" + "object-assign": "^4.1.1" } }, "selectn": { @@ -11905,18 +11895,18 @@ "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.6.3", + "http-errors": "~1.6.2", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.0", + "statuses": "~1.4.0" }, "dependencies": { "statuses": { @@ -11931,9 +11921,9 @@ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.2", "send": "0.16.2" } }, @@ -11949,10 +11939,10 @@ "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" } }, "setimmediate": { @@ -11970,7 +11960,7 @@ "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz", "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=", "requires": { - "lodash.keys": "3.1.2" + "lodash.keys": "^3.1.2" } }, "shebang-command": { @@ -11979,7 +11969,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -11994,9 +11984,9 @@ "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", "dev": true, "requires": { - "glob": "7.1.3", - "interpret": "1.1.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "shellwords": { @@ -12035,14 +12025,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "define-property": { @@ -12051,7 +12041,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "source-map": { @@ -12068,9 +12058,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -12079,7 +12069,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -12088,7 +12078,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -12097,7 +12087,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -12106,9 +12096,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "isobject": { @@ -12131,7 +12121,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" } }, "soap": { @@ -12139,19 +12129,19 @@ "resolved": "https://registry.npmjs.org/soap/-/soap-0.24.0.tgz", "integrity": "sha512-1bGC2R+KKzC6pm8bbWZTvgryzwnGh4E4AjKnIgyClOpBpL20NcScbVXk0cg52WbueaQT0LDLDQVB1uo8sT8Mcw==", "requires": { - "bluebird": "3.5.2", - "concat-stream": "1.6.2", - "debug": "2.6.9", - "ejs": "2.5.9", - "finalhandler": "1.1.1", - "lodash": "4.17.11", - "request": "2.88.0", - "sax": "1.2.4", - "selectn": "0.9.6", - "serve-static": "1.13.2", - "strip-bom": "0.3.1", - "uuid": "3.3.2", - "xml-crypto": "0.8.5" + "bluebird": "^3.5.0", + "concat-stream": "^1.5.1", + "debug": "^2.6.9", + "ejs": "~2.5.5", + "finalhandler": "^1.0.3", + "lodash": "^4.17.5", + "request": ">=2.9.0", + "sax": ">=0.6", + "selectn": "^0.9.6", + "serve-static": "^1.11.1", + "strip-bom": "~0.3.1", + "uuid": "^3.1.0", + "xml-crypto": "~0.8.0" } }, "source-map": { @@ -12166,11 +12156,11 @@ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -12179,8 +12169,8 @@ "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "source-map-url": { @@ -12195,8 +12185,8 @@ "integrity": "sha1-sGrz6jSvdDfZGp9Enq8tLpPDyPs=", "dev": true, "requires": { - "spdx-expression-parse": "1.0.4", - "spdx-ranges": "1.0.1" + "spdx-expression-parse": "^1.0.0", + "spdx-ranges": "^1.0.0" }, "dependencies": { "spdx-expression-parse": { @@ -12213,8 +12203,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.1" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -12229,8 +12219,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.1" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-expression-validate": { @@ -12239,7 +12229,7 @@ "integrity": "sha1-Wk5NdhbtHJuIFQNmtCF/dnwn6eM=", "dev": true, "requires": { - "spdx-expression-parse": "1.0.4" + "spdx-expression-parse": "^1.0.0" }, "dependencies": { "spdx-expression-parse": { @@ -12268,8 +12258,8 @@ "integrity": "sha1-Z6HydOYRXUquKK/kdNt2FkvhC9w=", "dev": true, "requires": { - "spdx-compare": "0.1.2", - "spdx-expression-parse": "1.0.4" + "spdx-compare": "^0.1.2", + "spdx-expression-parse": "^1.0.0" }, "dependencies": { "spdx-expression-parse": { @@ -12286,7 +12276,7 @@ "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", "dev": true, "requires": { - "through": "2.3.8" + "through": "2" } }, "split-on-first": { @@ -12300,7 +12290,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" }, "dependencies": { "extend-shallow": { @@ -12309,8 +12299,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, "is-extendable": { @@ -12319,7 +12309,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -12330,7 +12320,7 @@ "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", "dev": true, "requires": { - "through2": "2.0.3" + "through2": "^2.0.2" } }, "sprintf-js": { @@ -12344,15 +12334,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "stack-trace": { @@ -12372,18 +12362,18 @@ "integrity": "sha512-vvdWZySinwWU9UZhtgYUGGTkYzqrwYMw3c7CFJ17E7vMbAEqVSui/bm+ZcSukAAU2WmphPTWIKFmn8ni+lk4NA==", "dev": true, "requires": { - "chalk": "2.4.2", - "conventional-changelog": "3.1.3", - "conventional-recommended-bump": "4.1.1", - "detect-indent": "5.0.0", - "detect-newline": "2.1.0", - "dotgitignore": "2.1.0", - "figures": "2.0.0", - "fs-access": "1.0.1", - "git-semver-tags": "2.0.2", - "semver": "5.7.0", - "stringify-package": "1.0.0", - "yargs": "12.0.5" + "chalk": "^2.4.1", + "conventional-changelog": "^3.0.6", + "conventional-recommended-bump": "^4.0.4", + "detect-indent": "^5.0.0", + "detect-newline": "^2.1.0", + "dotgitignore": "^2.1.0", + "figures": "^2.0.0", + "fs-access": "^1.0.0", + "git-semver-tags": "^2.0.2", + "semver": "^5.2.0", + "stringify-package": "^1.0.0", + "yargs": "^12.0.2" }, "dependencies": { "ansi-regex": { @@ -12398,7 +12388,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -12407,9 +12397,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cliui": { @@ -12418,9 +12408,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "find-up": { @@ -12429,7 +12419,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "invert-kv": { @@ -12450,7 +12440,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "2.0.0" + "invert-kv": "^2.0.0" } }, "locate-path": { @@ -12459,8 +12449,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "os-locale": { @@ -12469,9 +12459,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "1.0.0", - "lcid": "2.0.0", - "mem": "4.3.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "semver": { @@ -12486,8 +12476,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12496,7 +12486,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -12505,7 +12495,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "yargs": { @@ -12514,18 +12504,18 @@ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "11.1.1" + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" } } } @@ -12536,8 +12526,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -12546,7 +12536,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -12579,8 +12569,8 @@ "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", "dev": true, "requires": { - "astral-regex": "1.0.0", - "strip-ansi": "4.0.0" + "astral-regex": "^1.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -12595,7 +12585,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12606,9 +12596,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -12616,7 +12606,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "stringify-package": { @@ -12630,7 +12620,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -12638,8 +12628,8 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-0.3.1.tgz", "integrity": "sha1-noo57/RW/5q8LwWfXyIluw8/fKU=", "requires": { - "first-chunk-stream": "0.1.0", - "is-utf8": "0.2.1" + "first-chunk-stream": "^0.1.0", + "is-utf8": "^0.2.0" } }, "strip-bom-stream": { @@ -12648,8 +12638,8 @@ "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", "dev": true, "requires": { - "first-chunk-stream": "1.0.0", - "strip-bom": "2.0.0" + "first-chunk-stream": "^1.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "first-chunk-stream": { @@ -12664,7 +12654,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -12686,8 +12676,8 @@ "resolved": "https://registry.npmjs.org/superfly-timeline/-/superfly-timeline-6.0.3.tgz", "integrity": "sha512-1SGAXR2HMh2GM0D2CuN9lFgC1+7Z3zzh4PtEJSlsq8OLIL8SYu1tWpn1bT2Nq4P4FffnQnBGImQGKL3dfSDnhw==", "requires": { - "@types/underscore": "1.8.9", - "underscore": "1.9.1" + "@types/underscore": "^1.8.8", + "underscore": "^1.9.1" } }, "supports-color": { @@ -12713,12 +12703,12 @@ "integrity": "sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "is-stream": "1.1.0", - "make-dir": "1.3.0", - "pify": "3.0.0", - "temp-dir": "1.0.0", - "uuid": "3.3.2" + "graceful-fs": "^4.1.2", + "is-stream": "^1.1.0", + "make-dir": "^1.0.0", + "pify": "^3.0.0", + "temp-dir": "^1.0.0", + "uuid": "^3.0.1" } }, "test-exclude": { @@ -12727,10 +12717,10 @@ "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", "dev": true, "requires": { - "arrify": "1.0.1", - "minimatch": "3.0.4", - "read-pkg-up": "4.0.0", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "minimatch": "^3.0.4", + "read-pkg-up": "^4.0.0", + "require-main-filename": "^1.0.1" } }, "text-extensions": { @@ -12757,8 +12747,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "through2-filter": { @@ -12767,8 +12757,8 @@ "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "dev": true, "requires": { - "through2": "2.0.3", - "xtend": "4.0.1" + "through2": "~2.0.0", + "xtend": "~4.0.0" } }, "timecode": { @@ -12781,7 +12771,7 @@ "resolved": "https://registry.npmjs.org/timeline-state-resolver-types/-/timeline-state-resolver-types-2.1.0.tgz", "integrity": "sha512-1atRDzgB49w0TE+hpZVxHwZOMCMwB1jV6IJlUkmV/ni6iQLgTSBzN6xvHxgZAZNRY7nbLTmR6938hYOAJ8S0JQ==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.3" } }, "tmpl": { @@ -12796,7 +12786,7 @@ "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", "dev": true, "requires": { - "extend-shallow": "2.0.1" + "extend-shallow": "^2.0.1" } }, "to-fast-properties": { @@ -12810,7 +12800,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "to-regex": { @@ -12819,10 +12809,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" }, "dependencies": { "extend-shallow": { @@ -12831,8 +12821,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, "is-extendable": { @@ -12841,7 +12831,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -12852,8 +12842,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" }, "dependencies": { "is-number": { @@ -12862,7 +12852,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } } } @@ -12872,7 +12862,7 @@ "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.0.tgz", "integrity": "sha512-Tlu1fGlR90iCdIPURqPiufqAlCZYzLjHYVVbcFWDMcX7+tK8hdZWAfsMrD/pBul9jqHHwFjNdf1WaxA9vTRRhw==", "requires": { - "hoek": "5.0.4" + "hoek": "5.x.x" }, "dependencies": { "hoek": { @@ -12887,8 +12877,8 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { - "psl": "1.1.29", - "punycode": "1.4.1" + "psl": "^1.1.24", + "punycode": "^1.4.1" }, "dependencies": { "punycode": { @@ -12904,7 +12894,7 @@ "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "trim-newlines": { @@ -12931,15 +12921,15 @@ "integrity": "sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==", "dev": true, "requires": { - "bs-logger": "0.2.6", - "buffer-from": "1.1.1", - "fast-json-stable-stringify": "2.0.0", - "json5": "2.1.0", - "make-error": "1.3.5", - "mkdirp": "0.5.1", - "resolve": "1.8.1", - "semver": "5.7.0", - "yargs-parser": "10.1.0" + "bs-logger": "0.x", + "buffer-from": "1.x", + "fast-json-stable-stringify": "2.x", + "json5": "2.x", + "make-error": "1.x", + "mkdirp": "0.x", + "resolve": "1.x", + "semver": "^5.5", + "yargs-parser": "10.x" }, "dependencies": { "camelcase": { @@ -12960,7 +12950,7 @@ "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -12976,19 +12966,19 @@ "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "builtin-modules": "1.1.1", - "chalk": "2.4.2", - "commander": "2.18.0", - "diff": "3.5.0", - "glob": "7.1.3", - "js-yaml": "3.13.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "resolve": "1.8.1", - "semver": "5.7.0", - "tslib": "1.9.3", - "tsutils": "2.29.0" + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.13.0", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" }, "dependencies": { "ansi-styles": { @@ -12997,7 +12987,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -13006,9 +12996,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "semver": { @@ -13023,7 +13013,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -13034,7 +13024,7 @@ "integrity": "sha512-OWG+NblgjQlVuUS/Dmq3ax2v5QDZwRx4L0kEuDi7qFY9UI6RJhhNfoCV1qI4el8Fw1c5a5BTrjQJP0/jhGXY/Q==", "dev": true, "requires": { - "tslint-eslint-rules": "5.4.0" + "tslint-eslint-rules": "^5.3.1" } }, "tslint-eslint-rules": { @@ -13045,7 +13035,7 @@ "requires": { "doctrine": "0.7.2", "tslib": "1.9.0", - "tsutils": "3.10.0" + "tsutils": "^3.0.0" }, "dependencies": { "tslib": { @@ -13060,7 +13050,7 @@ "integrity": "sha512-q20XSMq7jutbGB8luhKKsQldRKWvyBO2BGqni3p4yq8Ys9bEP/xQw3KepKmMRt9gJ4lvQSScrihJrcKdKoSU7Q==", "dev": true, "requires": { - "tslib": "1.9.0" + "tslib": "^1.8.1" } } } @@ -13071,7 +13061,7 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "tslib": "1.9.3" + "tslib": "^1.8.1" } }, "tunnel-agent": { @@ -13079,7 +13069,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tv-automation-sofie-blueprints-integration": { @@ -13087,9 +13077,9 @@ "resolved": "https://registry.npmjs.org/tv-automation-sofie-blueprints-integration/-/tv-automation-sofie-blueprints-integration-0.21.0.tgz", "integrity": "sha512-3J8/XWxu7aF7F/Ng5j8HY/UXXh2WSvhupxkcS2ZGXsbh5n9A+meCvNU+pTM6mfPqkIgR+JxAbLy2Fog0vKaYNg==", "requires": { - "moment": "2.22.2", - "tslib": "1.9.3", - "underscore": "1.9.1" + "moment": "^2.22.2", + "tslib": "^1.9.3", + "underscore": "^1.9.1" } }, "tweetnacl": { @@ -13104,7 +13094,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-detect": { @@ -13118,7 +13108,7 @@ "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.20" + "mime-types": "~2.1.18" } }, "typedarray": { @@ -13132,22 +13122,22 @@ "integrity": "sha1-1xcrxqKZZPRRt2CcAFvq2t7+I2E=", "dev": true, "requires": { - "@types/fs-extra": "4.0.8", - "@types/handlebars": "4.0.39", - "@types/highlight.js": "9.12.3", - "@types/lodash": "4.14.116", + "@types/fs-extra": "^4.0.0", + "@types/handlebars": "^4.0.31", + "@types/highlight.js": "^9.1.8", + "@types/lodash": "^4.14.37", "@types/marked": "0.0.28", - "@types/minimatch": "2.0.29", - "@types/shelljs": "0.7.9", - "fs-extra": "4.0.3", - "handlebars": "4.1.0", - "highlight.js": "9.12.0", - "lodash": "4.17.11", - "marked": "0.3.19", - "minimatch": "3.0.4", - "progress": "2.0.0", - "shelljs": "0.7.8", - "typedoc-default-themes": "0.5.0", + "@types/minimatch": "^2.0.29", + "@types/shelljs": "^0.7.0", + "fs-extra": "^4.0.0", + "handlebars": "^4.0.6", + "highlight.js": "^9.0.0", + "lodash": "^4.13.1", + "marked": "^0.3.5", + "minimatch": "^3.0.0", + "progress": "^2.0.0", + "shelljs": "^0.7.0", + "typedoc-default-themes": "^0.5.0", "typescript": "2.4.1" }, "dependencies": { @@ -13183,8 +13173,8 @@ "dev": true, "optional": true, "requires": { - "commander": "2.17.1", - "source-map": "0.6.1" + "commander": "~2.17.1", + "source-map": "~0.6.1" }, "dependencies": { "commander": { @@ -13201,7 +13191,7 @@ "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-5.1.0.tgz", "integrity": "sha512-5FXYaFANKaafg4IVZXUNtGyzsnYEvqlr9wQ3WpZxFpEUxl29A3H6Q4G1Dnnorvq9TGOGATBApWR4YpLAh+F5hw==", "requires": { - "invariant": "2.2.4" + "invariant": "^2.2.4" } }, "underscore": { @@ -13215,10 +13205,10 @@ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "set-value": { @@ -13227,10 +13217,10 @@ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -13241,8 +13231,8 @@ "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "dev": true, "requires": { - "json-stable-stringify": "1.0.1", - "through2-filter": "2.0.0" + "json-stable-stringify": "^1.0.0", + "through2-filter": "^2.0.0" } }, "universalify": { @@ -13262,8 +13252,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -13272,9 +13262,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -13319,8 +13309,8 @@ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz", "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==", "requires": { - "querystringify": "2.1.0", - "requires-port": "1.0.0" + "querystringify": "^2.0.0", + "requires-port": "^1.0.0" } }, "use": { @@ -13346,8 +13336,8 @@ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "object.getownpropertydescriptors": "2.0.3" + "define-properties": "^1.1.2", + "object.getownpropertydescriptors": "^2.0.3" } }, "uuid": { @@ -13367,8 +13357,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "value-equal": { @@ -13386,10 +13376,10 @@ "resolved": "https://registry.npmjs.org/velocity-react/-/velocity-react-1.4.1.tgz", "integrity": "sha512-ZyXBm+9C/6kNUNyc+aeNKEhtTu/Mn+OfpsNBGuTxU8S2DUcis/KQL0rTN6jWL+7ygdOrun18qhheNZTA7YERmg==", "requires": { - "lodash": "4.17.11", - "prop-types": "15.6.2", - "react-transition-group": "2.4.0", - "velocity-animate": "1.5.2" + "lodash": "^4.17.5", + "prop-types": "^15.5.8", + "react-transition-group": "^2.0.0", + "velocity-animate": "^1.4.0" } }, "verror": { @@ -13397,9 +13387,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vinyl": { @@ -13408,12 +13398,12 @@ "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "dev": true, "requires": { - "clone": "2.1.2", - "clone-buffer": "1.0.0", - "clone-stats": "1.0.0", - "cloneable-readable": "1.1.2", - "remove-trailing-separator": "1.1.0", - "replace-ext": "1.0.0" + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" } }, "vinyl-fs": { @@ -13422,23 +13412,23 @@ "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", "dev": true, "requires": { - "duplexify": "3.6.0", - "glob-stream": "5.3.5", - "graceful-fs": "4.1.11", + "duplexify": "^3.2.0", + "glob-stream": "^5.3.2", + "graceful-fs": "^4.0.0", "gulp-sourcemaps": "1.6.0", - "is-valid-glob": "0.3.0", - "lazystream": "1.0.0", - "lodash.isequal": "4.5.0", - "merge-stream": "1.0.1", - "mkdirp": "0.5.1", - "object-assign": "4.1.1", - "readable-stream": "2.3.6", - "strip-bom": "2.0.0", - "strip-bom-stream": "1.0.0", - "through2": "2.0.3", - "through2-filter": "2.0.0", - "vali-date": "1.0.0", - "vinyl": "1.2.0" + "is-valid-glob": "^0.3.0", + "lazystream": "^1.0.0", + "lodash.isequal": "^4.0.0", + "merge-stream": "^1.0.0", + "mkdirp": "^0.5.0", + "object-assign": "^4.0.0", + "readable-stream": "^2.0.4", + "strip-bom": "^2.0.0", + "strip-bom-stream": "^1.0.0", + "through2": "^2.0.0", + "through2-filter": "^2.0.0", + "vali-date": "^1.0.0", + "vinyl": "^1.0.0" }, "dependencies": { "clone": { @@ -13465,7 +13455,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "vinyl": { @@ -13474,8 +13464,8 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } } @@ -13492,7 +13482,7 @@ "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=", "dev": true, "requires": { - "browser-process-hrtime": "0.1.3" + "browser-process-hrtime": "^0.1.2" } }, "walker": { @@ -13501,7 +13491,7 @@ "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", "dev": true, "requires": { - "makeerror": "1.0.11" + "makeerror": "1.0.x" } }, "warning": { @@ -13509,7 +13499,7 @@ "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "webidl-conversions": { @@ -13533,7 +13523,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } } } @@ -13555,9 +13545,9 @@ "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", "dev": true, "requires": { - "lodash.sortby": "4.7.0", - "tr46": "1.0.1", - "webidl-conversions": "4.0.2" + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } }, "which": { @@ -13566,7 +13556,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -13586,12 +13576,12 @@ "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", "requires": { - "async": "1.0.0", - "colors": "1.0.3", - "cycle": "1.0.3", - "eyes": "0.1.8", - "isstream": "0.1.2", - "stack-trace": "0.0.10" + "async": "~1.0.0", + "colors": "1.0.x", + "cycle": "1.0.x", + "eyes": "0.1.x", + "isstream": "0.1.x", + "stack-trace": "0.0.x" } }, "wordwrap": { @@ -13606,8 +13596,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -13622,9 +13612,9 @@ "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "ws": { @@ -13632,7 +13622,7 @@ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", "requires": { - "async-limiter": "1.0.0" + "async-limiter": "~1.0.0" } }, "xml-crypto": { @@ -13640,8 +13630,8 @@ "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.8.5.tgz", "integrity": "sha1-K7z7PrM/OoKiGLgiv2craxwg5Tg=", "requires": { - "xmldom": "0.1.19", - "xpath.js": "1.1.0" + "xmldom": "=0.1.19", + "xpath.js": ">=0.0.3" } }, "xml-js": { @@ -13649,7 +13639,7 @@ "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==", "requires": { - "sax": "1.2.4" + "sax": "^1.2.4" } }, "xml-name-validator": { @@ -13663,9 +13653,9 @@ "resolved": "https://registry.npmjs.org/xml2json/-/xml2json-0.11.2.tgz", "integrity": "sha512-ZJpHpPOL0T5lOvAHMnWm59iQOPqNtam5t2TMUllWZ1k5Wm8L5YyvQnkeaVnRKCvDwY5EumqXWyOjjMdQVz272A==", "requires": { - "hoek": "4.2.1", - "joi": "13.6.0", - "node-expat": "2.3.17" + "hoek": "^4.2.1", + "joi": "^13.1.2", + "node-expat": "^2.3.15" } }, "xmlbuilder": { @@ -13701,13 +13691,13 @@ "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "dev": true, "requires": { - "camelcase": "2.1.1", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "os-locale": "1.4.0", - "string-width": "1.0.2", - "window-size": "0.1.4", - "y18n": "3.2.1" + "camelcase": "^2.0.1", + "cliui": "^3.0.3", + "decamelize": "^1.1.1", + "os-locale": "^1.4.0", + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" } }, "yargs-parser": { @@ -13716,8 +13706,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" }, "dependencies": { "camelcase": { diff --git a/meteor/package.json b/meteor/package.json index 85ff45206f..25487c4632 100644 --- a/meteor/package.json +++ b/meteor/package.json @@ -55,7 +55,6 @@ "i18next-browser-languagedetector": "^2.2.0", "i18next-xhr-backend": "^1.5.1", "indexof": "0.0.1", - "jquery": "^3.3.1", "lottie-web": "^5.1.10", "meteor-node-stubs": "^0.3.3", "moment": "^2.19.1", @@ -97,7 +96,6 @@ "@types/css-font-loading-module": "0.0.1", "@types/fibers": "0.0.30", "@types/jest": "^24.0.6", - "@types/jquery": "^3.3.29", "@types/meteor": "1.4.21", "@types/mousetrap": "^1.6.0", "@types/node": "^9.6.1", @@ -107,11 +105,11 @@ "@types/react-i18next": "^7.8.3", "@types/react-router-dom": "^4.2.6", "@types/winston": "^2.3.9", + "fibers": "^3.1.1", "i18next-conv": "^8.0.1", "i18next-extract-gettext": "^3.2.0", "jest": "^24.1.0", "jest-meteor-stubs": "1.5.1", - "fibers": "^3.1.1", "meteor-promise": "0.8.7", "node-license-validator": "^1.3.0", "opn-cli": "^4.1.0", From bebf2a4f0bce41547aeaca39eeba153a841d7bf0 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Tue, 14 May 2019 17:58:18 +0200 Subject: [PATCH 03/30] Removed jQuery from notification center panel --- .../notifications/NotificationCenterPanel.tsx | 102 ++++++++++-------- meteor/package-lock.json | 10 ++ 2 files changed, 67 insertions(+), 45 deletions(-) diff --git a/meteor/client/lib/notifications/NotificationCenterPanel.tsx b/meteor/client/lib/notifications/NotificationCenterPanel.tsx index 335d04b0e2..793c38824a 100644 --- a/meteor/client/lib/notifications/NotificationCenterPanel.tsx +++ b/meteor/client/lib/notifications/NotificationCenterPanel.tsx @@ -1,9 +1,8 @@ import * as React from 'react' -import * as $ from 'jquery' import * as CoreIcon from '@nrk/core-icons/jsx' import * as ClassNames from 'classnames' import * as VelocityReact from 'velocity-react' - +import * as Velocity from 'velocity-animate' import { translateWithTracker, Translated, withTracker } from '../ReactMeteorData/ReactMeteorData' import { MeteorReactComponent } from '../MeteorReactComponent' import { NotificationCenter, Notification, NoticeLevel, NotificationAction } from './notifications' @@ -35,16 +34,16 @@ class NotificationPopUp extends React.Component { } } - render () { + render() { const { item } = this.props - const defaultActions: NotificationAction[] = _.filter(item.actions || [], i => i.type === 'default') - const allActions: NotificationAction[] = item.actions || [] + const defaultActions: NotificationAction[] = _.filter(item.actions || [], i => i.type === 'default') + const allActions: NotificationAction[] = item.actions || [] const defaultAction: NotificationAction | undefined = ( defaultActions.length === 1 && allActions.length === 1 ? - defaultActions[0] : - undefined + defaultActions[0] : + undefined ) return
{ 'is-highlighted': this.props.isHighlighted })} - onClick={defaultAction ? (e) => this.triggerEvent(defaultAction, e) : undefined} + onClick={defaultAction ? (e) => this.triggerEvent(defaultAction, e) : undefined} >
@@ -68,27 +67,27 @@ class NotificationPopUp extends React.Component { {item.message} {( !defaultAction && allActions.length ? -
- {_.map(allActions, (action: NotificationAction, i: number) => { - return ( - - ) - })} -
- : null +
+ {_.map(allActions, (action: NotificationAction, i: number) => { + return ( + + ) + })} +
+ : null )}
{this.props.showDismiss && - {/*
*/} + {/*
*/} - {/*
*/} + {/*
*/} }
@@ -127,7 +126,7 @@ export const NotificationCenterPopUps = translateWithTracker, IState> { - dismissNotification (item: Notification) { + dismissNotification(item: Notification) { if (item.persistent) { item.snooze() } else { @@ -135,43 +134,56 @@ export const NotificationCenterPopUps = translateWithTracker { + item.style.animationName = '' + }) } - componentDidUpdate (prevProps, prevState, snapshot) { + componentDidUpdate(prevProps, prevState, snapshot) { if (super.componentDidUpdate) super.componentDidUpdate(prevProps, prevState, snapshot) if (this.props.highlightedSource && this.props.highlightedLevel) { - const items = $('.notification-pop-up.is-highlighted') + const items: NodeListOf = document.querySelectorAll('.notification-pop-up.is-highlighted') if (items.length > 0) { // scroll to highlighted items - const position = $(items[0]).position() || { top: 0 } - const container = $('.notification-center-panel .notification-pop-ups') - container && container.animate({ - scrollTop: (container.scrollTop() || 0) + position.top - 10 - }, { - queue: false, - duration: 1000 - }) + const currentAnimationName = getComputedStyle(items[0]).getPropertyValue('animation-name') - const value = items.css('animationName') - items.css('animationName', 'none') - setTimeout(function () { - if (value !== 'none') items.css('animationName', value) + const container = document.querySelector('.notification-center-panel .notification-pop-ups') + if (container) { + const containerScrollTop = container.scrollTop + const offsetTop = items[0].offsetTop || 0 + + Velocity(container, { + scrollTop: containerScrollTop + offsetTop - 10 + }, { + queue: false, + duration: 1000 + }) + } + + items.forEach(item => { + item.style.animationName = 'none' }) + + if (currentAnimationName !== 'none') { + window.requestAnimationFrame(function () { + items.forEach(item => { + item.style.animationName = currentAnimationName + }) + }) + } } } } - render () { + render() { const { t, highlightedSource, highlightedLevel } = this.props const displayList = this.props.notifications.filter(i => this.props.showSnoozed || !i.snoozed).sort((a, b) => Notification.compare(a, b)).map(item => ( @@ -244,14 +256,14 @@ export const NotificationCenterPanelToggle = withTracker { - render () { + render() { return ( diff --git a/meteor/package-lock.json b/meteor/package-lock.json index f3e0979fb9..4efbb70bb5 100644 --- a/meteor/package-lock.json +++ b/meteor/package-lock.json @@ -9498,6 +9498,11 @@ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, "public-encrypt": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", @@ -9663,6 +9668,11 @@ "inherits": "2.0.1" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", From 2e32e701b64eaabfc61234e605680deb8f52c63b Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 15 May 2019 18:03:31 +0200 Subject: [PATCH 04/30] Removed jQuery from viewPort lib --- meteor/client/lib/viewPort.ts | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/meteor/client/lib/viewPort.ts b/meteor/client/lib/viewPort.ts index 151c08f3ff..56cdefb1a2 100644 --- a/meteor/client/lib/viewPort.ts +++ b/meteor/client/lib/viewPort.ts @@ -1,9 +1,10 @@ -import * as $ from 'jquery' import * as _ from 'underscore' +import * as Velocity from 'velocity-animate' + import { SegmentTimelineElementId } from '../ui/SegmentTimeline/SegmentTimeline' import { Parts } from '../../lib/collections/Parts' -export function scrollToPart (partId: string): boolean { +export function scrollToPart(partId: string): boolean { // TODO: do scrolling within segment as well? let part = Parts.findOne(partId) @@ -15,44 +16,44 @@ export function scrollToPart (partId: string): boolean { const HEADER_HEIGHT = 175 -export function scrollToSegment (elementToScrollToOrSegmentId: HTMLElement | JQuery | string, forceScroll?: boolean): boolean { - - let elementToScrollTo: HTMLElement | JQuery = ( +export function scrollToSegment(elementToScrollToOrSegmentId: HTMLElement | string, forceScroll?: boolean): boolean { + let elementToScrollTo: HTMLElement | null = ( _.isString(elementToScrollToOrSegmentId) ? - $('#' + SegmentTimelineElementId + elementToScrollToOrSegmentId) : - elementToScrollToOrSegmentId + document.querySelector('#' + SegmentTimelineElementId + elementToScrollToOrSegmentId) : + elementToScrollToOrSegmentId ) - const elementPosition = $(elementToScrollTo).offset() - const elementHeight = $(elementToScrollTo).height() || 0 - let scrollTop: number | null = null - // check if the item is in viewport - if (elementPosition && (( - (elementPosition.top + elementHeight > ($('html,body').scrollTop() || 0) + window.innerHeight) || - (elementPosition.top < ($('html,body').scrollTop() || 0)) - ) || forceScroll)) { - scrollTop = elementPosition.top + if (!elementToScrollTo) { + return false; } - if (scrollTop !== null) { - scrollToPosition(scrollTop) + + const { top, bottom } = elementToScrollTo.getBoundingClientRect() + + // check if the item is in viewport + if (forceScroll || + bottom > window.scrollY + window.innerHeight || + top < window.scrollY) { + + scrollToPosition(top) return true } + return false } -export function scrollToPosition (scrollPosition: number): void { - $(document.body).addClass('auto-scrolling') - const autoScrolling = parseInt($(document.body).data('auto-scrolling') || 0, 10) + 1 - $(document.body).data('auto-scrolling', autoScrolling) - $('html,body').animate({ +export function scrollToPosition(scrollPosition: number): void { + document.body.classList.add('auto-scrolling') + const autoScrolling = document.body.dataset.autoScrolling ? parseInt(document.body.dataset.autoScrolling, 10) + 1 : 1 + document.body.dataset.autoScrolling = String(autoScrolling) + Velocity(document.body, { scrollTop: Math.max(0, scrollPosition - HEADER_HEIGHT) - }, 400).promise().then(() => { + }, 400).then(() => { // delay until next frame, so that the scroll handler can fire - setTimeout(function () { - const autoScrolling = parseInt($(document.body).data('auto-scrolling') || 0, 10) - 1 - $(document.body).data('auto-scrolling', autoScrolling) + requestAnimationFrame(function () { + const autoScrolling = document.body.dataset.autoScrolling ? parseInt(document.body.dataset.autoScrolling, 10) - 1 : -1 + document.body.dataset.autoScrolling = String(autoScrolling) if (autoScrolling <= 0) { - $(document.body).removeClass('auto-scrolling') + document.body.classList.remove('auto-scrolling') } }) }) From 48da266cff44ae726d0f1d0b4981fca2393f9777 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 15 May 2019 18:07:41 +0200 Subject: [PATCH 05/30] Remove jQuery from ActiveRundownView --- meteor/client/ui/ActiveRundownView.tsx | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/meteor/client/ui/ActiveRundownView.tsx b/meteor/client/ui/ActiveRundownView.tsx index e1fda8a4ca..31987512eb 100644 --- a/meteor/client/ui/ActiveRundownView.tsx +++ b/meteor/client/ui/ActiveRundownView.tsx @@ -1,5 +1,4 @@ import * as React from 'react' -import * as $ from 'jquery' import * as _ from 'underscore' import { Route @@ -39,8 +38,8 @@ export const ActiveRundownView = translateWithTracker const rundown = Rundowns.findOne(_.extend({ active: true }, { - studioId: studioId - })) + studioId: studioId + })) return { rundown, @@ -49,14 +48,14 @@ export const ActiveRundownView = translateWithTracker } })(class ActiveRundownView extends MeteorReactComponent, IState> { - constructor (props) { + constructor(props) { super(props) this.state = { subsReady: false } } - componentWillMount () { + componentWillMount() { this.subscribe('rundowns', _.extend({ active: true }, this.props.studioId ? { @@ -77,20 +76,20 @@ export const ActiveRundownView = translateWithTracker }) } - componentDidMount () { - $(document.body).addClass(['dark', 'vertical-overflow-only']) + componentDidMount() { + document.body.classList.add('dark', 'vertical-overflow-only') } - componentWillUnmount () { + componentWillUnmount() { super.componentWillUnmount() - $(document.body).removeClass(['dark', 'vertical-overflow-only']) + document.body.classList.remove('dark', 'vertical-overflow-only') } - componentDidUpdate () { - $(document.body).addClass(['dark', 'vertical-overflow-only']) + componentDidUpdate() { + document.body.classList.add('dark', 'vertical-overflow-only') } - renderMessage (message: string) { + renderMessage(message: string) { const { t } = this.props return ( @@ -111,7 +110,7 @@ export const ActiveRundownView = translateWithTracker ) } - render () { + render() { const { t } = this.props if (!this.state.subsReady) { return ( From 5352ce81567d786437647d053a8518141d7496df Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 15 May 2019 18:15:26 +0200 Subject: [PATCH 06/30] Removed jQuery from VideoEditMonitor --- meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx b/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx index 60d2922c84..59bab81651 100644 --- a/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx +++ b/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx @@ -7,7 +7,6 @@ import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData' // import * as faFastForward from '@fortawesome/fontawesome-free-solid/faFastForward' // import * as faFastBackward from '@fortawesome/fontawesome-free-solid/faFastBackward' // import * as FontAwesomeIcon from '@fortawesome/react-fontawesome' -import * as $ from 'jquery' import * as classNames from 'classnames' export interface IProps { @@ -28,7 +27,7 @@ export const VideoEditMonitor = translate()(class VideoEditMonitor extends React private internalTime: number = 0 private lastPosition: number - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.internalTime = props.currentTime || 0 @@ -59,8 +58,7 @@ export const VideoEditMonitor = translate()(class VideoEditMonitor extends React } videoMouseMove = (e: MouseEvent) => { - const pos = $(this.videoEl).offset() - if (this.state.isMouseDown && pos) { + if (this.state.isMouseDown && this.videoEl) { e.preventDefault() if (this.videoEl.readyState <= 2) { // we are moving around the video, but the player is stuck @@ -119,11 +117,11 @@ export const VideoEditMonitor = translate()(class VideoEditMonitor extends React // TODO } - componentWillUnmount () { + componentWillUnmount() { this.cleanUpListeners() } - componentDidUpdate () { + componentDidUpdate() { if (this.videoEl) { if (this.videoEl.src !== this.props.src) { this.videoEl.src = this.props.src || '' @@ -133,7 +131,7 @@ export const VideoEditMonitor = translate()(class VideoEditMonitor extends React } } - render () { + render() { return (
Date: Wed, 15 May 2019 19:04:52 +0200 Subject: [PATCH 07/30] Removed jQuery from ClockView --- meteor/client/ui/ClockView.tsx | 319 ++++++++++++++++----------------- 1 file changed, 159 insertions(+), 160 deletions(-) diff --git a/meteor/client/ui/ClockView.tsx b/meteor/client/ui/ClockView.tsx index 9fa9ad40d2..15ac7be497 100644 --- a/meteor/client/ui/ClockView.tsx +++ b/meteor/client/ui/ClockView.tsx @@ -2,7 +2,6 @@ import * as React from 'react' import * as ClassNames from 'classnames' import { withTracker } from '../lib/ReactMeteorData/react-meteor-data' import { translate, InjectedTranslateProps } from 'react-i18next' -import * as $ from 'jquery' import * as _ from 'underscore' import { Rundown, Rundowns } from '../../lib/collections/Rundowns' @@ -37,8 +36,8 @@ interface RundownOverviewTrackedProps { segments: Array } -const Timediff = class extends React.Component<{ time: number}> { - render () { +const Timediff = class extends React.Component<{ time: number }> { + render() { const time = -this.props.time const isNegative = (Math.floor(time / 1000) > 0) const timeString = RundownUtils.formatDiffToTimecode(time, true, false, true, false, true, '', false, true) // @todo: something happened here with negative time @@ -93,125 +92,125 @@ const ClockComponent = translate()(withTiming, RundownOverviewState> { - componentWillMount () { - this.subscribe('rundowns', { - _id: this.props.rundownId - }) - this.subscribe('segments', { - rundownId: this.props.rundownId - }) - this.subscribe('parts', { - rundownId: this.props.rundownId - }) - } + class extends MeteorReactComponent, RundownOverviewState> { + componentWillMount() { + this.subscribe('rundowns', { + _id: this.props.rundownId + }) + this.subscribe('segments', { + rundownId: this.props.rundownId + }) + this.subscribe('parts', { + rundownId: this.props.rundownId + }) + } - render () { - const { rundown, segments } = this.props + render() { + const { rundown, segments } = this.props - if (rundown && this.props.rundownId && this.props.segments) { - let currentPart: PartUi | undefined - for (const segment of segments) { - if (segment.items) { - for (const item of segment.items) { - if (item._id === rundown.currentPartId) { - currentPart = item + if (rundown && this.props.rundownId && this.props.segments) { + let currentPart: PartUi | undefined + for (const segment of segments) { + if (segment.items) { + for (const item of segment.items) { + if (item._id === rundown.currentPartId) { + currentPart = item + } } } } - } - let currentSegmentDuration = 0 - if (currentPart) { - currentSegmentDuration += currentPart.renderedDuration || currentPart.expectedDuration || 0 - currentSegmentDuration += -1 * (currentPart.duration || 0) - if (!currentPart.duration && currentPart.startedPlayback) { - currentSegmentDuration += -1 * (getCurrentTime() - (currentPart.getLastStartedPlayback() || 0)) + let currentSegmentDuration = 0 + if (currentPart) { + currentSegmentDuration += currentPart.renderedDuration || currentPart.expectedDuration || 0 + currentSegmentDuration += -1 * (currentPart.duration || 0) + if (!currentPart.duration && currentPart.startedPlayback) { + currentSegmentDuration += -1 * (getCurrentTime() - (currentPart.getLastStartedPlayback() || 0)) + } } - } - let nextPart - for (const segment of segments) { - if (segment.items) { - for (const item of segment.items) { - if (item._id === rundown.nextPartId) { - nextPart = item + let nextPart + for (const segment of segments) { + if (segment.items) { + for (const item of segment.items) { + if (item._id === rundown.nextPartId) { + nextPart = item + } } } } - } - // let nextSegmentDuration = 0 - // if (nextPart) { - // nextSegmentDuration += nextPart.expectedDuration || 0 - // nextSegmentDuration += -1 * (nextPart.duration || 0) - // if (!nextPart.duration && nextPart.startedPlayback) { - // nextSegmentDuration += -1 * (getCurrentTime() - nextPart.startedPlayback) - // } - // } + // let nextSegmentDuration = 0 + // if (nextPart) { + // nextSegmentDuration += nextPart.expectedDuration || 0 + // nextSegmentDuration += -1 * (nextPart.duration || 0) + // if (!nextPart.duration && nextPart.startedPlayback) { + // nextSegmentDuration += -1 * (getCurrentTime() - nextPart.startedPlayback) + // } + // } - const overUnderClock = rundown.expectedDuration ? - (this.props.timingDurations.asPlayedRundownDuration || 0) - rundown.expectedDuration - : (this.props.timingDurations.asPlayedRundownDuration || 0) - (this.props.timingDurations.totalRundownDuration || 0) + const overUnderClock = rundown.expectedDuration ? + (this.props.timingDurations.asPlayedRundownDuration || 0) - rundown.expectedDuration + : (this.props.timingDurations.asPlayedRundownDuration || 0) - (this.props.timingDurations.totalRundownDuration || 0) - return ( -
-
- {currentPart ? - -
- -
-
- {currentPart.title.split(';')[0]} -
-
- -
-
- + return ( +
+
+ {currentPart ? + +
+ +
+
+ {currentPart.title.split(';')[0]} +
+
+ +
+
+ +
+ : + rundown.expectedStart &&
+
- : - rundown.expectedStart &&
- -
- } -
-
-
- {nextPart ? - - : ''} + }
-
-
- {currentPart && currentPart.autoNext ? -
- -
: ''} - {nextPart && nextPart.slug ? nextPart.slug.split(';')[0] : '_'} -
-
- {nextPart && nextPart.slug ? - - : '_'} +
+
+ {nextPart ? + + : ''}
-
-
-
- {rundown ? rundown.name : 'UNKNOWN'} +
+
+ {currentPart && currentPart.autoNext ? +
+ +
: ''} + {nextPart && nextPart.slug ? nextPart.slug.split(';')[0] : '_'} +
+
+ {nextPart && nextPart.slug ? + + : '_'} +
-
= 0) - })}> - { RundownUtils.formatDiffToTimecode(overUnderClock, true, false, true, true, true, undefined, true) } +
+
+ {rundown ? rundown.name : 'UNKNOWN'} +
+
= 0) + })}> + {RundownUtils.formatDiffToTimecode(overUnderClock, true, false, true, true, true, undefined, true)} +
-
- ) + ) + } + return null } - return null - } - }))) + }))) interface IPropsHeader extends InjectedTranslateProps { key: string @@ -259,69 +258,69 @@ export const ClockView = translate()(withTracker(function (props: IPropsHeader) parts } })( -class extends MeteorReactComponent, IStateHeader> { - componentDidMount () { - $(document.body).addClass('dark xdark') - let studioId = objectPathGet(this.props, 'match.params.studioId') - if (studioId) { - this.subscribe('studios', { - _id: studioId - }) - this.subscribe('rundowns', { - active: true, - studioId: studioId - }) - } - let rundown = ( - Rundowns.findOne({ - active: true, - studioId: studioId - }) - ) - if (rundown) { - this.subscribe('segments', { - rundownId: rundown._id - }) - this.subscribe('parts', { - rundownId: rundown._id - }) - this.subscribe('pieces', { - rundownId: rundown._id - }) - this.subscribe('showStyleBases', { - _id: rundown.showStyleBaseId - }) - this.subscribe('adLibPieces', { - rundownId: rundown._id - }) + class extends MeteorReactComponent, IStateHeader> { + componentDidMount() { + document.body.classList.add('dark', 'xdark') + let studioId = objectPathGet(this.props, 'match.params.studioId') + if (studioId) { + this.subscribe('studios', { + _id: studioId + }) + this.subscribe('rundowns', { + active: true, + studioId: studioId + }) + } + let rundown = ( + Rundowns.findOne({ + active: true, + studioId: studioId + }) + ) + if (rundown) { + this.subscribe('segments', { + rundownId: rundown._id + }) + this.subscribe('parts', { + rundownId: rundown._id + }) + this.subscribe('pieces', { + rundownId: rundown._id + }) + this.subscribe('showStyleBases', { + _id: rundown.showStyleBaseId + }) + this.subscribe('adLibPieces', { + rundownId: rundown._id + }) + } } - } - componentWillUnmount () { - this._cleanUp() - $(document.body).removeClass('dark xdark') - } + componentWillUnmount() { + this._cleanUp() + document.body.classList.remove('dark', 'xdark') + } - render () { - const { t } = this.props + render() { + const { t } = this.props - if (this.props.rundown) { - return ( - - - - ) - } else { - return ( -
-
-

- {t('There is no rundown active in this studio.')} -

+ if (this.props.rundown) { + return ( + + + + ) + } else { + return ( +
+
+

+ {t('There is no rundown active in this studio.')} +

+
-
- ) + ) + } } } -} )) From af1ace7490f8b3c59e2353359add21ef69738188 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 15 May 2019 19:06:14 +0200 Subject: [PATCH 08/30] Removed (unused) jQuery import from keyboard device --- .../ui/Prompter/controller/keyboard-device.ts | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/meteor/client/ui/Prompter/controller/keyboard-device.ts b/meteor/client/ui/Prompter/controller/keyboard-device.ts index 7eaa393460..b433007b26 100644 --- a/meteor/client/ui/Prompter/controller/keyboard-device.ts +++ b/meteor/client/ui/Prompter/controller/keyboard-device.ts @@ -1,6 +1,5 @@ import { ControllerAbstract, LONGPRESS_TIME } from './lib' import { PrompterViewInner } from '../PrompterView' -import * as $ from 'jquery' const LOCALSTORAGE_MODE = 'prompter-controller-arrowkeys' @@ -15,7 +14,7 @@ export class KeyboardController extends ControllerAbstract { private _mode: Mode = Mode.NORMAL private _destroyed: boolean = false - private _keyDown: {[button: string]: number} = {} + private _keyDown: { [button: string]: number } = {} private _prompterView: PrompterViewInner @@ -31,7 +30,7 @@ export class KeyboardController extends ControllerAbstract { private _updateSpeedHandle: number | null = null - constructor (view: PrompterViewInner) { + constructor(view: PrompterViewInner) { super(view) this._prompterView = view @@ -42,10 +41,10 @@ export class KeyboardController extends ControllerAbstract { recalledMode as Mode || Mode.NORMAL ) } - public destroy () { + public destroy() { this._destroyed = true } - public onKeyDown (e: KeyboardEvent) { + public onKeyDown(e: KeyboardEvent) { console.log(e) if (!this._keyDown[e.code]) this._keyDown[e.code] = Date.now() @@ -79,7 +78,7 @@ export class KeyboardController extends ControllerAbstract { } } } - public onKeyUp (e: KeyboardEvent) { + public onKeyUp(e: KeyboardEvent) { const timeSincePress = Date.now() - this._keyDown[e.code] if (this._mode === Mode.NORMAL) { @@ -117,36 +116,36 @@ export class KeyboardController extends ControllerAbstract { this._keyDown[e.code] = 0 } - public onMouseKeyDown (e: MouseEvent) { + public onMouseKeyDown(e: MouseEvent) { // Nothing } - public onMouseKeyUp (e: MouseEvent) { + public onMouseKeyUp(e: MouseEvent) { // Nothing } - public onWheel (e: WheelEvent) { + public onWheel(e: WheelEvent) { // Nothing } - private _toggleMode () { + private _toggleMode() { this._setMode(Mode.NORMAL) } - private _setMode (mode: Mode) { + private _setMode(mode: Mode) { this._mode = mode console.log('Arrow-control: Switching mode to ' + mode) localStorage.setItem(LOCALSTORAGE_MODE, mode) } - private _getDistanceToStop (currentSpeed, stopAcceleration): number { + private _getDistanceToStop(currentSpeed, stopAcceleration): number { if (!stopAcceleration) return 0 let timeToStop = currentSpeed / stopAcceleration // (not in seconds, but frames!) if (!timeToStop) return 0 return (stopAcceleration * Math.pow(timeToStop, 2) / 2) + currentSpeed * timeToStop } - private _getAccelerationToStopInTime (currentSpeed, normalStopAcceleration, distanceLeft): number { + private _getAccelerationToStopInTime(currentSpeed, normalStopAcceleration, distanceLeft): number { let timeToStop = currentSpeed / normalStopAcceleration // (not in seconds, but frames!) if (!timeToStop) return 0 return (2 * (distanceLeft - (currentSpeed * timeToStop))) / Math.pow(timeToStop, 2) } - private _updateScrollPosition () { + private _updateScrollPosition() { if (this._destroyed) return if (this._updateSpeedHandle !== null) return this._updateSpeedHandle = null @@ -156,8 +155,8 @@ export class KeyboardController extends ControllerAbstract { this._currentPosition = scrollPosition let dp = ( this._continousScrolling ? - 99999 * this._continousScrolling : - this._targetPosition - this._currentPosition + 99999 * this._continousScrolling : + this._targetPosition - this._currentPosition ) if (dp !== 0) { From 1cba5416f14b91fb1d30ed4efc0f0aa58eb3257a Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Thu, 16 May 2019 13:24:24 +0200 Subject: [PATCH 09/30] Removed jQuery from PrompterView --- meteor/client/ui/Prompter/PrompterView.tsx | 217 ++++++++++----------- 1 file changed, 108 insertions(+), 109 deletions(-) diff --git a/meteor/client/ui/Prompter/PrompterView.tsx b/meteor/client/ui/Prompter/PrompterView.tsx index d57d894b91..a253a0ec8b 100644 --- a/meteor/client/ui/Prompter/PrompterView.tsx +++ b/meteor/client/ui/Prompter/PrompterView.tsx @@ -1,10 +1,8 @@ import * as React from 'react' -import * as $ from 'jquery' import * as _ from 'underscore' +import * as Velocity from 'velocity-animate' import * as ClassNames from 'classnames' -import { - Route -} from 'react-router-dom' +import { Route } from 'react-router-dom' import { translateWithTracker, Translated } from '../../lib/ReactMeteorData/ReactMeteorData' import { Rundown, Rundowns } from '../../../lib/collections/Rundowns' import { Studios, Studio } from '../../../lib/collections/Studios' @@ -69,7 +67,7 @@ export class PrompterViewInner extends MeteorReactComponent { - const offset = $(el).offset() - if ( - offset && - (startY === -1 || offset.top > startY) && - (endY === -1 || offset.top <= endY) - ) { - foundPositions.push(offset.top) - return true + const anchors = document.querySelectorAll('.prompter .scroll-anchor') + + document.querySelectorAll('.prompter .scroll-anchor').forEach(anchor => { + const { top } = anchor.getBoundingClientRect() + if ((startY === -1 || top > startY) && + (endY === -1 || top <= endY)) { + foundPositions.push(top) } }) + foundPositions = _.sortBy(foundPositions, v => sortDirection * v) return foundPositions[0] || null } - getScrollPosition (): number | undefined { + getScrollPosition(): number | undefined { return window.scrollY || window.pageYOffset || (document.documentElement || { scrollTop: undefined }).scrollTop } onWindowScroll = () => { @@ -189,82 +188,82 @@ export class PrompterViewInner extends MeteorReactComponent { + const rundownId = this.props.rundown && this.props.rundown._id + const rundown = Rundowns.findOne(rundownId || '') - let rundownId = this.props.rundown && this.props.rundown._id - let rundown = Rundowns.findOne(rundownId || '') - - if (rundown) { + if (rundown !== undefined) { const positionTop = this.getScrollPosition() || 0 const positionBottom = positionTop + window.innerHeight - const anchors = $('.scroll-anchor') + let currentPartElement: Element | null = null + let currentPartElementAfter: Element | null = null + let nextPartElementAfter: Element | null = null - let currentPartElement: JQuery | null = null - let currentPartElementAfter: JQuery | null = null - let nextPartElement: JQuery | null = null - let nextPartElementAfter: JQuery | null = null + const anchors: Array = Array.from(document.querySelectorAll('.scroll-anchor')) - for (let i = 0; i < anchors.length; i++) { - const el = anchors[i] - const next = anchors[i + 1] + for (let index = 0; index < anchors.length; index++) { + const current = anchors[index] + const next = index + 1 < anchors.length ? anchors[index + 1] : null; - if (rundown.currentPartId && el.className.match('.part-' + rundown.currentPartId)) { - currentPartElement = $(el) - currentPartElementAfter = $(next) || null + if (rundown.currentPartId && current.classList.contains(`part-${rundown.currentPartId}`)) { + currentPartElement = current + currentPartElementAfter = next } - if (rundown.nextPartId && el.className.match('.part-' + rundown.nextPartId)) { - nextPartElement = $(el) - nextPartElementAfter = $(next) || null + if (rundown.nextPartId && current.classList.contains(`part-${rundown.nextPartId}`)) { + nextPartElementAfter = next } } - const currentPositionStart = currentPartElement ? (currentPartElement.offset() || { top: undefined }).top : null - const currentPositionEnd = currentPartElementAfter ? (currentPartElementAfter.offset() || { top: undefined }).top : null - - // const nextPositionStart = nextPartElement ? (nextPartElement.offset() || {top: undefined}).top : null - const nextPositionEnd = nextPartElementAfter ? (nextPartElementAfter.offset() || { top: undefined }).top : null - - if (currentPositionEnd && currentPositionEnd < positionTop) { - // Display take "^" indicator - $('.take-indicator').toggleClass('hidden', false).toggleClass('top', true) - } else if (currentPositionStart && currentPositionStart > positionBottom) { - // Display take "v" indicator - $('.take-indicator').toggleClass('hidden', false).toggleClass('top', false) - } else { - $('.take-indicator').toggleClass('hidden', true) + const currentPositionStart = currentPartElement ? currentPartElement.getBoundingClientRect().top + window.scrollY : null + const currentPositionEnd = currentPartElementAfter ? currentPartElementAfter.getBoundingClientRect().top + window.scrollY : null + + const nextPositionEnd = nextPartElementAfter ? nextPartElementAfter.getBoundingClientRect().top + window.scrollY : null + + const takeIndicator = document.querySelector('.take-indicator') + if (takeIndicator) { + if (currentPositionEnd && currentPositionEnd < positionTop) { + // Display take "^" indicator + takeIndicator.classList.remove('hidden') + takeIndicator.classList.add('top') + } else if (currentPositionStart && currentPositionStart > positionBottom) { + // Display take "v" indicator + takeIndicator.classList.remove('hidden', 'top') + } else { + takeIndicator.classList.add('hidden') + } } - if (nextPositionEnd && nextPositionEnd < positionTop) { - // Display next "^" indicator - $('.next-indicator').toggleClass('hidden', false).toggleClass('top', true) - // } else if (nextPositionStart && nextPositionStart > positionBottom) { - // Don't display next "v" indicator - // $('.next-indicator').toggleClass('hidden', false).toggleClass('top', false) - } else { - $('.next-indicator').toggleClass('hidden', true) + const nextIndicator = document.querySelector('.take-indicator') + if (nextIndicator) { + if (nextPositionEnd && nextPositionEnd < positionTop) { + // Display next "^" indicator + nextIndicator.classList.remove('hidden') + nextIndicator.classList.add('top') + } else { + nextIndicator.classList.add('hidden') + } } } } - componentDidMount () { - $(document.body).addClass(['dark', 'vertical-overflow-only']) + componentDidMount() { + document.body.classList.add('dark', 'vertical-overflow-only') window.addEventListener('scroll', this.onWindowScroll) this.isMounted0 = true this.triggerCheckCurrentTakeMarkers() this.checkScrollToCurrent() } - componentWillUnmount () { + componentWillUnmount() { super.componentWillUnmount() - $(document.body).removeClass(['dark', 'vertical-overflow-only']) + document.body.classList.remove('dark', 'vertical-overflow-only') window.removeEventListener('scroll', this.onWindowScroll) this.isMounted0 = false - } - renderMessage (message: string) { + renderMessage(message: string) { const { t } = this.props return ( @@ -285,7 +284,7 @@ export class PrompterViewInner extends MeteorReactComponent @@ -296,15 +295,15 @@ export class PrompterViewInner extends MeteorReactComponent
: - ( - this.props.rundown ? - : - this.props.studio ? - this.renderMessage(t('There is no rundown active in this studio.')) : - this.props.studioId ? - this.renderMessage(t('This studio doesn\'t exist.')) : - this.renderMessage(t('There are no active rundowns.')) - ) + ( + this.props.rundown ? + : + this.props.studio ? + this.renderMessage(t('There is no rundown active in this studio.')) : + this.props.studioId ? + this.renderMessage(t('This studio doesn\'t exist.')) : + this.renderMessage(t('There are no active rundowns.')) + ) } } @@ -319,8 +318,8 @@ export const PrompterView = translateWithTracker((pro const rundown = Rundowns.findOne(_.extend({ active: true }, { - studioId: studioId - })) + studioId: studioId + })) return { rundown, @@ -357,25 +356,25 @@ export const Prompter = translateWithTracker, IPrompterState> { - constructor (props) { + constructor(props) { super(props) this.state = { subsReady: false } } - componentWillUnmount () { + componentWillUnmount() { super.componentWillUnmount() } - componentWillMount () { + componentWillMount() { - this.subscribe('rundowns', { _id: this.props.rundownId }) - this.subscribe('segments', { rundownId: this.props.rundownId }) - this.subscribe('parts', { rundownId: this.props.rundownId }) - this.subscribe('pieces', { rundownId: this.props.rundownId }) + this.subscribe('rundowns', { _id: this.props.rundownId }) + this.subscribe('segments', { rundownId: this.props.rundownId }) + this.subscribe('parts', { rundownId: this.props.rundownId }) + this.subscribe('pieces', { rundownId: this.props.rundownId }) } - renderPrompterData (prompterData: PrompterData) { + renderPrompterData(prompterData: PrompterData) { let divs: any[] = [] let previousSegmentId = '' @@ -386,8 +385,8 @@ export const Prompter = translateWithTracker - { segment ? segment.name : 'N/A' } + {segment ? segment.name : 'N/A'}
) } else if (line.partId !== previousPartId) { @@ -444,7 +443,7 @@ export const Prompter = translateWithTracker
@@ -477,8 +476,8 @@ export const Prompter = translateWithTracker - -{t('End of script')}- +
+ -{t('End of script')}-
: null }
From 42bbeec9659f6db46d597d7d9da02575bbd44a57 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Thu, 16 May 2019 14:30:05 +0200 Subject: [PATCH 10/30] Removed jQuery from RundownView --- meteor/client/ui/RundownView.tsx | 1407 +++++++++++++++--------------- 1 file changed, 700 insertions(+), 707 deletions(-) diff --git a/meteor/client/ui/RundownView.tsx b/meteor/client/ui/RundownView.tsx index 56f3ec5e18..c25e976419 100644 --- a/meteor/client/ui/RundownView.tsx +++ b/meteor/client/ui/RundownView.tsx @@ -7,7 +7,6 @@ import timer from 'react-timer-hoc' import * as CoreIcon from '@nrk/core-icons/jsx' import { Spinner } from '../lib/Spinner' import * as ClassNames from 'classnames' -import * as $ from 'jquery' import * as _ from 'underscore' import * as Escape from 'react-escape' import Moment from 'react-moment' @@ -57,7 +56,7 @@ import { ClipTrimDialog } from './ClipTrimPanel/ClipTrimDialog' import { NoteType } from '../../lib/api/notes' import { PubSub } from '../../lib/api/pubsub' -type WrappedShelf = ShelfBase & { getWrappedInstance (): ShelfBase } +type WrappedShelf = ShelfBase & { getWrappedInstance(): ShelfBase } interface IKeyboardFocusMarkerState { inFocus: boolean @@ -67,7 +66,7 @@ interface IKeyboardFocusMarkerProps { class KeyboardFocusMarker extends React.Component { keyboardFocusInterval: number - constructor (props: IKeyboardFocusMarkerProps) { + constructor(props: IKeyboardFocusMarkerProps) { super(props) this.state = { @@ -75,14 +74,18 @@ class KeyboardFocusMarker extends React.Component { @@ -94,7 +97,7 @@ class KeyboardFocusMarker extends React.Component, ITimingWarningState> { private REHEARSAL_MARGIN = 1 * 60 * 1000 - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = {} } - componentDidUpdate (prevProps: ITimingWarningProps) { + componentDidUpdate(prevProps: ITimingWarningProps) { if ((this.props.rundown.active && !prevProps.rundown.active && this.props.rundown.rehearsal) || (this.props.rundown.rehearsal !== prevProps.rundown.rehearsal)) { this.setState({ @@ -163,7 +166,7 @@ const WarningDisplay = translate()(timer(5000)( this.props.oneMinuteBeforeAction(e) } - render () { + render() { const { t } = this.props if (!this.props.rundown) return null @@ -216,97 +219,97 @@ export enum RundownViewKbdShortcuts { RUNDOWN_NEXT_UP = 'shift+f10', RUNDOWN_DISABLE_NEXT_ELEMENT = 'g', RUNDOWN_UNDO_DISABLE_NEXT_ELEMENT = 'shift+g', - RUNDOWN_LOG_ERROR = 'backspace' + RUNDOWN_LOG_ERROR = 'backspace' } const TimingDisplay = translate()(withTiming()( -class extends React.Component>> { - render () { - const { t } = this.props + class extends React.Component>> { + render() { + const { t } = this.props - if (!this.props.rundown) return null - - return ( -
- { this.props.rundown.startedPlayback && (this.props.rundown.active && !this.props.rundown.rehearsal) ? - - {t('Started')} - - : - - {t('Planned Start')} - - - } - { this.props.rundown.startedPlayback && (this.props.rundown.active && !this.props.rundown.rehearsal) ? - this.props.rundown.expectedStart && + if (!this.props.rundown) return null + + return ( +
+ {this.props.rundown.startedPlayback && (this.props.rundown.active && !this.props.rundown.rehearsal) ? + + {t('Started')} + + : + + {t('Planned Start')} + + + } + {this.props.rundown.startedPlayback && (this.props.rundown.active && !this.props.rundown.rehearsal) ? + this.props.rundown.expectedStart && {this.props.rundown.name} {RundownUtils.formatDiffToTimecode(this.props.rundown.startedPlayback - this.props.rundown.expectedStart, true, false, true, true, true)} - : - this.props.rundown.expectedStart && + : + this.props.rundown.expectedStart && this.props.rundown.expectedStart })}> {this.props.rundown.name} {RundownUtils.formatDiffToTimecode(getCurrentTime() - this.props.rundown.expectedStart, true, false, true, true, true)} - } - - - {this.props.rundown.holdState && this.props.rundown.holdState !== RundownHoldState.COMPLETE ? -
{t('Hold')}
- : null } - - { this.props.rundown.expectedDuration ? - ( - {this.props.rundown.expectedStart && this.props.rundown.expectedDuration && - - {t('Planned End')} - - - } - {this.props.rundown.expectedStart && this.props.rundown.expectedDuration && - - {RundownUtils.formatDiffToTimecode(getCurrentTime() - (this.props.rundown.expectedStart + this.props.rundown.expectedDuration), true, true, true)} - - } - {this.props.rundown.expectedDuration && - (this.props.rundown.expectedDuration || 0) - })}> - {t('Diff')} - {RundownUtils.formatDiffToTimecode((this.props.timingDurations.asPlayedRundownDuration || 0) - this.props.rundown.expectedDuration, true, false, true, true, true, undefined, true)} - + + + {this.props.rundown.holdState && this.props.rundown.holdState !== RundownHoldState.COMPLETE ? +
{t('Hold')}
+ : null } - ) : - ( - {this.props.timingDurations ? - - {t('Expected End')} - - : - null - } - {this.props.timingDurations ? - (this.props.timingDurations.totalRundownDuration || 0) - })}> - {t('Diff')} - {RundownUtils.formatDiffToTimecode((this.props.timingDurations.asPlayedRundownDuration || 0) - (this.props.timingDurations.totalRundownDuration || 0), true, false, true, true, true, undefined, true)} - : - null - } - ) - } -
- ) - } -})) + + {this.props.rundown.expectedDuration ? + ( + {this.props.rundown.expectedStart && this.props.rundown.expectedDuration && + + {t('Planned End')} + + + } + {this.props.rundown.expectedStart && this.props.rundown.expectedDuration && + + {RundownUtils.formatDiffToTimecode(getCurrentTime() - (this.props.rundown.expectedStart + this.props.rundown.expectedDuration), true, true, true)} + + } + {this.props.rundown.expectedDuration && + (this.props.rundown.expectedDuration || 0) + })}> + {t('Diff')} + {RundownUtils.formatDiffToTimecode((this.props.timingDurations.asPlayedRundownDuration || 0) - this.props.rundown.expectedDuration, true, false, true, true, true, undefined, true)} + + } + ) : + ( + {this.props.timingDurations ? + + {t('Expected End')} + + : + null + } + {this.props.timingDurations ? + (this.props.timingDurations.totalRundownDuration || 0) + })}> + {t('Diff')} + {RundownUtils.formatDiffToTimecode((this.props.timingDurations.asPlayedRundownDuration || 0) - (this.props.timingDurations.totalRundownDuration || 0), true, false, true, true, true, undefined, true)} + : + null + } + ) + } +
+ ) + } + })) interface HotkeyDefinition { key: string @@ -327,6 +330,13 @@ interface IRundownHeaderState { errorMessage?: string } +function preventDefault(e: Event): void { + e.preventDefault() + e.stopImmediatePropagation() + e.stopPropagation() +} + + const RundownHeader = translate()(class extends React.Component, IRundownHeaderState> { bindKeys: Array<{ key: string, @@ -336,7 +346,7 @@ const RundownHeader = translate()(class extends React.Component = [] - constructor (props: Translated) { + constructor(props: Translated) { super(props) const { t } = props @@ -347,51 +357,51 @@ const RundownHeader = translate()(class extends React.Component { - e.preventDefault() - e.stopImmediatePropagation() - e.stopPropagation() - } + componentDidMount() { _.each(this.bindKeys, (k) => { const method = k.global ? mousetrapHelper.bindGlobal : mousetrapHelper.bind let lastUsed = Date.now() @@ -483,7 +484,7 @@ const RundownHeader = translate()(class extends React.Component { if (k.up) { mousetrapHelper.unbind(k.key, 'RundownHeader', 'keyup') @@ -592,10 +593,10 @@ const RundownHeader = translate()(class extends React.Component (this.props.rundown.expectedStart || 0) } - rundownShouldHaveEnded () { + rundownShouldHaveEnded() { return getCurrentTime() > (this.props.rundown.expectedStart || 0) + (this.props.rundown.expectedDuration || 0) } @@ -797,10 +798,10 @@ const RundownHeader = translate()(class extends React.Component { Tracker.flush() @@ -811,7 +812,7 @@ const RundownHeader = translate()(class extends React.Component
- { this.props.rundown && } + {this.props.rundown && }
@@ -958,9 +959,9 @@ interface IState { } export enum RundownViewEvents { - 'rewindsegments' = 'sofie:rundownRewindSegments', - 'goToLiveSegment' = 'sofie:goToLiveSegment', - 'goToTop' = 'sofie:goToTop' + 'rewindsegments' = 'sofie:rundownRewindSegments', + 'goToLiveSegment' = 'sofie:goToLiveSegment', + 'goToTop' = 'sofie:goToTop' } interface ITrackedProps { @@ -994,422 +995,414 @@ export const RundownView = translateWithTracker(( showStyleBase: rundown && ShowStyleBases.findOne(rundown.showStyleBaseId) } })( -class extends MeteorReactComponent, IState> { + class extends MeteorReactComponent, IState> { + + private bindKeys: Array<{ + key: string, + up?: (e: KeyboardEvent) => any, + down?: (e: KeyboardEvent) => any, + label: string, + global?: boolean + }> = [] + private usedArgumentKeys: Array<{ + key: string, + up?: (e: KeyboardEvent) => any, + down?: (e: KeyboardEvent) => any, + label: string, + global?: boolean + }> = [] + private _inspectorDrawer: WrappedShelf | null + + constructor(props: Translated) { + super(props) - private bindKeys: Array<{ - key: string, - up?: (e: KeyboardEvent) => any, - down?: (e: KeyboardEvent) => any, - label: string, - global?: boolean - }> = [] - private usedArgumentKeys: Array<{ - key: string, - up?: (e: KeyboardEvent) => any, - down?: (e: KeyboardEvent) => any, - label: string, - global?: boolean - }> = [] - private _inspectorDrawer: WrappedShelf | null + const { t } = this.props - constructor (props: Translated) { - super(props) + this.bindKeys = [ + { + key: RundownViewKbdShortcuts.RUNDOWN_GO_TO_LIVE, + up: this.onGoToLiveSegment, + label: t('Go to On Air line'), + global: true + }, + { + key: RundownViewKbdShortcuts.RUNDOWN_REWIND_SEGMENTS, + up: this.onRewindSegments, + label: t('Rewind segments to start'), + global: true + } + ] - const { t } = this.props + this.usedArgumentKeys = [] - this.bindKeys = [ - { - key: RundownViewKbdShortcuts.RUNDOWN_GO_TO_LIVE, - up: this.onGoToLiveSegment, - label: t('Go to On Air line'), - global: true - }, - { - key: RundownViewKbdShortcuts.RUNDOWN_REWIND_SEGMENTS, - up: this.onRewindSegments, - label: t('Rewind segments to start'), - global: true + this.state = { + timeScale: 0.03, + studioMode: getStudioMode(), + contextMenuContext: null, + bottomMargin: '', + followLiveSegments: true, + manualSetAsNext: false, + subsReady: false, + usedHotkeys: _.clone(this.bindKeys).concat([ + // Register additional hotkeys or legend entries + { + key: 'Esc', + label: t('Cancel currently pressed hotkey') + }, + { + key: 'F11', + label: t('Change to fullscreen mode') + } + ]), + isNotificationsCenterOpen: false, + isSupportPanelOpen: false, + isInspectorDrawerExpanded: false, + isClipTrimmerOpen: false, + selectedPiece: undefined } - ] + } - this.usedArgumentKeys = [] + componentWillMount() { + // Subscribe to data: + let rundownId = this.props.rundownId - this.state = { - timeScale: 0.03, - studioMode: getStudioMode(), - contextMenuContext: null, - bottomMargin: '', - followLiveSegments: true, - manualSetAsNext: false, - subsReady: false, - usedHotkeys: _.clone(this.bindKeys).concat([ - // Register additional hotkeys or legend entries - { - key: 'Esc', - label: t('Cancel currently pressed hotkey') - }, - { - key: 'F11', - label: t('Change to fullscreen mode') + this.subscribe(PubSub.rundowns, { + _id: rundownId + }) + this.subscribe(PubSub.segments, { + rundownId: rundownId + }) + this.subscribe(PubSub.parts, { + rundownId: rundownId + }) + this.subscribe(PubSub.pieces, { + rundownId: rundownId + }) + this.subscribe(PubSub.adLibPieces, { + rundownId: rundownId + }) + this.autorun(() => { + let rundown = Rundowns.findOne(rundownId) + if (rundown) { + this.subscribe(PubSub.studios, { + _id: rundown.studioId + }) + this.subscribe(PubSub.showStyleBases, { + _id: rundown.showStyleBaseId + }) + } + }) + this.autorun(() => { + let subsReady = this.subscriptionsReady() + if (subsReady !== this.state.subsReady) { + this.setState({ + subsReady: subsReady + }) } - ]), - isNotificationsCenterOpen: false, - isSupportPanelOpen: false, - isInspectorDrawerExpanded: false, - isClipTrimmerOpen: false, - selectedPiece: undefined + }) } - } - componentWillMount () { - // Subscribe to data: - let rundownId = this.props.rundownId + componentDidMount() { + document.body.classList.add('dark', 'vertical-overflow-only') + window.addEventListener('scroll', this.onWindowScroll) + + _.each(this.bindKeys, (k) => { + const method = k.global ? mousetrap.bindGlobal : mousetrap.bind + if (k.up) { + method(k.key, (e: KeyboardEvent) => { + if (k.up) k.up(e) + }, 'keyup') + method(k.key, (e: KeyboardEvent) => { + preventDefault(e) + }, 'keydown') + } + if (k.down) { + method(k.key, (e: KeyboardEvent) => { + if (k.down) k.down(e) + }, 'keydown') + } + }) - this.subscribe(PubSub.rundowns, { - _id: rundownId - }) - this.subscribe(PubSub.segments, { - rundownId: rundownId - }) - this.subscribe(PubSub.parts, { - rundownId: rundownId - }) - this.subscribe(PubSub.pieces, { - rundownId: rundownId - }) - this.subscribe(PubSub.adLibPieces, { - rundownId: rundownId - }) - this.autorun(() => { - let rundown = Rundowns.findOne(rundownId) - if (rundown) { - this.subscribe(PubSub.studios, { - _id: rundown.studioId - }) - this.subscribe(PubSub.showStyleBases, { - _id: rundown.showStyleBaseId + rundownNotificationHandler.set(this.onRONotificationClick) + + window.addEventListener(RundownViewEvents.goToLiveSegment, this.onGoToLiveSegment) + window.addEventListener(RundownViewEvents.goToTop, this.onGoToTop) + } + + componentDidUpdate(prevProps: IProps & ITrackedProps, prevState: IState) { + if (this.props.rundown && + prevProps.rundown && prevProps.rundown.currentPartId !== this.props.rundown.currentPartId && + this.state.manualSetAsNext) { + + this.setState({ + manualSetAsNext: false, + followLiveSegments: true }) - } - }) - this.autorun(() => { - let subsReady = this.subscriptionsReady() - if (subsReady !== this.state.subsReady) { + } else if (this.props.rundown && + prevProps.rundown && prevProps.rundown.active && !this.props.rundown.active) { this.setState({ - subsReady: subsReady + followLiveSegments: true }) + } else if (this.props.rundown && + prevProps.rundown && !prevProps.rundown.active && this.props.rundown.active && + this.props.rundown.nextPartId) { + scrollToPart(this.props.rundown.nextPartId) } - }) - } - componentDidMount () { - $(document.body).addClass(['dark', 'vertical-overflow-only']) - $(window).on('scroll', this.onWindowScroll) - let preventDefault = (e) => { - e.preventDefault() - e.stopImmediatePropagation() - e.stopPropagation() - } - _.each(this.bindKeys, (k) => { - const method = k.global ? mousetrap.bindGlobal : mousetrap.bind - if (k.up) { - method(k.key, (e: KeyboardEvent) => { - if (k.up) k.up(e) - }, 'keyup') - method(k.key, (e: KeyboardEvent) => { - preventDefault(e) - }, 'keydown') - } - if (k.down) { - method(k.key, (e: KeyboardEvent) => { - if (k.down) k.down(e) - }, 'keydown') + if (typeof this.props.rundown !== typeof this.props.rundown || + (this.props.rundown || { _id: '' })._id !== (prevProps.rundown || { _id: '' })._id || + (this.props.rundown || { active: false }).active !== (prevProps.rundown || { active: false }).active || + this.state.studioMode !== prevState.studioMode) { + if (this.props.rundown && this.props.rundown.active && this.state.studioMode && !getDeveloperMode()) { + window.addEventListener('beforeunload', this.onBeforeUnload) + } else { + window.removeEventListener('beforeunload', this.onBeforeUnload) + } } - }) - - rundownNotificationHandler.set(this.onRONotificationClick) - window.addEventListener(RundownViewEvents.goToLiveSegment, this.onGoToLiveSegment) - window.addEventListener(RundownViewEvents.goToTop, this.onGoToTop) - } - - componentDidUpdate (prevProps: IProps & ITrackedProps, prevState: IState) { - if (this.props.rundown && - prevProps.rundown && prevProps.rundown.currentPartId !== this.props.rundown.currentPartId && - this.state.manualSetAsNext) { - - this.setState({ - manualSetAsNext: false, - followLiveSegments: true - }) - } else if (this.props.rundown && - prevProps.rundown && prevProps.rundown.active && !this.props.rundown.active) { - this.setState({ - followLiveSegments: true - }) - } else if (this.props.rundown && - prevProps.rundown && !prevProps.rundown.active && this.props.rundown.active && - this.props.rundown.nextPartId) { - scrollToPart(this.props.rundown.nextPartId) - } - - if (typeof this.props.rundown !== typeof this.props.rundown || - (this.props.rundown || { _id: '' })._id !== (prevProps.rundown || { _id: '' })._id || - (this.props.rundown || { active: false }).active !== (prevProps.rundown || { active: false }).active || - this.state.studioMode !== prevState.studioMode) { - if (this.props.rundown && this.props.rundown.active && this.state.studioMode && !getDeveloperMode()) { - $(window).on('beforeunload', this.onBeforeUnload) - } else { - $(window).off('beforeunload', this.onBeforeUnload) + if (typeof this.props.showStyleBase !== typeof prevProps.showStyleBase || + this.props.showStyleBase && this.props.showStyleBase.runtimeArguments) { + this.refreshHotkeys() } } - if (typeof this.props.showStyleBase !== typeof prevProps.showStyleBase || - this.props.showStyleBase && this.props.showStyleBase.runtimeArguments) { - this.refreshHotkeys() - } - } - - refreshHotkeys = () => { - const { t } = this.props - let preventDefault = (e) => { - e.preventDefault() - e.stopImmediatePropagation() - e.stopPropagation() - } - const noOp = (e) => { - preventDefault(e) - } + refreshHotkeys = () => { + const { t } = this.props - this.usedArgumentKeys.forEach((k) => { - if (k.up) { - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keyup') - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') - } - if (k.down) { - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') + const noOp = (e: Event) => { + preventDefault(e) } - }) - this.usedArgumentKeys = [] - - if (this.props.showStyleBase) { - _.each(this.props.showStyleBase.runtimeArguments, (i) => { - const combos = i.hotkeys.split(',') - _.each(combos, (combo: string) => { - const handler = (e: KeyboardEvent) => { - if (this.props.rundown && this.props.rundown.active && this.props.rundown.nextPartId) { - doUserAction(t, e, UserActionAPI.methods.togglePartArgument, [ - this.props.rundown._id, this.props.rundown.nextPartId, i.property, i.value - ]) + + this.usedArgumentKeys.forEach((k) => { + if (k.up) { + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keyup') + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') + } + if (k.down) { + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') + } + }) + this.usedArgumentKeys = [] + + if (this.props.showStyleBase) { + _.each(this.props.showStyleBase.runtimeArguments, (i) => { + const combos = i.hotkeys.split(',') + _.each(combos, (combo: string) => { + const handler = (e: KeyboardEvent) => { + if (this.props.rundown && this.props.rundown.active && this.props.rundown.nextPartId) { + doUserAction(t, e, UserActionAPI.methods.togglePartArgument, [ + this.props.rundown._id, this.props.rundown.nextPartId, i.property, i.value + ]) + } } - } - this.usedArgumentKeys.push({ - up: handler, - key: combo, - label: i.label || '' + this.usedArgumentKeys.push({ + up: handler, + key: combo, + label: i.label || '' + }) + mousetrapHelper.bind(combo, handler, 'keyup', 'RuntimeArguments') + mousetrapHelper.bind(combo, noOp, 'keydown', 'RuntimeArguments') }) - mousetrapHelper.bind(combo, handler, 'keyup', 'RuntimeArguments') - mousetrapHelper.bind(combo, noOp, 'keydown', 'RuntimeArguments') }) - }) + } } - } - onSelectPiece = (piece: PieceUi, e: React.MouseEvent) => { - if (piece && piece.content && (piece.content as VTContent).editable && - ((((piece.content as VTContent).editable as VTEditableParameters).editorialDuration !== undefined) || - ((piece.content as VTContent).editable as VTEditableParameters).editorialStart !== undefined)) { - this.setState({ - isClipTrimmerOpen: true, - selectedPiece: piece + onSelectPiece = (piece: PieceUi, e: React.MouseEvent) => { + if (piece && piece.content && (piece.content as VTContent).editable && + ((((piece.content as VTContent).editable as VTEditableParameters).editorialDuration !== undefined) || + ((piece.content as VTContent).editable as VTEditableParameters).editorialStart !== undefined)) { + this.setState({ + isClipTrimmerOpen: true, + selectedPiece: piece - }) + }) + } } - } - componentWillUnmount () { - this._cleanUp() - $(document.body).removeClass(['dark', 'vertical-overflow-only']) - $(window).off('scroll', this.onWindowScroll) - $(window).off('beforeunload', this.onBeforeUnload) + componentWillUnmount() { + this._cleanUp() + document.body.classList.remove('dark', 'vertical-overflow-only') + window.removeEventListener('scroll', this.onWindowScroll) + window.removeEventListener('beforeunload', this.onBeforeUnload) - _.each(this.bindKeys, (k) => { - if (k.up) { - mousetrap.unbind(k.key, 'keyup') - mousetrap.unbind(k.key, 'keydown') - } - if (k.down) { - mousetrap.unbind(k.key, 'keydown') - } - }) + _.each(this.bindKeys, (k) => { + if (k.up) { + mousetrap.unbind(k.key, 'keyup') + mousetrap.unbind(k.key, 'keydown') + } + if (k.down) { + mousetrap.unbind(k.key, 'keydown') + } + }) - _.each(this.usedArgumentKeys, (k) => { - if (k.up) { - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keyup') - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') - } - if (k.down) { - mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') - } - }) + _.each(this.usedArgumentKeys, (k) => { + if (k.up) { + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keyup') + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') + } + if (k.down) { + mousetrapHelper.unbind(k.key, 'RuntimeArguments', 'keydown') + } + }) - window.removeEventListener(RundownViewEvents.goToLiveSegment, this.onGoToLiveSegment) - window.removeEventListener(RundownViewEvents.goToTop, this.onGoToTop) - } + window.removeEventListener(RundownViewEvents.goToLiveSegment, this.onGoToLiveSegment) + window.removeEventListener(RundownViewEvents.goToTop, this.onGoToTop) + } - onBeforeUnload = (e: any) => { - const { t } = this.props + onBeforeUnload = (e: any) => { + const { t } = this.props - e.preventDefault() - e.returnValue = t('This rundown is now active. Are you sure you want to exit this screen?') + e.preventDefault() + e.returnValue = t('This rundown is now active. Are you sure you want to exit this screen?') - return t('This rundown is now active. Are you sure you want to exit this screen?') - } + return t('This rundown is now active. Are you sure you want to exit this screen?') + } - onRewindSegments = () => { - window.dispatchEvent(new Event(RundownViewEvents.rewindsegments)) - } + onRewindSegments = () => { + window.dispatchEvent(new Event(RundownViewEvents.rewindsegments)) + } - onTimeScaleChange = (timeScaleVal) => { - if (Number.isFinite(timeScaleVal) && timeScaleVal > 0) { - this.setState({ - timeScale: timeScaleVal - }) + onTimeScaleChange = (timeScaleVal) => { + if (Number.isFinite(timeScaleVal) && timeScaleVal > 0) { + this.setState({ + timeScale: timeScaleVal + }) + } } - } - onSegmentScroll = () => { - if (this.state.followLiveSegments && this.props.rundown && this.props.rundown.active) { - this.setState({ - followLiveSegments: false - }) + onSegmentScroll = () => { + if (this.state.followLiveSegments && this.props.rundown && this.props.rundown.active) { + this.setState({ + followLiveSegments: false + }) + } } - } - onWindowScroll = (e: JQuery.Event) => { - const isAutoScrolling = $(document.body).hasClass('auto-scrolling') - if (this.state.followLiveSegments && !isAutoScrolling && this.props.rundown && this.props.rundown.active) { - this.setState({ - followLiveSegments: false - }) + onWindowScroll = (e: Event) => { + const isAutoScrolling = document.body.classList.contains('auto-scrolling') + if (this.state.followLiveSegments && !isAutoScrolling && this.props.rundown && this.props.rundown.active) { + this.setState({ + followLiveSegments: false + }) + } } - } - onWheel = (e: React.WheelEvent) => { - if (!e.altKey && e.ctrlKey && !e.shiftKey && !e.metaKey && - // @ts-ignore - !window.keyboardModifiers.altRight && - e.deltaY !== 0) { - this.onTimeScaleChange(Math.min(500, this.state.timeScale * (1 + 0.001 * (e.deltaY * -1)))) - e.preventDefault() + onWheel = (e: React.WheelEvent) => { + if (!e.altKey && e.ctrlKey && !e.shiftKey && !e.metaKey && + // @ts-ignore + !window.keyboardModifiers.altRight && + e.deltaY !== 0) { + this.onTimeScaleChange(Math.min(500, this.state.timeScale * (1 + 0.001 * (e.deltaY * -1)))) + e.preventDefault() + } } - } - onGoToTop = () => { - scrollToPosition(0) + onGoToTop = () => { + scrollToPosition(0) - Meteor.setTimeout(() => { - this.setState({ - followLiveSegments: true - }) - }, 400) - } - onGoToLiveSegment = () => { - if (this.props.rundown && this.props.rundown.active && !this.props.rundown.currentPartId && - this.props.rundown.nextPartId) { - this.setState({ - followLiveSegments: true - }) - scrollToPart(this.props.rundown.nextPartId) - // allow for the scroll to finish Meteor.setTimeout(() => { this.setState({ followLiveSegments: true }) - window.dispatchEvent(new Event(RundownViewEvents.rewindsegments)) }, 400) - } else { + } + onGoToLiveSegment = () => { + if (this.props.rundown && this.props.rundown.active && !this.props.rundown.currentPartId && + this.props.rundown.nextPartId) { + this.setState({ + followLiveSegments: true + }) + scrollToPart(this.props.rundown.nextPartId) + // allow for the scroll to finish + Meteor.setTimeout(() => { + this.setState({ + followLiveSegments: true + }) + window.dispatchEvent(new Event(RundownViewEvents.rewindsegments)) + }, 400) + } else { + this.setState({ + followLiveSegments: true + }) + } + } + + onActivate = (isRehearsal: boolean) => { this.setState({ followLiveSegments: true }) } - } - - onActivate = (isRehearsal: boolean) => { - this.setState({ - followLiveSegments: true - }) - } - onContextMenu = (contextMenuContext: any) => { - this.setState({ - contextMenuContext - }) - } + onContextMenu = (contextMenuContext: any) => { + this.setState({ + contextMenuContext + }) + } - onSetNext = (part: Part, e: any, offset?: number, take?: boolean) => { - const { t } = this.props - if (this.state.studioMode && part && part._id && this.props.rundown) { - doUserAction(t, e, UserActionAPI.methods.setNext, [this.props.rundown._id, part._id, offset], (err, res) => { - this.setState({ - manualSetAsNext: true + onSetNext = (part: Part, e: any, offset?: number, take?: boolean) => { + const { t } = this.props + if (this.state.studioMode && part && part._id && this.props.rundown) { + doUserAction(t, e, UserActionAPI.methods.setNext, [this.props.rundown._id, part._id, offset], (err, res) => { + this.setState({ + manualSetAsNext: true + }) + if (!err && take && this.props.rundown) { + doUserAction(t, e, UserActionAPI.methods.take, [this.props.rundown._id]) + } }) - if (!err && take && this.props.rundown) { - doUserAction(t, e, UserActionAPI.methods.take, [this.props.rundown._id]) - } - }) + } } - } - onPieceDoubleClick = (item: PieceUi, e: React.MouseEvent) => { - const { t } = this.props - if (this.state.studioMode && item && item._id && this.props.rundown && this.props.rundown.currentPartId) { - doUserAction(t, e, UserActionAPI.methods.pieceTakeNow, [this.props.rundown._id, this.props.rundown.currentPartId, item._id]) + onPieceDoubleClick = (item: PieceUi, e: React.MouseEvent) => { + const { t } = this.props + if (this.state.studioMode && item && item._id && this.props.rundown && this.props.rundown.currentPartId) { + doUserAction(t, e, UserActionAPI.methods.pieceTakeNow, [this.props.rundown._id, this.props.rundown.currentPartId, item._id]) + } } - } - onRONotificationClick = (e: RONotificationEvent) => { - if (e.sourceLocator) { - let segmentId = e.sourceLocator.segmentId + onRONotificationClick = (e: RONotificationEvent) => { + if (e.sourceLocator) { + let segmentId = e.sourceLocator.segmentId - if (!segmentId) { - if (e.sourceLocator.partId) { - let part = Parts.findOne(e.sourceLocator.partId) - if (part) { - segmentId = part.segmentId + if (!segmentId) { + if (e.sourceLocator.partId) { + let part = Parts.findOne(e.sourceLocator.partId) + if (part) { + segmentId = part.segmentId + } } } - } - if (segmentId) { - scrollToSegment(segmentId) + if (segmentId) { + scrollToSegment(segmentId) + } } } - } - onHeaderNoteClick = (segmentId: string, level: NoteType) => { - NotificationCenter.snoozeAll() - const isOpen = this.state.isNotificationsCenterOpen - this.setState({ - isNotificationsCenterOpen: true - }) - setTimeout(function () { - NotificationCenter.highlightSource(segmentId, level === NoteType.ERROR ? NoticeLevel.CRITICAL : NoticeLevel.WARNING) - }, isOpen ? 1 : 1000) - } + onHeaderNoteClick = (segmentId: string, level: NoteType) => { + NotificationCenter.snoozeAll() + const isOpen = this.state.isNotificationsCenterOpen + this.setState({ + isNotificationsCenterOpen: true + }) + setTimeout(function () { + NotificationCenter.highlightSource(segmentId, level === NoteType.ERROR ? NoticeLevel.CRITICAL : NoticeLevel.WARNING) + }, isOpen ? 1 : 1000) + } - onToggleSupportPanel = (e: React.MouseEvent) => { - this.setState({ - isSupportPanelOpen: !this.state.isSupportPanelOpen - }) - } + onToggleSupportPanel = (e: React.MouseEvent) => { + this.setState({ + isSupportPanelOpen: !this.state.isSupportPanelOpen + }) + } - renderSegments () { - if (this.props.segments) { - return this.props.segments.map((segment, index, array) => { - if ( - this.props.studio && - this.props.rundown && - this.props.showStyleBase - ) { - return + renderSegments() { + if (this.props.segments) { + return this.props.segments.map((segment, index, array) => { + if ( + this.props.studio && + this.props.rundown && + this.props.showStyleBase + ) { + return , IState> { onHeaderNoteClick={(level) => this.onHeaderNoteClick(segment._id, level)} /> - } - }) - } else { - return ( -
- ) + } + }) + } else { + return ( +
+ ) + } } - } - renderSegmentsList () { - const { t } = this.props + renderSegmentsList() { + const { t } = this.props - if (this.props.rundown) { - return ( -
- {this.renderSegments()} -
- ) - } else { - return ( -
- -
- ) + if (this.props.rundown) { + return ( +
+ {this.renderSegments()} +
+ ) + } else { + return ( +
+ +
+ ) + } } - } - - onChangeBottomMargin = (newBottomMargin: string) => { - this.setState({ - bottomMargin: newBottomMargin - }) - } - onRegisterHotkeys = (hotkeys: Array) => { - // @ts-ignore - this.state.usedHotkeys = this.state.usedHotkeys.concat(hotkeys) // we concat directly to the state object member, because we need to - this.setState({ - usedHotkeys: this.state.usedHotkeys - }) - } + onChangeBottomMargin = (newBottomMargin: string) => { + this.setState({ + bottomMargin: newBottomMargin + }) + } - onContextMenuTop = (e: React.MouseEvent): boolean => { - if (!getDeveloperMode()) { - e.preventDefault() - e.stopPropagation() + onRegisterHotkeys = (hotkeys: Array) => { + // @ts-ignore + this.state.usedHotkeys = this.state.usedHotkeys.concat(hotkeys) // we concat directly to the state object member, because we need to + this.setState({ + usedHotkeys: this.state.usedHotkeys + }) } - return false - } - onToggleNotifications = (e: React.MouseEvent) => { - if (!this.state.isNotificationsCenterOpen === true) { - NotificationCenter.snoozeAll() - NotificationCenter.highlightSource(undefined, NoticeLevel.CRITICAL) + onContextMenuTop = (e: React.MouseEvent): boolean => { + if (!getDeveloperMode()) { + e.preventDefault() + e.stopPropagation() + } + return false } - this.setState({ - isNotificationsCenterOpen: !this.state.isNotificationsCenterOpen - }) - } + onToggleNotifications = (e: React.MouseEvent) => { + if (!this.state.isNotificationsCenterOpen === true) { + NotificationCenter.snoozeAll() + NotificationCenter.highlightSource(undefined, NoticeLevel.CRITICAL) + } - onToggleHotkeys = () => { - if (!this.state.isInspectorDrawerExpanded) { this.setState({ - isInspectorDrawerExpanded: true + isNotificationsCenterOpen: !this.state.isNotificationsCenterOpen }) - if (this._inspectorDrawer) { - this._inspectorDrawer.getWrappedInstance().switchTab(ShelfTabs.SYSTEM_HOTKEYS) + } + + onToggleHotkeys = () => { + if (!this.state.isInspectorDrawerExpanded) { + this.setState({ + isInspectorDrawerExpanded: true + }) + if (this._inspectorDrawer) { + this._inspectorDrawer.getWrappedInstance().switchTab(ShelfTabs.SYSTEM_HOTKEYS) + } + } else { + this.setState({ + isInspectorDrawerExpanded: false + }) } - } else { - this.setState({ - isInspectorDrawerExpanded: false - }) } - } - onRestartPlayout = (e: React.MouseEvent) => { - const { t } = this.props + onRestartPlayout = (e: React.MouseEvent) => { + const { t } = this.props - if (this.props.studio) { - const attachedPlayoutGateways = PeripheralDevices.find({ - studioId: this.props.studio._id, - connected: true, - type: PeripheralDeviceAPI.DeviceType.PLAYOUT - }).fetch() - if (attachedPlayoutGateways.length === 0) { - NotificationCenter.push(new Notification(undefined, NoticeLevel.CRITICAL, t('There are no Playout\xa0Gateways connected and attached to this studio. Please contact the system administrator to start the Playout Gateway.'), 'RundownView')) - return - } - attachedPlayoutGateways.forEach((item) => { - PeripheralDevicesAPI.restartDevice(item, e).then(() => { - NotificationCenter.push(new Notification(undefined, NoticeLevel.NOTIFICATION, t('Playout\xa0Gateway "{{playoutDeviceName}}" is now restarting.', { playoutDeviceName: item.name }), 'RundownView')) - }).catch(() => { - NotificationCenter.push(new Notification(undefined, NoticeLevel.CRITICAL, t('Could not restart Playout\xa0Gateway "{{playoutDeviceName}}".', { playoutDeviceName: item.name }), 'RundownView')) + if (this.props.studio) { + const attachedPlayoutGateways = PeripheralDevices.find({ + studioId: this.props.studio._id, + connected: true, + type: PeripheralDeviceAPI.DeviceType.PLAYOUT + }).fetch() + if (attachedPlayoutGateways.length === 0) { + NotificationCenter.push(new Notification(undefined, NoticeLevel.CRITICAL, t('There are no Playout\xa0Gateways connected and attached to this studio. Please contact the system administrator to start the Playout Gateway.'), 'RundownView')) + return + } + attachedPlayoutGateways.forEach((item) => { + PeripheralDevicesAPI.restartDevice(item, e).then(() => { + NotificationCenter.push(new Notification(undefined, NoticeLevel.NOTIFICATION, t('Playout\xa0Gateway "{{playoutDeviceName}}" is now restarting.', { playoutDeviceName: item.name }), 'RundownView')) + }).catch(() => { + NotificationCenter.push(new Notification(undefined, NoticeLevel.CRITICAL, t('Could not restart Playout\xa0Gateway "{{playoutDeviceName}}".', { playoutDeviceName: item.name }), 'RundownView')) + }) }) - }) + } } - } - onTakeRundownSnapshot = (e: React.MouseEvent) => { - const { t } = this.props - if (this.props.rundown) { - doUserAction(t, e, UserActionAPI.methods.storeRundownSnapshot, [this.props.rundown._id, 'User requested log at' + getCurrentTime()], undefined, - t('A snapshot of the current Running\xa0Order has been created for troubleshooting.')) + onTakeRundownSnapshot = (e: React.MouseEvent) => { + const { t } = this.props + if (this.props.rundown) { + doUserAction(t, e, UserActionAPI.methods.storeRundownSnapshot, [this.props.rundown._id, 'User requested log at' + getCurrentTime()], undefined, + t('A snapshot of the current Running\xa0Order has been created for troubleshooting.')) + } } - } - onDrawerChangeExpanded = (value: boolean) => { - this.setState({ - isInspectorDrawerExpanded: value - }) - } + onDrawerChangeExpanded = (value: boolean) => { + this.setState({ + isInspectorDrawerExpanded: value + }) + } - setInspectorDrawer = (isp: WrappedShelf | null) => { - this._inspectorDrawer = isp - } + setInspectorDrawer = (isp: WrappedShelf | null) => { + this._inspectorDrawer = isp + } - onTake = (e: any) => { - const { t } = this.props - if (this.state.studioMode && this.props.rundown) { - doUserAction(t, e, UserActionAPI.methods.take, [this.props.rundown._id]) + onTake = (e: any) => { + const { t } = this.props + if (this.state.studioMode && this.props.rundown) { + doUserAction(t, e, UserActionAPI.methods.take, [this.props.rundown._id]) + } } - } - getStyle () { - return { - 'marginBottom': this.state.bottomMargin + getStyle() { + return { + 'marginBottom': this.state.bottomMargin + } } - } - render () { - const { t } = this.props + render() { + const { t } = this.props - if (this.state.subsReady) { - if ( - this.props.rundown && - this.props.studio && - this.props.showStyleBase - ) { - return ( - -
- - { this.state.studioMode && } - - - - - - - {this.state.isNotificationsCenterOpen && } - - - {this.state.isSupportPanelOpen && - - - - - + if (this.state.subsReady) { + if ( + this.props.rundown && + this.props.studio && + this.props.showStyleBase + ) { + return ( + +
+ + {this.state.studioMode && } + + + + + + + {this.state.isNotificationsCenterOpen && } + + + {this.state.isSupportPanelOpen && + + + + + + } + + + + {this.state.studioMode && + } - - - - { this.state.studioMode && - - } - - - - - - - - - {this.state.isClipTrimmerOpen && this.state.selectedPiece && this.props.studio && - + + this.setState({ isClipTrimmerOpen: false })} + onActivate={this.onActivate} + studioMode={this.state.studioMode} + onRegisterHotkeys={this.onRegisterHotkeys} + inActiveRundownView={this.props.inActiveRundownView} /> + + + + + + {this.state.isClipTrimmerOpen && this.state.selectedPiece && this.props.studio && + this.setState({ isClipTrimmerOpen: false })} /> - } - - {this.renderSegmentsList()} - - { this.props.segments && this.props.segments.length > 0 && } - - - - - - {this.props.rundown && this.props.studio && this.props.showStyleBase && - - } - -
- {// USE IN CASE OF DEBUGGING EMERGENCY + } + + {this.renderSegmentsList()} + + {this.props.segments && this.props.segments.length > 0 && } + + + + + + {this.props.rundown && this.props.studio && this.props.showStyleBase && + + } + +
+ {// USE IN CASE OF DEBUGGING EMERGENCY /* getDeveloperMode() &&
, IState> { pointerEvents: 'none' }}>
*/} - - ) + + ) + } else { + return ( +
+
+

+ { + !this.props.rundown ? + t('This rundown has been unpublished from Sofie.') : + !this.props.studio ? + t('Error: The studio of this Rundown was not found.') : + !this.props.showStyleBase ? + t('Error: The ShowStyle of this Rundown was not found.') : + t('Unknown error') + } +

+

+ ( + + )} /> +

+
+
+ ) + } } else { return ( -
-
-

- { - !this.props.rundown ? - t('This rundown has been unpublished from Sofie.') : - !this.props.studio ? - t('Error: The studio of this Rundown was not found.') : - !this.props.showStyleBase ? - t('Error: The ShowStyle of this Rundown was not found.') : - t('Unknown error') - } -

-

- ( - - )} /> -

-
+
+
) } - } else { - return ( -
- -
- ) } } -} ) From e3a0bc87cef3f54aa34f68ea79a8e3acefd2a9e2 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Thu, 16 May 2019 16:25:11 +0200 Subject: [PATCH 11/30] Removed jQuery from RundownFullscreenControls --- .../RundownView/RundownFullscreenControls.tsx | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/meteor/client/ui/RundownView/RundownFullscreenControls.tsx b/meteor/client/ui/RundownView/RundownFullscreenControls.tsx index 18cbeac519..9cbcded426 100644 --- a/meteor/client/ui/RundownView/RundownFullscreenControls.tsx +++ b/meteor/client/ui/RundownView/RundownFullscreenControls.tsx @@ -1,6 +1,5 @@ import * as _ from 'underscore' import * as React from 'react' -import * as $ from 'jquery' import * as VelocityReact from 'velocity-react' import * as faFastBackward from '@fortawesome/fontawesome-free-solid/faFastBackward' @@ -62,7 +61,7 @@ export class RundownFullscreenControls extends React.Component { } } - constructor (props) { + constructor(props) { super(props) this.state = { @@ -94,7 +93,7 @@ export class RundownFullscreenControls extends React.Component { this.throttledRefreshFullScreenState = _.throttle(this.refreshFullScreenState, 500) } - componentDidUpdate (prevProps: IProps, prevState: IState) { + componentDidUpdate(prevProps: IProps, prevState: IState) { if (this.props.isFollowingOnAir && this.state.onAirHover) { this.setState({ onAirHover: false @@ -107,19 +106,19 @@ export class RundownFullscreenControls extends React.Component { } } - componentDidMount () { - $(window).on('resize', this.throttledRefreshFullScreenState) + componentDidMount() { + window.addEventListener('resize', this.throttledRefreshFullScreenState) } - componentWillUnmount () { - $(window).off('resize', this.throttledRefreshFullScreenState) + componentWillUnmount() { + window.removeEventListener('resize', this.throttledRefreshFullScreenState) } - checkFullScreen () { + checkFullScreen() { // @ts-ignore TypeScript doesn't have vendor-prefixed fullscreen flags return document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen || - (Math.abs(screen.height - window.innerHeight) < 10) || - false // This will return true or false depending on if it's full screen or not. + (Math.abs(screen.height - window.innerHeight) < 10) || + false // This will return true or false depending on if it's full screen or not. } refreshFullScreenState = () => { @@ -184,7 +183,7 @@ export class RundownFullscreenControls extends React.Component { } } - render () { + render() { return (
Date: Tue, 21 May 2019 12:25:13 +0200 Subject: [PATCH 12/30] Removed jQuery from SegmentTimeline renderers --- .../Renderers/CustomLayerItemRenderer.tsx | 30 ++--- .../Renderers/DefaultLayerItemRenderer.tsx | 15 ++- .../Renderers/L3rdSourceRenderer.tsx | 96 ++++++------- .../Renderers/MicSourceRenderer.tsx | 34 ++--- .../Renderers/STKSourceRenderer.tsx | 124 ++++++++--------- .../Renderers/SplitsSourceRenderer.tsx | 34 ++--- .../Renderers/TransitionSourceRenderer.tsx | 40 +++--- .../Renderers/VTSourceRenderer.tsx | 126 +++++++++--------- meteor/client/utils/dimensions.ts | 5 + 9 files changed, 257 insertions(+), 247 deletions(-) create mode 100644 meteor/client/utils/dimensions.ts diff --git a/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx index 45e240b9e6..e87450427d 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx @@ -28,10 +28,10 @@ export interface ICustomLayerItemProps { livePosition: number | null showMiniInspector: boolean itemElement: HTMLDivElement | null - elementPosition: JQueryCoordinates - cursorPosition: JQueryCoordinates + elementPosition: { top: number, left: number } + cursorPosition: { top: number, left: number } cursorTimePosition: number - getItemLabelOffsetLeft?: () => {[key: string]: string} + getItemLabelOffsetLeft?: () => { [key: string]: string } getItemLabelOffsetRight?: () => { [key: string]: string } getItemDuration?: () => number setAnchoredElsWidths?: (rightAnchoredWidth: number, leftAnchoredWidth: number) => void @@ -40,7 +40,7 @@ export interface ISourceLayerItemState { } export class CustomLayerItemRenderer extends React.Component { - getItemLabelOffsetLeft (): { [key: string]: string } { + getItemLabelOffsetLeft(): { [key: string]: string } { if (this.props.getItemLabelOffsetLeft && typeof this.props.getItemLabelOffsetLeft === 'function') { return this.props.getItemLabelOffsetLeft() } else { @@ -48,7 +48,7 @@ export class CustomLayerItemRenderer (this.props.partDuration || 0)) { let time = (this.props.piece.renderedInPoint || 0) + vtContent.sourceDuration - ((this.props.partDuration || 0) as number) @@ -91,7 +91,7 @@ export class CustomLayerItemRenderer - +
: null } - renderContentTrimmed () { + renderContentTrimmed() { const vtContent = this.props.piece.content as VTContent const duration = this.props.partDuration @@ -122,7 +122,7 @@ export class CustomLayerItemRenderer { leftLabel: HTMLSpanElement rightLabel: HTMLSpanElement - constructor (props) { + constructor(props) { super(props) } @@ -22,18 +23,18 @@ export class DefaultLayerItemRenderer extends CustomLayerItemRenderer { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -43,7 +44,7 @@ export class DefaultLayerItemRenderer extends CustomLayerItemRenderer { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } @@ -36,11 +36,11 @@ export const L3rdSourceRenderer = translate()(class extends CustomLayerItemRende this.rightLabel = e } - componentDidMount () { + componentDidMount() { this.updateAnchoredElsWidths() } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -50,7 +50,7 @@ export const L3rdSourceRenderer = translate()(class extends CustomLayerItemRende } } - render () { + render() { const { t } = this.props const noraContent = this.props.piece.content as NoraContent @@ -97,47 +97,47 @@ export const L3rdSourceRenderer = translate()(class extends CustomLayerItemRende } return - - - {this.props.piece.name} - - - - {this.renderInfiniteIcon()} - {this.renderOverflowTimeLabel()} - - -
- { templateName &&
{templateName}{ - templateVariant && {templateVariant} - }
} - - - {properties.map((item) => ( - - - - - ))} - - - - - -
{item.key}{item.value}
- {RundownUtils.formatTimeToShortTime(this.props.piece.renderedInPoint || 0)} - {this.props.piece.infiniteMode ? - ( - (this.props.piece.infiniteMode === PieceLifespan.OutOnNextPart && {t('Until next take')}) || - (this.props.piece.infiniteMode === PieceLifespan.OutOnNextSegment && {t('Until next segment')}) || - (this.props.piece.infiniteMode === PieceLifespan.Infinite && {t('Infinite')}) - ) - : {RundownUtils.formatTimeToShortTime(this.props.piece.renderedDuration || (_.isNumber(this.props.piece.expectedDuration) ? parseFloat(this.props.piece.expectedDuration as any as string) : 0))} - } - {changed && } -
-
- - + + + {this.props.piece.name} + + + + {this.renderInfiniteIcon()} + {this.renderOverflowTimeLabel()} + + +
+ {templateName &&
{templateName}{ + templateVariant && {templateVariant} + }
} + + + {properties.map((item) => ( + + + + + ))} + + + + + +
{item.key}{item.value}
+ {RundownUtils.formatTimeToShortTime(this.props.piece.renderedInPoint || 0)} + {this.props.piece.infiniteMode ? + ( + (this.props.piece.infiniteMode === PieceLifespan.OutOnNextPart && {t('Until next take')}) || + (this.props.piece.infiniteMode === PieceLifespan.OutOnNextSegment && {t('Until next segment')}) || + (this.props.piece.infiniteMode === PieceLifespan.Infinite && {t('Infinite')}) + ) + : {RundownUtils.formatTimeToShortTime(this.props.piece.renderedDuration || (_.isNumber(this.props.piece.expectedDuration) ? parseFloat(this.props.piece.expectedDuration as any as string) : 0))} + } + {changed && } +
+
+ + } }) diff --git a/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx index 552891d271..49a299a155 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx @@ -1,5 +1,4 @@ import * as React from 'react' -import * as $ from 'jquery' import { ScriptContent } from 'tv-automation-sofie-blueprints-integration' @@ -9,6 +8,8 @@ import Moment from 'react-moment' import { CustomLayerItemRenderer, ICustomLayerItemProps } from './CustomLayerItemRenderer' import { translate, InjectedTranslateProps } from 'react-i18next' +import { getElementWidth } from '../../../utils/dimensions' + const BREAK_SCRIPT_BREAKPOINT = 620 const SCRIPT_PART_LENGTH = 250 interface IProps extends ICustomLayerItemProps { @@ -21,7 +22,7 @@ export const MicSourceRenderer = translate()(class extends CustomLayerItemRender itemPosition: number itemWidth: number itemElement: HTMLElement | null - lineItem: JQuery + lineItem: HTMLElement linePosition: number leftLabel: HTMLSpanElement rightLabel: HTMLSpanElement @@ -30,24 +31,24 @@ export const MicSourceRenderer = translate()(class extends CustomLayerItemRender private _forceSizingRecheck: boolean - constructor (props: IProps & InjectedTranslateProps) { + constructor(props: IProps & InjectedTranslateProps) { super(props) } repositionLine = () => { - this.lineItem.css('left', this.linePosition + 'px') + this.lineItem.style.left = this.linePosition + 'px' } refreshLine = () => { if (this.itemElement) { - this.itemPosition = $(this.itemElement).position().left || 0 + this.itemPosition = this.itemElement.offsetLeft const content = this.props.piece.content as ScriptContent let scriptReadTime = 0 if (content && content.sourceDuration) { scriptReadTime = content.sourceDuration * this.props.timeScale this.readTime = content.sourceDuration } else { - scriptReadTime = $(this.itemElement).width() || 0 + scriptReadTime = getElementWidth(this.itemElement) } if (this.itemPosition + scriptReadTime !== this.linePosition) { @@ -65,25 +66,27 @@ export const MicSourceRenderer = translate()(class extends CustomLayerItemRender this.rightLabel = e } - componentDidMount () { + componentDidMount() { // Create line element - this.lineItem = $('
') + this.lineItem = document.createElement('div') + this.lineItem.classList.add('segment-timeline__piece-appendage', 'script-line') this.updateAnchoredElsWidths() if (this.props.itemElement) { this.itemElement = this.props.itemElement - $(this.itemElement).parent().parent().append(this.lineItem) + this.itemElement.parentNode && this.itemElement.parentNode.parentNode && + this.itemElement.parentNode.parentNode.appendChild(this.lineItem) this.refreshLine() } } updateAnchoredElsWidths = () => { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { let _forceSizingRecheck = false if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { @@ -106,7 +109,8 @@ export const MicSourceRenderer = translate()(class extends CustomLayerItemRender } this.itemElement = this.props.itemElement if (this.itemElement) { - $(this.itemElement).parent().parent().append(this.lineItem) + this.itemElement.parentNode && this.itemElement.parentNode.parentNode + && this.itemElement.parentNode.parentNode.appendChild(this.lineItem) this._forceSizingRecheck = true } } @@ -125,12 +129,12 @@ export const MicSourceRenderer = translate()(class extends CustomLayerItemRender } } - componentWillUnmount () { + componentWillUnmount() { // Remove the line element this.lineItem.remove() } - render () { + render() { const { t } = this.props let labelItems = (this.props.piece.name || '').split('||') let begin = labelItems[0] || '' diff --git a/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx index 9ecbea4419..c6230598c0 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import * as $ from 'jquery' +import { getElementWidth } from '../../../utils/dimensions' import * as _ from 'underscore' import { RundownUtils } from '../../../lib/rundown' @@ -60,20 +60,20 @@ export const STKSourceRenderer = translate()(class extends CustomLayerItemRender } } - componentDidMount () { + componentDidMount() { this.updateAnchoredElsWidths() this.scenes = this.getScenes() } updateAnchoredElsWidths = () => { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -124,8 +124,8 @@ export const STKSourceRenderer = translate()(class extends CustomLayerItemRender // add freezes if (metadata && metadata.mediainfo && metadata.mediainfo.freezes) { items = metadata.mediainfo.freezes - .filter((i) => i.start < itemDuration) - .map((i): Anomaly => { return { start: i.start * 1000, end: i.end * 1000, duration: i.duration * 1000 } }) + .filter((i) => i.start < itemDuration) + .map((i): Anomaly => { return { start: i.start * 1000, end: i.end * 1000, duration: i.duration * 1000 } }) } return items } @@ -200,7 +200,7 @@ export const STKSourceRenderer = translate()(class extends CustomLayerItemRender } } - render () { + render() { const { t } = this.props let labelItems = this.props.piece.name.split('||') @@ -225,59 +225,59 @@ export const STKSourceRenderer = translate()(class extends CustomLayerItemRender const vtContent = this.props.piece.content as VTContent return - {this.renderInfiniteItemContentEnded()} - {this.scenes && - this.scenes.map((i) => (i < itemDuration) && (i - seek >= 0) && - )} - {this.freezes && - this.freezes.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && - )} - {this.blacks && - this.blacks.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && - )} - - - {this.begin} - - {(this.begin && this.end === '' && this.props.piece.content && this.props.piece.content.loop) && - (
- -
) - } - {this.renderContentTrimmed()} - - - {(this.end && this.props.piece.content && this.props.piece.content.loop) && - (
- -
) - } - {this.renderInfiniteIcon()} - {this.renderOverflowTimeLabel()} - - {this.end} - - - - {this.getPreviewUrl() ? -
-
: -
-
- {t('File Name')} - {this.props.piece.content && this.props.piece.content.fileName} -
-
- } - - + {this.renderInfiniteItemContentEnded()} + {this.scenes && + this.scenes.map((i) => (i < itemDuration) && (i - seek >= 0) && + )} + {this.freezes && + this.freezes.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && + )} + {this.blacks && + this.blacks.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && + )} + + + {this.begin} + + {(this.begin && this.end === '' && this.props.piece.content && this.props.piece.content.loop) && + (
+ +
) + } + {this.renderContentTrimmed()} + + + {(this.end && this.props.piece.content && this.props.piece.content.loop) && + (
+ +
) + } + {this.renderInfiniteIcon()} + {this.renderOverflowTimeLabel()} + + {this.end} + + + + {this.getPreviewUrl() ? +
+
: +
+
+ {t('File Name')} + {this.props.piece.content && this.props.piece.content.fileName} +
+
+ } + + } }) diff --git a/meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx index 56b9888620..99f1d06d49 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import * as $ from 'jquery' +import { getElementWidth } from '../../../utils/dimensions' import { FloatingInspector } from '../../FloatingInspector' @@ -33,13 +33,13 @@ export class SplitsSourceRenderer extends CustomLayerItemRenderer { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -102,7 +102,7 @@ export class SplitsSourceRenderer extends CustomLayerItemRenderer i.role !== SplitRole.ART).reverse().map((item, index, array) => { return (
{ @@ -134,13 +134,13 @@ export class SplitsSourceRenderer extends CustomLayerItemRenderer 1 && index > 0 && item.type === array[index - 1].type } )} - key={item._id + '-preview'} - style={{ - 'left': ((item.content && item.content.x) * 100).toString() + '%', - 'top': ((item.content && item.content.y) * 100).toString() + '%', - 'width': ((item.content && item.content.scale) * 100).toString() + '%', - 'height': ((item.content && item.content.scale) * 100).toString() + '%' - }}> + key={item._id + '-preview'} + style={{ + 'left': ((item.content && item.content.x) * 100).toString() + '%', + 'top': ((item.content && item.content.y) * 100).toString() + '%', + 'width': ((item.content && item.content.scale) * 100).toString() + '%', + 'height': ((item.content && item.content.scale) * 100).toString() + '%' + }}> {item.role === SplitRole.BOX && (
{item.label}
)} @@ -152,7 +152,7 @@ export class SplitsSourceRenderer extends CustomLayerItemRenderer { - let leftLabelWidth = $(this.leftLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) this.setAnchoredElsWidths(leftLabelWidth, 0) } @@ -36,7 +36,7 @@ export class TransitionSourceRenderer extends CustomLayerItemRenderer, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -57,22 +57,22 @@ export class TransitionSourceRenderer extends CustomLayerItemRenderer - - {this.props.piece.name} - {content && content.icon && !this.state.iconFailed && - - } - - - {content && content.icon && -
- -
- } - - + + {this.props.piece.name} + {content && content.icon && !this.state.iconFailed && + + } + + + {content && content.icon && +
+ +
+ } + + } } diff --git a/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx index 47a0e62fc4..573fcc361e 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx @@ -1,11 +1,11 @@ import * as React from 'react' -import * as $ from 'jquery' import * as _ from 'underscore' import { RundownUtils } from '../../../lib/rundown' import { PieceUi } from '../SegmentTimelineContainer' import { FloatingInspector } from '../../FloatingInspector' +import { getElementWidth } from '../../../utils/dimensions' import * as ClassNames from 'classnames' import { CustomLayerItemRenderer, ICustomLayerItemProps } from './CustomLayerItemRenderer' @@ -32,7 +32,7 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere metadataRev: string | undefined - constructor (props: IProps & InjectedTranslateProps) { + constructor(props: IProps & InjectedTranslateProps) { super(props) this.state = {} @@ -68,7 +68,7 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere } } - componentDidMount () { + componentDidMount() { this.updateAnchoredElsWidths() const metadata = this.props.piece.contentMetaData as MediaObject if (metadata && metadata._rev) { @@ -82,13 +82,13 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere } updateAnchoredElsWidths = () => { - let leftLabelWidth = $(this.leftLabel).width() || 0 - let rightLabelWidth = $(this.rightLabel).width() || 0 + const leftLabelWidth = getElementWidth(this.leftLabel) + const rightLabelWidth = getElementWidth(this.rightLabel) this.setAnchoredElsWidths(leftLabelWidth, rightLabelWidth) } - componentDidUpdate (prevProps: Readonly, prevState: Readonly) { + componentDidUpdate(prevProps: Readonly, prevState: Readonly) { if (super.componentDidUpdate && typeof super.componentDidUpdate === 'function') { super.componentDidUpdate(prevProps, prevState) } @@ -152,8 +152,8 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere // add freezes if (metadata && metadata.mediainfo && metadata.mediainfo.freezes) { items = metadata.mediainfo.freezes - .filter((i) => i.start < itemDuration) - .map((i): Anomaly => { return { start: i.start * 1000, end: i.end * 1000, duration: i.duration * 1000 } }) + .filter((i) => i.start < itemDuration) + .map((i): Anomaly => { return { start: i.start * 1000, end: i.end * 1000, duration: i.duration * 1000 } }) } return items } @@ -228,7 +228,7 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere } } - render () { + render() { const { t } = this.props let labelItems = this.props.piece.name.split('||') @@ -253,59 +253,59 @@ export const VTSourceRenderer = translate()(class extends CustomLayerItemRendere const vtContent = this.props.piece.content as VTContent return - {this.renderInfiniteItemContentEnded()} - {this.state.scenes && - this.state.scenes.map((i) => (i < itemDuration) && (i - seek >= 0) && - )} - {this.state.freezes && - this.state.freezes.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && - )} - {this.state.blacks && - this.state.blacks.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && - )} - - - {this.begin} - - {(this.begin && this.end === '' && vtContent && vtContent.loop) && - (
- -
) - } - {this.renderContentTrimmed()} - - - {(this.end && this.props.piece.content && this.props.piece.content.loop) && - (
- -
) - } - {this.renderInfiniteIcon()} - {this.renderOverflowTimeLabel()} - - {this.end} - - - - {this.getPreviewUrl() ? -
-
: -
-
- {t('File name')} - {this.props.piece.content && this.props.piece.content.fileName} -
-
- } - - + {this.renderInfiniteItemContentEnded()} + {this.state.scenes && + this.state.scenes.map((i) => (i < itemDuration) && (i - seek >= 0) && + )} + {this.state.freezes && + this.state.freezes.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && + )} + {this.state.blacks && + this.state.blacks.map((i) => (i.start < itemDuration) && (i.start - seek >= 0) && + )} + + + {this.begin} + + {(this.begin && this.end === '' && vtContent && vtContent.loop) && + (
+ +
) + } + {this.renderContentTrimmed()} + + + {(this.end && this.props.piece.content && this.props.piece.content.loop) && + (
+ +
) + } + {this.renderInfiniteIcon()} + {this.renderOverflowTimeLabel()} + + {this.end} + + + + {this.getPreviewUrl() ? +
+
: +
+
+ {t('File name')} + {this.props.piece.content && this.props.piece.content.fileName} +
+
+ } + + } }) diff --git a/meteor/client/utils/dimensions.ts b/meteor/client/utils/dimensions.ts new file mode 100644 index 0000000000..47e943eb71 --- /dev/null +++ b/meteor/client/utils/dimensions.ts @@ -0,0 +1,5 @@ +export function getElementWidth(element: HTMLElement): number { + const computedWidth = Number(window.getComputedStyle(element).width) + + return Number.isNaN(computedWidth) ? element.offsetWidth : computedWidth +} From 444cab3f3b9ab3c99943acd6e79a903d432d34bb Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Tue, 21 May 2019 14:11:57 +0200 Subject: [PATCH 13/30] Removed jQuery from SegmentTimeline --- .../ui/SegmentTimeline/SegmentTimeline.tsx | 105 +++++++++--------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx index e4ea9d34ed..2acadaa662 100644 --- a/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx +++ b/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx @@ -4,7 +4,6 @@ import { translate } from 'react-i18next' import * as ClassNames from 'classnames' import * as _ from 'underscore' -import * as $ from 'jquery' import { ContextMenuTrigger } from 'react-contextmenu' import { Rundown, RundownHoldState } from '../../../lib/collections/Rundowns' @@ -94,19 +93,19 @@ const SegmentTimelineZoom = class extends React.Component { return (
{ - constructor (props: IProps) { + constructor(props: IProps) { super(props) } @@ -222,7 +221,7 @@ class SegmentTimelineZoomButtons extends React.Component { this.props.onZoomChange(0.03, e) } - render () { + render() { return (
, IS clientY: number } | undefined = undefined - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = { timelineWidth: 1 @@ -282,7 +281,7 @@ export class SegmentTimelineClass extends React.Component, IS } } - componentDidMount () { + componentDidMount() { setTimeout((function () { if (this.props.isLiveSegment === true && this.props.followLiveSegments === true) { this.scrollToMe() @@ -292,8 +291,8 @@ export class SegmentTimelineClass extends React.Component, IS onTimelineTouchEnd = (e: React.TouchEvent & any) => { if (e.touches.length === 0) { - $(document).off('touchmove', '', this.onTimelineTouchMove) - $(document).off('touchend', '', this.onTimelineTouchEnd) + document.removeEventListener('touchmove', this.onTimelineTouchMove) + document.removeEventListener('touchend', this.onTimelineTouchEnd) this._touchAttached = false } } @@ -317,15 +316,15 @@ export class SegmentTimelineClass extends React.Component, IS onTimelineTouchStart = (e: React.TouchEvent) => { if (e.touches.length === 2) { // expect two touch points if (!this._touchAttached) { - $(document).on('touchmove', this.onTimelineTouchMove) - $(document).on('touchend', this.onTimelineTouchEnd) + document.addEventListener('touchmove', this.onTimelineTouchMove) + document.addEventListener('touchend', this.onTimelineTouchEnd) this._touchAttached = true } this._touchSize = e.touches[1].clientX - e.touches[0].clientX } else if (e.touches.length === 1) { if (!this._touchAttached) { - $(document).on('touchmove', this.onTimelineTouchMove) - $(document).on('touchend', this.onTimelineTouchEnd) + document.addEventListener('touchmove', this.onTimelineTouchMove) + document.addEventListener('touchend', this.onTimelineTouchEnd) this._touchAttached = true } this._lastTouch = { @@ -355,13 +354,13 @@ export class SegmentTimelineClass extends React.Component, IS } } - scrollToMe () { + scrollToMe() { if (scrollToSegment(this.segmentBlock, true)) { this.props.onFollowLiveLine && this.props.onFollowLiveLine(true, {}) } } - componentDidUpdate (prevProps: IProps) { + componentDidUpdate(prevProps: IProps) { if ((prevProps.isLiveSegment === false && this.props.isLiveSegment === true && this.props.followLiveSegments) || (prevProps.followLiveSegments === false && this.props.followLiveSegments === true && this.props.isLiveSegment === true)) { this.scrollToMe() @@ -381,27 +380,27 @@ export class SegmentTimelineClass extends React.Component, IS return ctx } - getSegmentDuration () { + getSegmentDuration() { return (this.props.parts && RundownUtils.getSegmentDuration(this.props.parts)) || 0 } - timelineStyle () { + timelineStyle() { return { 'transform': 'translate3d(-' + Math.floor(this.props.scrollLeft * this.props.timeScale).toString() + 'px, 0, 0.1px)', 'willChange': 'transform' } } - renderLiveLine () { + renderLiveLine() { const { t } = this.props if (this.props.isLiveSegment) { let pixelPostion = Math.floor((this.props.livePosition * this.props.timeScale) - (!this.props.followLiveLine ? (this.props.scrollLeft * this.props.timeScale) : 0)) let lineStyle = { 'left': (this.props.followLiveLine ? - Math.min(pixelPostion, this.props.liveLineHistorySize).toString() : - pixelPostion.toString() - ) + 'px' + Math.min(pixelPostion, this.props.liveLineHistorySize).toString() : + pixelPostion.toString() + ) + 'px' } return [ @@ -417,7 +416,7 @@ export class SegmentTimelineClass extends React.Component, IS key={this.props.segment._id + '-liveline'} style={lineStyle}>
this.props.onFollowLiveLine && this.props.onFollowLiveLine(true, e)}> + onClick={(e) => this.props.onFollowLiveLine && this.props.onFollowLiveLine(true, e)}> {t('On Air')}
, IS } } - renderTimeline () { + renderTimeline() { return {this.props.parts.map((part, index) => { return ( @@ -454,11 +453,11 @@ export class SegmentTimelineClass extends React.Component, IS } - renderEndOfSegment () { + renderEndOfSegment() { return
} - renderOutputLayerControls () { + renderOutputLayerControls() { if (this.props.segment.outputLayers !== undefined) { return _.map(_.values(this.props.segment.outputLayers).sort((a, b) => { return a._rank - b._rank @@ -470,21 +469,21 @@ export class SegmentTimelineClass extends React.Component, IS 'collapsed': this.props.collapsedOutputs[outputLayer._id] === true })}>
this.props.onCollapseOutputToggle && this.props.onCollapseOutputToggle(outputLayer, e)}> - {outputLayer.name} + data-output-id={outputLayer._id} + tabIndex={0} + onClick={(e) => this.props.onCollapseOutputToggle && this.props.onCollapseOutputToggle(outputLayer, e)}> + {outputLayer.name}
{( outputLayer.sourceLayers !== undefined && outputLayer.sourceLayers.filter(i => !i.isHidden).sort((a, b) => a._rank - b._rank) - .map((sourceLayer, index, array) => { - return ( -
- {(array.length === 1 || sourceLayer.name === outputLayer.name) ? ' ' : sourceLayer.name} -
- ) - }) + .map((sourceLayer, index, array) => { + return ( +
+ {(array.length === 1 || sourceLayer.name === outputLayer.name) ? ' ' : sourceLayer.name} +
+ ) + }) )}
) @@ -493,7 +492,7 @@ export class SegmentTimelineClass extends React.Component, IS } } - render () { + render() { let notes: Array = this.props.segmentNotes const { t } = this.props @@ -520,7 +519,7 @@ export class SegmentTimelineClass extends React.Component, IS 'has-guest-items': this.props.hasGuestItems, 'has-remote-items': this.props.hasRemoteItems })} - data-obj-id={this.props.segment._id} ref={this.setSegmentRef}> + data-obj-id={this.props.segment._id} ref={this.setSegmentRef}> , IS }
this.props.onCollapseSegmentToggle && this.props.onCollapseSegmentToggle(e)}> - {this.props.rundown && this.props.parts && this.props.parts.length > 0 && + onClick={(e) => this.props.onCollapseSegmentToggle && this.props.onCollapseSegmentToggle(e)}> + {this.props.rundown && this.props.parts && this.props.parts.length > 0 && - } + }
{this.props.segment.externalId}
{this.renderOutputLayerControls()}
-
+
+ onResize={this.onTimelineResize} />
@@ -612,7 +611,7 @@ export class SegmentTimelineClass extends React.Component, IS + {...this.props} />
) From ba6548a0bb1ebd9b8c37664e0168d502faccee40 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Tue, 21 May 2019 14:12:35 +0200 Subject: [PATCH 14/30] Removed jQuery from SegmentTimelineLine --- .../SegmentTimeline/SegmentTimelineLine.tsx | 164 +++++++++--------- meteor/client/utils/positions.ts | 20 +++ 2 files changed, 104 insertions(+), 80 deletions(-) create mode 100644 meteor/client/utils/positions.ts diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineLine.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimelineLine.tsx index 7b23f351a5..bf3af4324e 100644 --- a/meteor/client/ui/SegmentTimeline/SegmentTimelineLine.tsx +++ b/meteor/client/ui/SegmentTimeline/SegmentTimelineLine.tsx @@ -1,5 +1,4 @@ import * as React from 'react' -import * as $ from 'jquery' import { translate } from 'react-i18next' import * as ClassNames from 'classnames' @@ -25,6 +24,8 @@ import { DEBUG_MODE } from './SegmentTimelineDebugMode' import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData' import { ConfigItemValue } from 'tv-automation-sofie-blueprints-integration' +import { getElementDocumentOffset } from '../../utils/positions' + export const SegmentTimelineLineElementId = 'rundown__segment__line__' interface ISourceLayerProps { @@ -59,10 +60,13 @@ class SourceLayer extends React.Component { private mousePosition = {} getPartContext = (props) => { + const partElement = document.querySelector('#' + SegmentTimelineLineElementId + this.props.part._id) + const partDocumentOffset = getElementDocumentOffset(partElement) + const ctx = { segment: this.props.segment, part: this.props.part, - partDocumentOffset: $('#' + SegmentTimelineLineElementId + this.props.part._id).offset(), + partDocumentOffset, timeScale: this.props.timeScale, mousePosition: this.mousePosition, partStartsAt: this.props.startsAt @@ -79,7 +83,7 @@ class SourceLayer extends React.Component { this.mousePosition = { left: e.pageX, top: e.pageY } } - renderInside () { + renderInside() { if (this.props.layer.pieces !== undefined) { return _.chain(this.props.layer.pieces.filter((piece) => { // filter only pieces belonging to this part @@ -89,36 +93,36 @@ class SourceLayer extends React.Component { (piece.virtual !== true) : false })) - .sortBy((it) => it.renderedInPoint) - .sortBy((it) => it.infiniteMode) - .sortBy((it) => it.cropped) - .map((piece) => { - return ( - it.renderedInPoint) + .sortBy((it) => it.infiniteMode) + .sortBy((it) => it.cropped) + .map((piece) => { + return ( + - ) - }).value() + ) + }).value() } } - render () { + render() { return ( void } class OutputGroup extends React.Component { - renderInside () { + renderInside() { if (this.props.layer.sourceLayers !== undefined) { return this.props.layer.sourceLayers.filter(i => !i.isHidden).sort((a, b) => a._rank - b._rank) - .map((sourceLayer) => { - return - }) + .map((sourceLayer) => { + return + }) } } - render () { + render() { return (
1, 'collapsed': this.props.collapsedOutputs[this.props.layer._id] === true })}> - { DEBUG_MODE && + {DEBUG_MODE &&
{RundownUtils.formatTimeToTimecode(this.props.startsAt)}
@@ -243,7 +247,7 @@ export const SegmentTimelineLine = translate()(withTiming((props })(class SegmentTimelineLine0 extends React.Component>, IState> { private _configValueMemo: { [key: string]: ConfigItemValue } = {} - constructor (props: Translated>) { + constructor(props: Translated>) { super(props) const isLive = (this.props.rundown.currentPartId === this.props.part._id) @@ -256,10 +260,10 @@ export const SegmentTimelineLine = translate()(withTiming((props isDurationSettling: false, liveDuration: isLive ? Math.max( - ( - (startedPlayback && props.timingDurations.partDurations && - (SegmentTimelineLine0.getCurrentLiveLinePosition(props.part) + SegmentTimelineLine0.getLiveLineTimePadding(props.timeScale)) - ) || 0), + ( + (startedPlayback && props.timingDurations.partDurations && + (SegmentTimelineLine0.getCurrentLiveLinePosition(props.part) + SegmentTimelineLine0.getLiveLineTimePadding(props.timeScale)) + ) || 0), props.timingDurations.partDurations ? (props.part.displayDuration || props.timingDurations.partDurations[props.part._id]) : 0 @@ -268,7 +272,7 @@ export const SegmentTimelineLine = translate()(withTiming((props } } - static getDerivedStateFromProps (nextProps: IProps & RundownTiming.InjectedROTimingProps) { + static getDerivedStateFromProps(nextProps: IProps & RundownTiming.InjectedROTimingProps) { const isLive = (nextProps.rundown.currentPartId === nextProps.part._id) const isNext = (nextProps.rundown.nextPartId === nextProps.part._id) @@ -299,11 +303,11 @@ export const SegmentTimelineLine = translate()(withTiming((props }) } - static getLiveLineTimePadding (timeScale) { + static getLiveLineTimePadding(timeScale) { return LIVE_LINE_TIME_PADDING / timeScale } - static getCurrentLiveLinePosition (part: PartUi) { + static getCurrentLiveLinePosition(part: PartUi) { if (part.startedPlayback && part.getLastStartedPlayback()) { if (part.duration) { return part.duration @@ -315,7 +319,7 @@ export const SegmentTimelineLine = translate()(withTiming((props } } - getLayerStyle () { + getLayerStyle() { // this.props.part.expectedDuration || if (this.props.relative) { return { @@ -332,7 +336,7 @@ export const SegmentTimelineLine = translate()(withTiming((props } } - getLineDuration (): number { + getLineDuration(): number { // const part = this.props.part return Math.max(this.state.liveDuration, @@ -343,11 +347,11 @@ export const SegmentTimelineLine = translate()(withTiming((props this.props.part.renderedDuration || 0, this.state.liveDuration, 0) */ } - getPartStartsAt (): number { + getPartStartsAt(): number { return Math.max(0, (this.props.firstPartInSegment && this.props.timingDurations.partDisplayStartsAt && (this.props.timingDurations.partDisplayStartsAt[this.props.part._id] - this.props.timingDurations.partDisplayStartsAt[this.props.firstPartInSegment._id])) || 0) } - isInsideViewport () { + isInsideViewport() { if (this.props.relative || this.state.isLive) { return true } else { @@ -355,7 +359,7 @@ export const SegmentTimelineLine = translate()(withTiming((props } } - renderTimelineOutputGroups (part: PartUi) { + renderTimelineOutputGroups(part: PartUi) { if (this.props.segment.outputLayers !== undefined) { return _.map(_.filter(this.props.segment.outputLayers, (layer) => { return (layer.used) ? true : false @@ -388,15 +392,15 @@ export const SegmentTimelineLine = translate()(withTiming((props getFutureShadeStyle = () => { return { 'width': (Math.min( - Math.max( - 0, - (this.props.livePosition || 0) + SegmentTimelineLine0.getLiveLineTimePadding(this.props.timeScale) - (this.props.part.expectedDuration || this.props.part.renderedDuration || 0)), + Math.max( + 0, + (this.props.livePosition || 0) + SegmentTimelineLine0.getLiveLineTimePadding(this.props.timeScale) - (this.props.part.expectedDuration || this.props.part.renderedDuration || 0)), SegmentTimelineLine0.getLiveLineTimePadding(this.props.timeScale) - ) * this.props.timeScale) + 'px' + ) * this.props.timeScale) + 'px' } } - render () { + render() { const { t } = this.props const isEndOfShow = this.props.isLastSegment && this.props.isLastInSegment && (!this.state.isLive || (this.state.isLive && !this.props.rundown.nextPartId)) @@ -413,7 +417,7 @@ export const SegmentTimelineLine = translate()(withTiming((props id={SegmentTimelineLineElementId + this.props.part._id} style={this.getLayerStyle()} > - {this.props.part.invalid ?
: null } + {this.props.part.invalid ?
: null}
((props {( this.props.part.invalid ? t('Invalid') : - [ - (this.props.autoNextPart || this.props.part.willProbablyAutoNext) && t('Auto') + ' ', - this.state.isNext && t('Next') - ] + [ + (this.props.autoNextPart || this.props.part.willProbablyAutoNext) && t('Auto') + ' ', + this.state.isNext && t('Next') + ] )}
@@ -448,17 +452,17 @@ export const SegmentTimelineLine = translate()(withTiming((props {( this.props.part.invalid ? t('Invalid') : - [ - (this.props.autoNextPart || this.props.part.willProbablyAutoNext) && t('Auto') + ' ', - this.state.isNext && t('Next') - ] + [ + (this.props.autoNextPart || this.props.part.willProbablyAutoNext) && t('Auto') + ' ', + this.state.isNext && t('Next') + ] )}
} - { DEBUG_MODE && + {DEBUG_MODE &&
- {this.props.livePosition} / {this.props.part.startsAt} / {((this.props.timingDurations || { partStartsAt: {} }).partStartsAt || {})[this.props.part._id]} + {this.props.livePosition} / {this.props.part.startsAt} / {((this.props.timingDurations || { partStartsAt: {} }).partStartsAt || {})[this.props.part._id]}
} {this.state.isLive && !this.props.relative && !this.props.autoNextPart && !this.props.part.autoNext && @@ -474,8 +478,8 @@ export const SegmentTimelineLine = translate()(withTiming((props
- { this.props.part.autoNext && t('Auto') + ' ' } - { this.state.isLive && t('Next') } + {this.props.part.autoNext && t('Auto') + ' '} + {this.state.isLive && t('Next')} {!isEndOfShow &&
@@ -500,14 +504,14 @@ export const SegmentTimelineLine = translate()(withTiming((props })} data-obj-id={this.props.part._id} style={this.getLayerStyle()} > - { /* render it empty, just to take up space */ } + { /* render it empty, just to take up space */}
) } } - private ensureHasTrailingSlash (input: string | null): string | null { + private ensureHasTrailingSlash(input: string | null): string | null { if (input) { return (input.substr(-1) === '/') ? input : input + '/' } else { diff --git a/meteor/client/utils/positions.ts b/meteor/client/utils/positions.ts new file mode 100644 index 0000000000..7430a57948 --- /dev/null +++ b/meteor/client/utils/positions.ts @@ -0,0 +1,20 @@ +/** + * Calculates an element's offset from the document top left. This function replicates jQuery's .offset(). + * Allows null as an argument to be able to operate directly on the result of a document.querySelector + * call, even if the selector used does not yield a result. + * + * @param element - the element to calculate offset for + * @returns the element's top left corner position relative to the document + */ +export function getElementDocumentOffset(element: Element | null): { top: number, left: number } | null { + if (!element) { + return null + } + + const { top, left } = element.getBoundingClientRect() + + return { + top: top + window.scrollY, + left: left + window.scrollX + } +} From 68c066e70e402142045f3a8abe31d9f96ed3aac3 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Tue, 21 May 2019 14:12:50 +0200 Subject: [PATCH 15/30] Removed jQuery from SegmentTimelineZoomControls --- .../SegmentTimelineZoomControls.tsx | 92 ++++++++++--------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx index 8aa77512b0..57ea255937 100644 --- a/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx +++ b/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx @@ -1,7 +1,8 @@ import * as elementResizeEvent from 'element-resize-event' import * as React from 'react' import * as ClassNames from 'classnames' -import * as $ from 'jquery' +import { getElementWidth } from '../../utils/dimensions' +import { getElementDocumentOffset } from '../../utils/positions'; interface IPropsHeader { scrollLeft: number @@ -33,7 +34,7 @@ export const SegmentTimelineZoomControls = class extends React.Component { - let selAreaElementWidth = $(this.selAreaElement).width() - // console.log(selAreaElementWidth) + const selAreaElementWidth = getElementWidth(this.selAreaElement) + if (selAreaElementWidth && selAreaElementWidth < this.SMALL_WIDTH_BREAKPOINT) { this.setState({ smallMode: true @@ -59,8 +60,8 @@ export const SegmentTimelineZoomControls = class extends React.Component { - let offset = $(this.parentElement).offset() + outsideZoomAreaClick = (e: Event & any) => { + let offset = getElementDocumentOffset(this.parentElement) if (offset) { this.offsetX = offset.left this.offsetY = offset.top @@ -78,12 +79,12 @@ export const SegmentTimelineZoomControls = class extends React.Component { this.setState({ - width: $(this.parentElement).width() || 1 + width: getElementWidth(this.parentElement) || 1 }) this.checkSmallMode() } - zoomAreaMove = (e: JQuery.Event | TouchEvent & any) => { + zoomAreaMove = (e: Event | TouchEvent & any) => { let percent = 0 if (this._isTouch) { @@ -103,11 +104,11 @@ export const SegmentTimelineZoomControls = class extends React.Component | React.TouchEvent) { + zoomAreaEndMove(e: React.MouseEvent | React.TouchEvent) { if (!this._isTouch) { - $(document).off('mousemove', '', this.zoomAreaMove) + document.removeEventListener('mousemove', this.zoomAreaMove) } else { - $(document).off('touchmove', '', this.zoomAreaMove) + document.removeEventListener('touchmove', this.zoomAreaMove) } this.setState({ @@ -116,24 +117,24 @@ export const SegmentTimelineZoomControls = class extends React.Component | React.TouchEvent, isTouch?: boolean) { + zoomAreaBeginMove(e: React.MouseEvent | React.TouchEvent, isTouch?: boolean) { this._isTouch = !!isTouch let clientX = 0 let clientY = 0 if (!this._isTouch) { - $(document).on('mousemove', this.zoomAreaMove) - $(document).one('mouseup', () => { + document.addEventListener('mousemove', this.zoomAreaMove) + document.addEventListener('mouseup', () => { this.zoomAreaEndMove(e) - }) + }, { once: true }) clientX = (e as React.MouseEvent).clientX clientY = (e as React.MouseEvent).clientY } else { const et = e as React.TouchEvent if (et.touches.length === 1) { - $(document).on('touchmove', this.zoomAreaMove) - $(document).on('touchend', () => { + document.addEventListener('touchmove', this.zoomAreaMove) + document.addEventListener('touchend', () => { this.zoomAreaEndMove(e) }) @@ -144,8 +145,9 @@ export const SegmentTimelineZoomControls = class extends React.Component { + zoomAreaLeftMove = (e: Event & any) => { let begin = Math.max(0, Math.min(1, (e.clientX - this.offsetX) / this.state.width)) let end = (this.props.scrollLeft + this.props.scrollWidth) / this.props.segmentDuration let newScale = this.props.scrollWidth / ((end - begin) * this.props.segmentDuration) * this.props.timeScale @@ -168,24 +170,25 @@ export const SegmentTimelineZoomControls = class extends React.Component) { - $(document).off('mousemove', '', this.zoomAreaLeftMove) + zoomAreaEndLeftMove(e: React.SyntheticEvent) { + document.removeEventListener('mousemove', this.zoomAreaLeftMove) this.setState({ zoomAreaResizeBegin: false }) this.checkSmallMode() } - zoomAreaLeftBeginMove (e: JQuery.Event & any) { + zoomAreaLeftBeginMove(e: Event & any) { // console.log('Left handle') e.preventDefault() e.stopPropagation() - $(document).on('mousemove', this.zoomAreaLeftMove) - $(document).one('mouseup', () => { + document.addEventListener('mousemove', this.zoomAreaLeftMove) + document.addEventListener('mouseup', () => { this.zoomAreaEndLeftMove(e) - }) - let offset = $(this.parentElement).offset() + }, { once: true }) + + let offset = getElementDocumentOffset(this.parentElement) if (offset) { this.offsetX = offset.left this.offsetY = offset.top @@ -195,15 +198,15 @@ export const SegmentTimelineZoomControls = class extends React.Component) { - $(document).off('mousemove', '', this.zoomAreaRightMove) + zoomAreaEndRightMove(e: React.SyntheticEvent) { + document.removeEventListener('mousemove', this.zoomAreaRightMove) this.setState({ zoomAreaResizeEnd: false }) this.checkSmallMode() } - zoomAreaRightMove = (e: JQuery.Event & any) => { + zoomAreaRightMove = (e: Event & any) => { let end = Math.max(0, Math.min(1, (e.clientX - this.offsetX) / this.state.width)) let begin = this.props.scrollLeft / this.props.segmentDuration let newScale = this.props.scrollWidth / ((end - begin) * this.props.segmentDuration) * this.props.timeScale @@ -213,16 +216,17 @@ export const SegmentTimelineZoomControls = class extends React.Component { + document.addEventListener('mousemove', this.zoomAreaRightMove) + document.addEventListener('mousemove', () => { this.zoomAreaEndRightMove(e) - }) - let offset = $(this.parentElement).offset() + }, { once: true }) + + let offset = getElementDocumentOffset(this.parentElement) if (offset) { this.offsetX = offset.left this.offsetY = offset.top @@ -240,18 +244,18 @@ export const SegmentTimelineZoomControls = class extends React.Component
this.outsideZoomAreaClick(e)}>
Date: Tue, 21 May 2019 14:14:48 +0200 Subject: [PATCH 16/30] Removed jQuery from SourceLayerItem --- .../ui/SegmentTimeline/SourceLayerItem.tsx | 111 +++++++++--------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx b/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx index a574440231..1fdacb53e8 100644 --- a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx +++ b/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx @@ -1,6 +1,5 @@ import * as React from 'react' import * as _ from 'underscore' -import * as $ from 'jquery' import { ISourceLayerUi, IOutputLayerUi, @@ -25,6 +24,8 @@ import { doModalDialog, SomeEvent, ModalInputResult } from '../../lib/ModalDialo import { doUserAction } from '../../lib/userAction' import { UserActionAPI } from '../../../lib/api/userActions' import { translate, InjectedTranslateProps } from 'react-i18next' +import { getElementWidth } from '../../utils/dimensions'; +import { getElementDocumentOffset } from '../../utils/positions'; const LEFT_RIGHT_ANCHOR_SPACER = 15 @@ -55,8 +56,8 @@ export interface ISourceLayerItemProps { } interface ISourceLayerItemState { showMiniInspector: boolean - elementPosition: JQueryCoordinates - cursorPosition: JQueryCoordinates + elementPosition: { top: number, left: number } + cursorPosition: { top: number, left: number } scrollLeftOffset: number cursorTimePosition: number elementWidth: number @@ -68,7 +69,7 @@ export const SourceLayerItem = translate()(class extends React.Component { if (this.state.itemElement && this._forceSizingRecheck) { this._forceSizingRecheck = false - const width = $(this.state.itemElement).width() || 0 + const width = getElementWidth(this.state.itemElement) || 0 if (this.state.elementWidth !== width) { this.setState({ elementWidth: width @@ -264,11 +265,11 @@ export const SourceLayerItem = translate()(class extends React.Component + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> case SourceLayerType.VT: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> case SourceLayerType.GRAPHICS: case SourceLayerType.LOWER_THIRD: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> case SourceLayerType.SPLITS: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> case SourceLayerType.LIVE_SPEAK: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> case SourceLayerType.TRANSITION: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> default: return + typeClass={typeClass} + getItemDuration={this.getItemDuration} + getItemLabelOffsetLeft={this.getItemLabelOffsetLeft} + getItemLabelOffsetRight={this.getItemLabelOffsetRight} + setAnchoredElsWidths={this.setAnchoredElsWidths} + {...this.props} {...this.state} /> } } - isInsideViewport () { + isInsideViewport() { if (this.props.relative) { return true } else { @@ -458,7 +459,7 @@ export const SourceLayerItem = translate()(class extends React.Component Date: Tue, 21 May 2019 17:36:40 +0200 Subject: [PATCH 17/30] Removed jQuery from TimelineGrid --- .../ui/SegmentTimeline/TimelineGrid.tsx | 30 +++++++++---------- meteor/client/utils/dimensions.ts | 23 ++++++++++++++ 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx b/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx index 094705c826..7d949a869f 100644 --- a/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx +++ b/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx @@ -1,18 +1,18 @@ import * as elementResizeEvent from 'element-resize-event' import * as React from 'react' -import * as $ from 'jquery' import * as _ from 'underscore' import { RundownUtils } from '../../lib/rundown' import { Settings } from '../../../lib/Settings' +import { getElementWidth, getElementHeight } from '../../utils/dimensions'; // We're cheating a little: Fontface declare class FontFace { loaded: Promise - constructor (font: string, url: string, options: object) + constructor(font: string, url: string, options: object) - load (): void + load(): void } const GRID_FONT_URL = 'url("/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff")' @@ -48,15 +48,15 @@ export class TimelineGrid extends React.Component { this.pixelRatio = devicePixelRatio / backingStoreRatio - this.width = ($(this.canvasElement).innerWidth() || 0) * this.pixelRatio - this.height = ($(this.canvasElement).innerHeight() || 0) * this.pixelRatio + this.width = (this.canvasElement.scrollWidth || 0) * this.pixelRatio + this.height = (this.canvasElement.scrollHeight || 0) * this.pixelRatio this.canvasElement.width = this.width this.canvasElement.height = this.height this.repaint() } if (this.props.onResize) { - this.props.onResize([$(this.parentElement).width() || 1, $(this.parentElement).height() || 1]) + this.props.onResize([getElementWidth(this.parentElement) || 1, getElementHeight(this.parentElement) || 1]) } }, Math.ceil(1000 / 15)) // don't repaint faster than 15 fps @@ -68,11 +68,11 @@ export class TimelineGrid extends React.Component { this.canvasElement = element } - onCanvasResize = (event: JQuery.Event) => { + onCanvasResize = (event: Event) => { this.contextResize() } - ring (value, ringMax) { + ring(value, ringMax) { return (value < 0) ? (ringMax + (value % ringMax)) : value % ringMax } @@ -183,7 +183,7 @@ export class TimelineGrid extends React.Component { } } - render () { + render() { return (
@@ -191,7 +191,7 @@ export class TimelineGrid extends React.Component { ) } - componentDidMount () { + componentDidMount() { // console.log('TimelineGrid mounted, render the grid & attach resize notifiers') this.ctx = this.canvasElement.getContext('2d', { // alpha: false @@ -217,28 +217,28 @@ export class TimelineGrid extends React.Component { }, (fontFace) => { // console.log('Grid font failed to load: ' + fontFace.status) }) - .catch(err => console.log(err)) + .catch(err => console.log(err)) document['fonts'].add(gridFont) } if (this.props.onResize) { - this.props.onResize([$(this.parentElement).width() || 1, $(this.parentElement).height() || 1]) + this.props.onResize([getElementWidth(this.parentElement) || 1, getElementHeight(this.parentElement) || 1]) } } } - shouldComponentUpdate (nextProps, nextState) { + shouldComponentUpdate(nextProps, nextState) { if ((nextProps.timeScale !== this.props.timeScale) || (nextProps.scrollLeft !== this.props.scrollLeft)) { return true } return false } - componentDidUpdate () { + componentDidUpdate() { this.requestRepaint() } - componentWillUnmount () { + componentWillUnmount() { // console.log('Detach resize notifiers') // $(window).off('resize', this.onCanvasResize) diff --git a/meteor/client/utils/dimensions.ts b/meteor/client/utils/dimensions.ts index 47e943eb71..456316d199 100644 --- a/meteor/client/utils/dimensions.ts +++ b/meteor/client/utils/dimensions.ts @@ -3,3 +3,26 @@ export function getElementWidth(element: HTMLElement): number { return Number.isNaN(computedWidth) ? element.offsetWidth : computedWidth } + +/** + * Replicates the behavior of jQuery's height() function. Note that it's only + * really needed to get the height **excluding padding** for inline elements. + * For all other use cases there are properties on the Element itself + * that can be read directly or via window.getComputedStyle. + * + * @param element - the element to calculate height for + * @returns the calculated height of the element excluding padding + */ +export function getElementHeight(element: HTMLElement): number { + const { height, paddingTop, paddingBottom } = window.getComputedStyle(element) + const computedHeight = Number(height) + + if (!Number.isNaN(computedHeight)) { + return computedHeight + } + + const computedPaddingTop = paddingTop ? Number.parseInt(paddingTop, 10) : 0 + const computedPaddingBottom = paddingBottom ? Number.parseInt(paddingBottom, 10) : 0 + + return element.scrollHeight - computedPaddingTop - computedPaddingBottom +} From 9c8adbfbe74c8397503e2fa50e215df2986a328a Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 22 May 2019 11:50:18 +0200 Subject: [PATCH 18/30] Removed jQuery from AdLibPanel --- meteor/client/ui/Shelf/AdLibPanel.tsx | 60 +++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/meteor/client/ui/Shelf/AdLibPanel.tsx b/meteor/client/ui/Shelf/AdLibPanel.tsx index 4502e64dc0..10c98b7245 100644 --- a/meteor/client/ui/Shelf/AdLibPanel.tsx +++ b/meteor/client/ui/Shelf/AdLibPanel.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import * as _ from 'underscore' -import * as $ from 'jquery' +import * as Velocity from 'velocity-animate' import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/react-meteor-data' import { translate } from 'react-i18next' import { Rundown } from '../../../lib/collections/Rundowns' @@ -48,7 +48,7 @@ interface IListViewStateHeader { const AdLibListView = translate()(class extends React.Component, IListViewStateHeader> { table: HTMLTableElement - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = { @@ -57,7 +57,7 @@ const AdLibListView = translate()(class extends React.Component { return ( + /> ) }) } @@ -138,7 +138,7 @@ const AdLibListView = translate()(class extends React.Component @@ -161,7 +161,7 @@ interface IToolbarStateHader { const AdLibPanelToolbar = translate()(class AdLibPanelToolbar extends React.Component, IToolbarStateHader> { searchInput: HTMLInputElement - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = { @@ -188,16 +188,16 @@ const AdLibPanelToolbar = translate()(class AdLibPanelToolbar extends React.Comp this.searchInputChanged() } - render () { + render() { const { t } = this.props return (
- { this.state.searchInputValue !== '' && + ref={this.setSearchInputRef} + placeholder={t('Search...')} + onChange={this.searchInputChanged} /> + {this.state.searchInputValue !== '' &&
@@ -259,8 +259,8 @@ export const AdLibPanel = translateWithTracker((p const sourceLayerLookup: ISourceLayerLookup = ( props.showStyleBase && props.showStyleBase.sourceLayers ? - _.object(_.map(props.showStyleBase.sourceLayers, (item) => [item._id, item])) : - {} + _.object(_.map(props.showStyleBase.sourceLayers, (item) => [item._id, item])) : + {} ) // a hash to store various indices of the used hotkey lists let sourceHotKeyUse = {} @@ -311,7 +311,7 @@ export const AdLibPanel = translateWithTracker((p })(class AdLibPanel extends MeteorReactComponent, IState> { usedHotkeys: Array = [] - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = { @@ -322,7 +322,7 @@ export const AdLibPanel = translateWithTracker((p } } - componentWillMount () { + componentWillMount() { this.subscribe(PubSub.segments, { rundownId: this.props.rundown._id }) @@ -343,7 +343,7 @@ export const AdLibPanel = translateWithTracker((p }) } - componentDidMount () { + componentDidMount() { if (this.props.liveSegment) { this.setState({ selectedSegment: this.props.liveSegment @@ -353,7 +353,7 @@ export const AdLibPanel = translateWithTracker((p this.refreshKeyboardHotkeys() } - componentDidUpdate (prevProps: IProps & ITrackedProps) { + componentDidUpdate(prevProps: IProps & ITrackedProps) { mousetrapHelper.unbindAll(this.usedHotkeys, 'keyup') this.usedHotkeys.length = 0 @@ -366,7 +366,7 @@ export const AdLibPanel = translateWithTracker((p this.refreshKeyboardHotkeys() } - componentWillUnmount () { + componentWillUnmount() { this._cleanUp() mousetrapHelper.unbindAll(this.usedHotkeys, 'keyup') mousetrapHelper.unbindAll(this.usedHotkeys, 'keydown') @@ -374,7 +374,7 @@ export const AdLibPanel = translateWithTracker((p this.usedHotkeys.length = 0 } - refreshKeyboardHotkeys () { + refreshKeyboardHotkeys() { if (!this.props.studioMode) return let preventDefault = (e) => { @@ -453,7 +453,7 @@ export const AdLibPanel = translateWithTracker((p }) } - renderSegmentList () { + renderSegmentList() { return this.props.uiSegments.map((item) => { return (
  • ((p }) } - renderListView () { + renderListView() { // let a = new AdLibPanelToolbar({ - // t: () => {}, - // onFilterChange: () => { console.log('a') } + // t: () => {}, + // onFilterChange: () => { console.log('a') } // }) return ( @@ -488,7 +488,7 @@ export const AdLibPanel = translateWithTracker((p ) } - render () { + render() { if (this.props.visible) { if (!this.props.uiSegments || !this.props.rundown) { return From d4054b0abba4d37e55c17a40f66ba9c3222fb54f Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 22 May 2019 11:55:52 +0200 Subject: [PATCH 19/30] Removed jQuery from Shelf component --- meteor/client/ui/Shelf/Shelf.tsx | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/meteor/client/ui/Shelf/Shelf.tsx b/meteor/client/ui/Shelf/Shelf.tsx index 107f1ca9de..94edc7c717 100644 --- a/meteor/client/ui/Shelf/Shelf.tsx +++ b/meteor/client/ui/Shelf/Shelf.tsx @@ -3,7 +3,6 @@ import { translate } from 'react-i18next' import * as ClassNames from 'classnames' import * as _ from 'underscore' -import * as $ from 'jquery' import * as mousetrap from 'mousetrap' import * as faBars from '@fortawesome/fontawesome-free-solid/faBars' @@ -17,6 +16,7 @@ import { Rundown } from '../../../lib/collections/Rundowns' import { RundownViewKbdShortcuts } from '../RundownView' import { HotkeyHelpPanel } from './HotkeyHelpPanel' import { ShowStyleBase } from '../../../lib/collections/ShowStyleBases' +import { getElementDocumentOffset } from '../../utils/positions'; export enum ShelfTabs { ADLIB = 'adlib', @@ -57,16 +57,16 @@ export class ShelfBase extends React.Component, IState> { x: number y: number } = { - x: 0, - y: 0 - } + x: 0, + y: 0 + } private _mouseOffset: { x: number y: number } = { - x: 0, - y: 0 - } + x: 0, + y: 0 + } private _mouseDown: number private bindKeys: Array<{ @@ -77,7 +77,7 @@ export class ShelfBase extends React.Component, IState> { global?: boolean }> = [] - constructor (props: Translated) { + constructor(props: Translated) { super(props) this.state = { @@ -104,7 +104,7 @@ export class ShelfBase extends React.Component, IState> { ] } - componentDidMount () { + componentDidMount() { let preventDefault = (e) => { e.preventDefault() e.stopImmediatePropagation() @@ -132,7 +132,7 @@ export class ShelfBase extends React.Component, IState> { this.props.onRegisterHotkeys(this.bindKeys) } - componentWillUnmount () { + componentWillUnmount() { _.each(this.bindKeys, (k) => { if (k.up) { mousetrap.unbind(k.key, 'keyup') @@ -144,7 +144,7 @@ export class ShelfBase extends React.Component, IState> { }) } - componentDidUpdate (prevProps: ShelfProps, prevState: IState) { + componentDidUpdate(prevProps: ShelfProps, prevState: IState) { if ((prevProps.isExpanded !== this.props.isExpanded) || (prevState.shelfHeight !== this.state.shelfHeight)) { if (this.props.onChangeBottomMargin && typeof this.props.onChangeBottomMargin === 'function') { // console.log(this.state.expanded, this.getHeight()) @@ -153,12 +153,12 @@ export class ShelfBase extends React.Component, IState> { } } - getHeight (): string { + getHeight(): string { const top = parseFloat(this.state.shelfHeight.substr(0, this.state.shelfHeight.length - 2)) return this.props.isExpanded ? (100 - top).toString() + 'vh' : '0px' } - getTop (newState?: boolean): string | undefined { + getTop(newState?: boolean): string | undefined { return this.state.overrideHeight ? ((this.state.overrideHeight / window.innerHeight) * 100) + 'vh' : ((newState !== undefined ? newState : this.props.isExpanded) ? @@ -167,7 +167,7 @@ export class ShelfBase extends React.Component, IState> { undefined) } - getStyle () { + getStyle() { return this.props.isExpanded ? { 'top': this.getTop(), @@ -248,10 +248,10 @@ export class ShelfBase extends React.Component, IState> { this._mouseStart.x = e.clientX this._mouseStart.y = e.clientY - const handlePosition = $(e.currentTarget).offset() + const handlePosition = getElementDocumentOffset(e.currentTarget) if (handlePosition) { - this._mouseOffset.x = (handlePosition.left - ($('html,body').scrollLeft() || 0)) - this._mouseStart.x - this._mouseOffset.y = (handlePosition.top - ($('html,body').scrollTop() || 0)) - this._mouseStart.y + this._mouseOffset.x = (handlePosition.left - document.body.scrollLeft) - this._mouseStart.x + this._mouseOffset.y = (handlePosition.top - document.body.scrollTop) - this._mouseStart.y } this._mouseDown = Date.now() @@ -261,13 +261,13 @@ export class ShelfBase extends React.Component, IState> { }) } - switchTab (tab: ShelfTabs) { + switchTab(tab: ShelfTabs) { this.setState({ selectedTab: tab }) } - render () { + render() { const { t } = this.props return (
    From 5a229f8f6296c44b11cdb27089517342a722054c Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 22 May 2019 11:58:20 +0200 Subject: [PATCH 20/30] Removed jQuery entry from startup dependency omission list --- meteor/server/coreSystem.ts | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/meteor/server/coreSystem.ts b/meteor/server/coreSystem.ts index e424400e57..10d2c82f1c 100644 --- a/meteor/server/coreSystem.ts +++ b/meteor/server/coreSystem.ts @@ -28,7 +28,7 @@ const PackageInfo = require('../package.json') export { PackageInfo } -function initializeCoreSystem () { +function initializeCoreSystem() { let system = getCoreSystem() if (!system) { // At this point, we probably have a system that is as fresh as it gets @@ -73,9 +73,9 @@ function initializeCoreSystem () { checkDatabaseVersions() } -let blueprints: {[id: string]: true} = {} +let blueprints: { [id: string]: true } = {} -function checkDatabaseVersions () { +function checkDatabaseVersions() { // Core system let databaseSystem = getCoreSystem() @@ -89,7 +89,7 @@ function checkDatabaseVersions () { setSystemStatus('databaseVersion', checkDatabaseVersion(currentVersion, dbVersion, 'to fix, run migration', 'core', 'system database')) // Blueprints: - let blueprintIds: {[id: string]: true} = {} + let blueprintIds: { [id: string]: true } = {} Blueprints.find().forEach((blueprint) => { if (blueprint.code) { blueprintIds[blueprint._id] = true @@ -107,7 +107,7 @@ function checkDatabaseVersions () { messages: [] } - let studioIds: {[studioId: string]: true} = {} + let studioIds: { [studioId: string]: true } = {} ShowStyleBases.find({ blueprintId: blueprint._id }).forEach((showStyleBase) => { @@ -167,7 +167,7 @@ function checkDatabaseVersions () { * @param currentVersion * @param dbVersion */ -function checkDatabaseVersion ( +function checkDatabaseVersion( currentVersion: Version | null, expectVersion: VersionRange | null, fixMessage: string, @@ -197,7 +197,7 @@ function checkDatabaseVersion ( if (!expectV || !currentV) { return { statusCode: StatusCode.BAD, - messages: [ message ] + messages: [message] } } else if (expectV.major !== currentV.major) { return { @@ -222,16 +222,16 @@ function checkDatabaseVersion ( } else { return { statusCode: StatusCode.BAD, - messages: [ message ] + messages: [message] } } - // the expectedVersion may be a proper range, in which case the new semver.SemVer will throw an error, even though the semver.satisfies check would work. + // the expectedVersion may be a proper range, in which case the new semver.SemVer will throw an error, even though the semver.satisfies check would work. } catch (e) { const message = `Version mismatch: ${meName} version: "${currentVersion}" does not satisfy expected version range of ${theyName}: "${expectVersion}"` + (fixMessage ? ` (${fixMessage})` : '') return { statusCode: StatusCode.BAD, - messages: [ message ] + messages: [message] } } } @@ -250,7 +250,7 @@ function checkDatabaseVersion ( } } -function checkBlueprintCompability (blueprint: Blueprint) { +function checkBlueprintCompability(blueprint: Blueprint) { if (!PackageInfo.dependencies) throw new Meteor.Error(500, `Package.dependencies not set`) let systemStatusId = 'blueprintCompability_' + blueprint._id @@ -302,8 +302,8 @@ function checkBlueprintCompability (blueprint: Blueprint) { }) } } -export function getRelevantSystemVersions (): {[name: string]: string} { - const versions: {[name: string]: string} = {} +export function getRelevantSystemVersions(): { [name: string]: string } { + const versions: { [name: string]: string } = {} let dependencies: any = PackageInfo.dependencies if (dependencies) { @@ -334,7 +334,6 @@ export function getRelevantSystemVersions (): {[name: string]: string} { 'i18next-browser-languagedetector', 'i18next-xhr-backend', 'indexof', - 'jquery', 'lottie-web', 'meteor-node-stubs', 'moment', @@ -385,7 +384,7 @@ export function getRelevantSystemVersions (): {[name: string]: string} { } else logger.error(`Core package dependencies missing`) return versions } -function startupMessage () { +function startupMessage() { logger.info(`Core starting up`) logger.info(`Core system version: "${CURRENT_SYSTEM_VERSION}"`) From 1ecf50deb1aecd8a1b9dc96633253526b508b934 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 22 May 2019 12:06:37 +0200 Subject: [PATCH 21/30] Removed superfluous IE compatibility code in PrompterView --- meteor/client/ui/Prompter/PrompterView.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meteor/client/ui/Prompter/PrompterView.tsx b/meteor/client/ui/Prompter/PrompterView.tsx index a253a0ec8b..12e3500d9b 100644 --- a/meteor/client/ui/Prompter/PrompterView.tsx +++ b/meteor/client/ui/Prompter/PrompterView.tsx @@ -171,9 +171,6 @@ export class PrompterViewInner extends MeteorReactComponent { this.triggerCheckCurrentTakeMarkers() } @@ -193,7 +190,7 @@ export class PrompterViewInner extends MeteorReactComponent Date: Wed, 22 May 2019 12:34:37 +0200 Subject: [PATCH 22/30] getElementWidth util now replicates jQuery width() behavior --- meteor/client/utils/dimensions.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/meteor/client/utils/dimensions.ts b/meteor/client/utils/dimensions.ts index 456316d199..7c490996e2 100644 --- a/meteor/client/utils/dimensions.ts +++ b/meteor/client/utils/dimensions.ts @@ -1,7 +1,24 @@ +/** + * Replicates the behavior of jQuery's width() function. Note that it's only + * really needed to get the width **excluding padding** for inline elements. + * For all other use cases there are properties on the Element itself + * that can be read directly or via window.getComputedStyle. + * + * @param element - the element to calculate width for + * @returns the calculated width of the element excluding padding + */ export function getElementWidth(element: HTMLElement): number { - const computedWidth = Number(window.getComputedStyle(element).width) + const { width, paddingLeft, paddingRight } = window.getComputedStyle(element) + const computedWidth = Number(width) + + if (!Number.isNaN(computedWidth)) { + return computedWidth + } + + const computedPaddingLeft = paddingLeft ? Number.parseInt(paddingLeft, 10) : 0 + const computedPaddingRight = paddingRight ? Number.parseInt(paddingRight, 10) : 0 - return Number.isNaN(computedWidth) ? element.offsetWidth : computedWidth + return element.offsetWidth - computedPaddingLeft - computedPaddingRight } /** From 132be9a9a2110635ef75a4f0cdf64ab58716aa7d Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Mon, 27 May 2019 14:25:55 +0200 Subject: [PATCH 23/30] Wrote tests for client position utils --- .../client/__tests__/utils/positions.test.ts | 95 +++++++++++++++++++ meteor/jest.config.js | 44 ++++++--- meteor/package-lock.json | 68 ++++++++++++- meteor/package.json | 2 +- meteor/tsconfig.json | 3 +- 5 files changed, 195 insertions(+), 17 deletions(-) create mode 100644 meteor/client/__tests__/utils/positions.test.ts diff --git a/meteor/client/__tests__/utils/positions.test.ts b/meteor/client/__tests__/utils/positions.test.ts new file mode 100644 index 0000000000..f6282b8bce --- /dev/null +++ b/meteor/client/__tests__/utils/positions.test.ts @@ -0,0 +1,95 @@ +import { getElementDocumentOffset } from '../../utils/positions' + +describe('getElementDocumentOffset', () => { + const emptyRect: ClientRect = { + top: 0, + left: 0, + bottom: 0, + right: 0, + height: 0, + width: 0 + } + + test('should return null for null input', () => { + const actual = getElementDocumentOffset(null) + + expect(actual).toBe(null) + }) + + + describe('{top}', () => { + test('should be 0 when bounding client rect top is 0 and window.scrollY is 0', () => { + Object.defineProperty(window, 'scrollY', { value: 0 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { top: 0 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('top', 0) + }) + + test('should be 20 when bounding client rect top is 20 and window.scrollY is 0', () => { + Object.defineProperty(window, 'scrollY', { value: 0 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { top: 20 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('top', 20) + }) + + test('should be 31 when bounding client rect top is 10 and window.scrollY is 21', () => { + Object.defineProperty(window, 'scrollY', { value: 21 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { top: 10 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('top', 31) + }) + }) + + describe('{left}', () => { + test('should be 0 when bounding client rect left is 0 and window.scrollX is 0', () => { + Object.defineProperty(window, 'scrollY', { value: 0 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { left: 0 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('left', 0) + }) + + test('should be 18 when bounding client rect left is 18 and window.scrollX is 0', () => { + Object.defineProperty(window, 'scrollX', { value: 0 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { left: 18 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('left', 18) + }) + + test('should be 42 when bounding client rect left is 2 and window.scrollX is 40', () => { + Object.defineProperty(window, 'scrollX', { value: 40 }) + const container = document.createElement('div'); + container.getBoundingClientRect = (): ClientRect => { + return Object.assign({}, emptyRect, { left: 2 }) + } + + const actual = getElementDocumentOffset(container) + + expect(actual).toHaveProperty('left', 42) + }) + }) +}) diff --git a/meteor/jest.config.js b/meteor/jest.config.js index 4b8308b72f..131b119e0a 100644 --- a/meteor/jest.config.js +++ b/meteor/jest.config.js @@ -1,4 +1,4 @@ -module.exports = { +const commonConfig = { modulePaths: [ '/node_modules/', '/node_modules/jest-meteor-stubs/lib/', @@ -26,18 +26,13 @@ module.exports = { transform: { '^.+\\.(ts|tsx)$': 'ts-jest' }, - testMatch: [ - '**/__tests__/**/*.(spec|test).(ts|js)', - '!.meteor/*.*' - ], - setupFilesAfterEnv : ['./__mocks__/_setupMocks.ts'], - testEnvironment: 'node', + setupFilesAfterEnv: ['./__mocks__/_setupMocks.ts'], coverageThreshold: { global: { - branches: 0, - functions: 0, - lines: 0, - statements: 0 + branches: 0, + functions: 0, + lines: 0, + statements: 0 } }, coverageDirectory: "./.coverage/", @@ -54,3 +49,30 @@ module.exports = { '/.meteor/' ] } + +module.exports = { + projects: [ + Object.assign({}, commonConfig, { + displayName: 'client', + testMatch: [ + '/client/__tests__/**/*.(spec|test).(ts|js)', + '!.meteor/*.*' + ], + testEnvironment: 'jsdom' + }), Object.assign({}, commonConfig, { + displayName: 'lib', + testMatch: [ + '/lib/__tests__/**/*.(spec|test).(ts|js)', + '!.meteor/*.*' + ], + testEnvironment: 'node' + }), Object.assign({}, commonConfig, { + displayName: 'server', + testMatch: [ + '/server/__tests__/**/*.(spec|test).(ts|js)', + '!.meteor/*.*' + ], + testEnvironment: 'node' + }) + ] +} diff --git a/meteor/package-lock.json b/meteor/package-lock.json index 4efbb70bb5..393bf920b2 100644 --- a/meteor/package-lock.json +++ b/meteor/package-lock.json @@ -1490,9 +1490,9 @@ "dev": true }, "@types/jest": { - "version": "24.0.11", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.11.tgz", - "integrity": "sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==", + "version": "24.0.13", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.13.tgz", + "integrity": "sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==", "dev": true, "requires": { "@types/jest-diff": "*" @@ -9604,6 +9604,37 @@ "requires": { "inherits": "~2.0.1", "readable-stream": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "stream-http": { @@ -9616,6 +9647,37 @@ "readable-stream": "^2.3.3", "to-arraybuffer": "^1.0.0", "xtend": "^4.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "string_decoder": { diff --git a/meteor/package.json b/meteor/package.json index 25487c4632..53914af040 100644 --- a/meteor/package.json +++ b/meteor/package.json @@ -95,7 +95,7 @@ "@types/classnames": "2.2.3", "@types/css-font-loading-module": "0.0.1", "@types/fibers": "0.0.30", - "@types/jest": "^24.0.6", + "@types/jest": "^24.0.13", "@types/meteor": "1.4.21", "@types/mousetrap": "^1.6.0", "@types/node": "^9.6.1", diff --git a/meteor/tsconfig.json b/meteor/tsconfig.json index 15326a12d6..11f6e6e0c4 100644 --- a/meteor/tsconfig.json +++ b/meteor/tsconfig.json @@ -14,8 +14,7 @@ }, "exclude": [ "node_modules", - "**/__tests__/**/*", "**/__mocks__/**/*", "**/.coverage/**/*" ] -} +} \ No newline at end of file From 88feb721fb5bfe107ba2e7d6c261bab7ee132c3f Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Mon, 27 May 2019 15:40:54 +0200 Subject: [PATCH 24/30] Tests for client/utils/dimensions --- .../client/__tests__/utils/dimensions.test.ts | 70 ++++++++++++ meteor/package-lock.json | 107 ++++++++++++++++++ meteor/package.json | 2 + 3 files changed, 179 insertions(+) create mode 100644 meteor/client/__tests__/utils/dimensions.test.ts diff --git a/meteor/client/__tests__/utils/dimensions.test.ts b/meteor/client/__tests__/utils/dimensions.test.ts new file mode 100644 index 0000000000..18630282b9 --- /dev/null +++ b/meteor/client/__tests__/utils/dimensions.test.ts @@ -0,0 +1,70 @@ +import { getElementWidth, getElementHeight } from '../../utils/dimensions' +import { createSandbox } from 'sinon' + +const sandbox = createSandbox() + +describe('client/utils/dimensions', () => { + let getComputedStyle + + beforeEach(() => { + getComputedStyle = sandbox.stub(window, 'getComputedStyle') + }) + + afterEach(() => { + sandbox.restore() + }) + + describe('getElementWidth', () => { + test('returns width from getComputedStyle when it has a numeric value', () => { + const expected = 20; + const element = document.createElement('div'); + getComputedStyle.withArgs(element).returns({ width: expected }) + + const actual = getElementWidth(element) + + expect(actual).toEqual(expected) + }) + + test('returns element.offsetWidth - computed horizontal padding when computed width is auto', () => { + const paddingLeft = 10 + const paddingRight = 15 + const offsetWidth = 63 + const expected = offsetWidth - paddingLeft - paddingRight + + const element = document.createElement('div'); + Object.defineProperty(element, 'offsetWidth', { value: offsetWidth }) + getComputedStyle.withArgs(element).returns({ width: 'auto', paddingLeft, paddingRight }) + + const actual = getElementWidth(element) + + expect(actual).toEqual(expected) + }) + }) + + describe('getElementHeight', () => { + test('returns height from getComputedStyle when it has a numeric value', () => { + const expected = 20; + const element = document.createElement('div'); + getComputedStyle.withArgs(element).returns({ height: expected }) + + const actual = getElementHeight(element) + + expect(actual).toEqual(expected) + }) + + test('returns element.scrollHeight - computed vertical padding when computed height is auto', () => { + const paddingTop = 8 + const paddingBottom = 9 + const scrollHeight = 37 + const expected = scrollHeight - paddingTop - paddingBottom + + const element = document.createElement('div'); + Object.defineProperty(element, 'scrollHeight', { value: scrollHeight }) + getComputedStyle.withArgs(element).returns({ height: 'auto', paddingTop, paddingBottom }) + + const actual = getElementHeight(element) + + expect(actual).toEqual(expected) + }) + }) +}) diff --git a/meteor/package-lock.json b/meteor/package-lock.json index 393bf920b2..323c058c33 100644 --- a/meteor/package-lock.json +++ b/meteor/package-lock.json @@ -1273,6 +1273,42 @@ "resolved": "https://registry.npmjs.org/@nrk/core-icons/-/core-icons-3.5.0.tgz", "integrity": "sha512-oNvcc/bGG4XjgXyBZKf1HLhzV0vc8cptdxoZyOURLpAWAFXtt50DQHFMwV7N+Z/mEUOE4pDZvZi+D+IJ8kvepQ==" }, + "@sinonjs/commons": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz", + "integrity": "sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/formatio": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz", + "integrity": "sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "@sinonjs/samsam": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz", + "integrity": "sha512-wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.0.2", + "array-from": "^2.1.1", + "lodash": "^4.17.11" + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", + "dev": true + }, "@slack/client": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/@slack/client/-/client-4.8.0.tgz", @@ -1657,6 +1693,12 @@ "@types/node": "*" } }, + "@types/sinon": { + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.0.12.tgz", + "integrity": "sha512-fo0MWpVPSUrnZZhp9wyu+hhI3VJ9+Jhs+PWrokBTg3d2ryNPDOAWF1csIhQuYWBTn7KdZzXpRgpX2o6cwOlPWg==", + "dev": true + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", @@ -2178,6 +2220,12 @@ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, "array-ify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", @@ -8670,6 +8718,12 @@ "verror": "1.10.0" } }, + "just-extend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz", + "integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==", + "dev": true + }, "keycode": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", @@ -8855,6 +8909,12 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=" }, + "lolex": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.0.1.tgz", + "integrity": "sha512-UHuOBZ5jjsKuzbB/gRNNW8Vg8f00Emgskdq2kvZxgBJCS0aqquAuXai/SkWORlKeZEiNQWZjFZOqIUcH9LqKCw==", + "dev": true + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -9991,6 +10051,27 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "nise": { + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz", + "integrity": "sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==", + "dev": true, + "requires": { + "@sinonjs/formatio": "^3.1.0", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^2.3.2", + "path-to-regexp": "^1.7.0" + }, + "dependencies": { + "lolex": { + "version": "2.7.5", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz", + "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==", + "dev": true + } + } + }, "nlf": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/nlf/-/nlf-1.4.3.tgz", @@ -12073,6 +12154,32 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "sinon": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.3.2.tgz", + "integrity": "sha512-thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.1", + "diff": "^3.5.0", + "lolex": "^4.0.1", + "nise": "^1.4.10", + "supports-color": "^5.5.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "sisteransi": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.0.tgz", diff --git a/meteor/package.json b/meteor/package.json index 53914af040..2db17a215d 100644 --- a/meteor/package.json +++ b/meteor/package.json @@ -104,6 +104,7 @@ "@types/react-dom": "^16.0.4", "@types/react-i18next": "^7.8.3", "@types/react-router-dom": "^4.2.6", + "@types/sinon": "^7.0.12", "@types/winston": "^2.3.9", "fibers": "^3.1.1", "i18next-conv": "^8.0.1", @@ -113,6 +114,7 @@ "meteor-promise": "0.8.7", "node-license-validator": "^1.3.0", "opn-cli": "^4.1.0", + "sinon": "^7.3.2", "standard-version": "^5.0.2", "ts-jest": "^24.0.2", "tslint": "^5.16.0", From 9077a6d1c0e77e9b17d0fe9befb4f5f6ea098736 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Fri, 7 Jun 2019 12:16:26 +0200 Subject: [PATCH 25/30] Created an interface for element position to replace JQueryCoordinates --- .../Renderers/CustomLayerItemRenderer.tsx | 5 +++-- meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx | 6 +++--- meteor/client/utils/positions.ts | 10 +++++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx index e87450427d..e7b48c6889 100644 --- a/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx +++ b/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx @@ -11,6 +11,7 @@ import { RundownUtils } from '../../../lib/rundown' import * as faCut from '@fortawesome/fontawesome-free-solid/faCut' import * as FontAwesomeIcon from '@fortawesome/react-fontawesome' import { PieceLifespan, VTContent } from 'tv-automation-sofie-blueprints-integration' +import { Position } from '../../../utils/positions'; export interface ICustomLayerItemProps { mediaPreviewUrl?: string @@ -28,8 +29,8 @@ export interface ICustomLayerItemProps { livePosition: number | null showMiniInspector: boolean itemElement: HTMLDivElement | null - elementPosition: { top: number, left: number } - cursorPosition: { top: number, left: number } + elementPosition: Position + cursorPosition: Position cursorTimePosition: number getItemLabelOffsetLeft?: () => { [key: string]: string } getItemLabelOffsetRight?: () => { [key: string]: string } diff --git a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx b/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx index 1fdacb53e8..4aa7f9600f 100644 --- a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx +++ b/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx @@ -25,7 +25,7 @@ import { doUserAction } from '../../lib/userAction' import { UserActionAPI } from '../../../lib/api/userActions' import { translate, InjectedTranslateProps } from 'react-i18next' import { getElementWidth } from '../../utils/dimensions'; -import { getElementDocumentOffset } from '../../utils/positions'; +import { getElementDocumentOffset, Position } from '../../utils/positions'; const LEFT_RIGHT_ANCHOR_SPACER = 15 @@ -56,8 +56,8 @@ export interface ISourceLayerItemProps { } interface ISourceLayerItemState { showMiniInspector: boolean - elementPosition: { top: number, left: number } - cursorPosition: { top: number, left: number } + elementPosition: Position + cursorPosition: Position scrollLeftOffset: number cursorTimePosition: number elementWidth: number diff --git a/meteor/client/utils/positions.ts b/meteor/client/utils/positions.ts index 7430a57948..5dfd1c4a4e 100644 --- a/meteor/client/utils/positions.ts +++ b/meteor/client/utils/positions.ts @@ -1,3 +1,11 @@ +/** + * Coordinates for an elements upper left corner's position + */ +export interface Position { + top: number, + left: number +} + /** * Calculates an element's offset from the document top left. This function replicates jQuery's .offset(). * Allows null as an argument to be able to operate directly on the result of a document.querySelector @@ -6,7 +14,7 @@ * @param element - the element to calculate offset for * @returns the element's top left corner position relative to the document */ -export function getElementDocumentOffset(element: Element | null): { top: number, left: number } | null { +export function getElementDocumentOffset(element: Element | null): Position | null { if (!element) { return null } From f6ced5c3b21c42b4da12ea3c342172625ecc6e87 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Fri, 7 Jun 2019 12:22:10 +0200 Subject: [PATCH 26/30] Remove jQuery from SegmentTimelineContainer --- meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx index 92b5b47a3c..db84776c0b 100644 --- a/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx +++ b/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx @@ -21,6 +21,7 @@ import { ShowStyleBase } from '../../../lib/collections/ShowStyleBases' import { SpeechSynthesiser } from '../../lib/speechSynthesis' import { getSpeakingMode } from '../../lib/localStorage' import { NoteType, PartNote } from '../../../lib/api/notes' +import { getElementWidth } from '../../utils/dimensions'; export interface SegmentUi extends Segment { /** Output layers available in the installation used by this segment */ @@ -343,7 +344,7 @@ export const SegmentTimelineContainer = withTracker i._id)) || 1)) + if (typeof this.props.onTimeScaleChange === 'function') this.props.onTimeScaleChange((getElementWidth(this.timelineDiv) || 1) / (computeSegmentDuration(this.context.durations, this.props.parts.map(i => i._id)) || 1)) if (typeof this.props.onSegmentScroll === 'function') this.props.onSegmentScroll() } updateSpeech () { From f04360ce6af2b663b516e2e7cb5eaeaa4b291b2f Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Fri, 7 Jun 2019 14:55:38 +0200 Subject: [PATCH 27/30] Implement client lib loadscript() without using jQuery --- meteor/client/lib/lib.tsx | 59 ++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/meteor/client/lib/lib.tsx b/meteor/client/lib/lib.tsx index b8b31dd10d..2a08007605 100644 --- a/meteor/client/lib/lib.tsx +++ b/meteor/client/lib/lib.tsx @@ -1,47 +1,56 @@ import * as _ from 'underscore' import * as React from 'react' -export function multilineText (txt: string) { +export {multilineText, isEventInInputField, loadScript} + +function multilineText (txt: string) { return _.map((txt + '').split('\n'), (line: string, i) => { return

    {line}

    }) } -export function isEventInInputField (e: Event) { + +function isEventInInputField (e: Event) { // @ts-ignore localName return (e && e.target && ['textarea', 'input'].indexOf(e.target.localName + '') !== -1) } + const loadScriptCache: {[url: string]: { status: 'loading' | 'ok', callbacks: Array<(err?: any) => void> }} = {} -export function loadScript (url: string, callback: (err?: any) => void) { +function doCallback (url:string, err?: any) { + loadScriptCache[url].callbacks.forEach((cb) => { + cb(err) + }) + loadScriptCache[url].status = 'ok' +} + +function loadScript (url: string, callback: (err?: any) => void) { if ((loadScriptCache[url] || {}).status === 'ok') { // already loaded callback() - } else if ((loadScriptCache[url] || {}).status === 'loading') { + return + } + + if ((loadScriptCache[url] || {}).status === 'loading') { loadScriptCache[url].callbacks.push(callback) - } else { - loadScriptCache[url] = { - status: 'loading', - callbacks: [callback] - } - const doCallback = (err?: any) => { - loadScriptCache[url].callbacks.forEach((cb) => { - cb(err) - }) - loadScriptCache[url].status = 'ok' - } - $.ajax({ - url: url, - dataType: 'script', - success: () => { - doCallback() - }, - error: (err) => { - doCallback(err) - } - }) + return + } + + loadScriptCache[url] = { + status: 'loading', + callbacks: [callback] + } + + const script:HTMLScriptElement = document.createElement('script') + script.onerror = (error) => { + doCallback(url, error) + } + script.onload = () => { + doCallback(url) } + document.head.appendChild(script) + script.src = url } From 82ff420c9a9c4bd4364faa9f8a8a859cd849c8a3 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Tue, 11 Jun 2019 17:36:27 +0200 Subject: [PATCH 28/30] Reintroduce tests in the tsconfig exclusions (broke build) --- meteor/package-lock.json | 44 +++++++++++++++++++++++----------------- meteor/tsconfig.json | 1 + 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/meteor/package-lock.json b/meteor/package-lock.json index 1bc54dfe12..95bba608b1 100644 --- a/meteor/package-lock.json +++ b/meteor/package-lock.json @@ -2322,6 +2322,29 @@ "requires": { "follow-redirects": "1.5.10", "is-buffer": "^2.0.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "is-buffer": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + } } }, "babel-code-frame": { @@ -4560,24 +4583,6 @@ "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-0.1.0.tgz", "integrity": "sha1-dV0+wU1JqG49L8wIvurVwMornAo=" }, - "follow-redirects": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", - "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", - "requires": { - "debug": "=3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -6154,7 +6159,8 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true }, "is-builtin-module": { "version": "1.0.0", diff --git a/meteor/tsconfig.json b/meteor/tsconfig.json index 11f6e6e0c4..0df7489444 100644 --- a/meteor/tsconfig.json +++ b/meteor/tsconfig.json @@ -14,6 +14,7 @@ }, "exclude": [ "node_modules", + "**/__tests__/**/*", "**/__mocks__/**/*", "**/.coverage/**/*" ] From 4947e1cdc91c11270d02eb7ee4f5f0e8830ff0b9 Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 12 Jun 2019 13:17:37 +0200 Subject: [PATCH 29/30] Convert document.querySelectorAll return values to array for iterations --- .../client/lib/notifications/NotificationCenterPanel.tsx | 8 ++++---- meteor/client/ui/Prompter/PrompterView.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meteor/client/lib/notifications/NotificationCenterPanel.tsx b/meteor/client/lib/notifications/NotificationCenterPanel.tsx index 793c38824a..794d850dd9 100644 --- a/meteor/client/lib/notifications/NotificationCenterPanel.tsx +++ b/meteor/client/lib/notifications/NotificationCenterPanel.tsx @@ -141,8 +141,8 @@ export const NotificationCenterPopUps = translateWithTracker { - item.style.animationName = '' + Array.from(document.querySelectorAll('.notification-pop-up.is-highlighted')).forEach((element:HTMLElement) => { + element.style.animationName = '' }) } @@ -168,13 +168,13 @@ export const NotificationCenterPopUps = translateWithTracker { + Array.from(items).forEach(item => { item.style.animationName = 'none' }) if (currentAnimationName !== 'none') { window.requestAnimationFrame(function () { - items.forEach(item => { + Array.from(items).forEach(item => { item.style.animationName = currentAnimationName }) }) diff --git a/meteor/client/ui/Prompter/PrompterView.tsx b/meteor/client/ui/Prompter/PrompterView.tsx index 12e3500d9b..25c4cc9e50 100644 --- a/meteor/client/ui/Prompter/PrompterView.tsx +++ b/meteor/client/ui/Prompter/PrompterView.tsx @@ -159,7 +159,7 @@ export class PrompterViewInner extends MeteorReactComponent { + Array.from(document.querySelectorAll('.prompter .scroll-anchor')).forEach(anchor => { const { top } = anchor.getBoundingClientRect() if ((startY === -1 || top > startY) && (endY === -1 || top <= endY)) { From 4813c0bf35e42c1157f7291bd95c6d091c85f6ac Mon Sep 17 00:00:00 2001 From: Ola Christian Gundelsby Date: Wed, 12 Jun 2019 13:24:51 +0200 Subject: [PATCH 30/30] Replace references to removed method PrompterView#getScrollPosition() with window.scrollY --- meteor/client/ui/Prompter/controller/keyboard-device.ts | 8 ++++---- meteor/client/ui/Prompter/controller/mouse-ish-device.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meteor/client/ui/Prompter/controller/keyboard-device.ts b/meteor/client/ui/Prompter/controller/keyboard-device.ts index b433007b26..15a5fc331b 100644 --- a/meteor/client/ui/Prompter/controller/keyboard-device.ts +++ b/meteor/client/ui/Prompter/controller/keyboard-device.ts @@ -50,7 +50,7 @@ export class KeyboardController extends ControllerAbstract { if (this._mode === Mode.NORMAL) { const scrollBy = Math.round(window.innerHeight * 0.66) - const scrollPosition = this._prompterView.getScrollPosition() + const scrollPosition = window.scrollY if (scrollPosition !== undefined) { if ( e.code === 'ArrowLeft' || @@ -82,7 +82,7 @@ export class KeyboardController extends ControllerAbstract { const timeSincePress = Date.now() - this._keyDown[e.code] if (this._mode === Mode.NORMAL) { - const scrollPosition = this._prompterView.getScrollPosition() + const scrollPosition = window.scrollY if (scrollPosition !== undefined) { if ( e.code === 'ArrowLeft' || // left @@ -150,7 +150,7 @@ export class KeyboardController extends ControllerAbstract { if (this._updateSpeedHandle !== null) return this._updateSpeedHandle = null - const scrollPosition = this._prompterView.getScrollPosition() + const scrollPosition = window.scrollY if (scrollPosition !== undefined) { this._currentPosition = scrollPosition let dp = ( @@ -197,7 +197,7 @@ export class KeyboardController extends ControllerAbstract { window.scrollBy(0, speed) } - const scrollPosition = this._prompterView.getScrollPosition() + const scrollPosition = window.scrollY if (scrollPosition !== undefined) { // Reached end-of-scroll: diff --git a/meteor/client/ui/Prompter/controller/mouse-ish-device.ts b/meteor/client/ui/Prompter/controller/mouse-ish-device.ts index b8eb423d98..a3cec72081 100644 --- a/meteor/client/ui/Prompter/controller/mouse-ish-device.ts +++ b/meteor/client/ui/Prompter/controller/mouse-ish-device.ts @@ -216,7 +216,7 @@ export class MouseIshController extends ControllerAbstract { } private triggerStartSpeedScrolling () { if (this._scrollingDown) { - const scrollPosition = this._prompterView.getScrollPosition() + const scrollPosition = window.scrollY if (scrollPosition !== undefined) { this._nextPausePosition = this._prompterView.findAnchorPosition(scrollPosition + 50, -1, 1) } @@ -265,7 +265,7 @@ export class MouseIshController extends ControllerAbstract { this._mode !== Mode.SMOOTHSCROLL ) return - let scrollPosition = this._prompterView.getScrollPosition() + let scrollPosition = window.scrollY if ( scrollPosition !== undefined && @@ -317,7 +317,7 @@ export class MouseIshController extends ControllerAbstract { window.scrollBy(0, speed) - scrollPosition = this._prompterView.getScrollPosition() + scrollPosition = window.scrollY if (scrollPosition !== undefined) { // Reached end-of-scroll: