From f5afb73d013a84b1fe4f32ff769cb46a85dd0dd0 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Wed, 20 Mar 2019 16:42:32 +0100 Subject: [PATCH] Add strategizer-client 0.0.2 --- client/package-lock.json | 2479 +++----------------------------------- client/package.json | 15 +- 2 files changed, 153 insertions(+), 2341 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 9a46f8ec2..559b8856c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4,30 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { -<<<<<<< HEAD - "@advancedalgos/events-client": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@advancedalgos/events-client/-/events-client-0.0.4.tgz", - "integrity": "sha512-8kwr6IB7AaoZzhLzeGZFTLowTxetOWOwSX4vb0YJQZBA1FJ/CQSU7ARD3WPdyTQAWOOSrquddC6SzLgg11MuiA==", - "dev": true, - "requires": { - "@material-ui/core": "^3.2.0", - "@material-ui/icons": "^3.0.1", - "apollo-client": "^2.4.4", - "classnames": "^2.2.6", - "graphql": "^14.0.2", - "graphql-tag": "^2.10.0", - "luxon": "^1.4.4", - "material-ui-pickers": "^1.0.1", - "react": "^16.5.2", - "react-apollo": "^2.2.4", - "react-dom": "^16.6.0", - "react-router-dom": "^4.3.1", - "react-sortable-hoc": "^0.8.3" - } - }, -======= ->>>>>>> develop "@advancedalgos/financial-beings-client": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/@advancedalgos/financial-beings-client/-/financial-beings-client-0.0.5.tgz", @@ -63,8 +39,6 @@ "tslib": "^1.9.2", "uuid": "^3.2.1", "xml2js": "^0.4.19" -<<<<<<< HEAD -======= } }, "@azure/storage-blob": { @@ -76,7 +50,6 @@ "@azure/ms-rest-js": "1.2.3", "events": "3.0.0", "tslib": "^1.9.3" ->>>>>>> develop } }, "@babel/code-frame": { @@ -133,11 +106,7 @@ "integrity": "sha512-f3QCuPppXxtZOEm5GWPra/uYUjmNQlu9pbAD8D/9jze4pTY83rTtB1igTBSwvkeNlC5gR24zFFkz+2WHLFQhqQ==", "dev": true, "requires": { -<<<<<<< HEAD - "@babel/types": "^7.2.2", -======= "@babel/types": "^7.3.2", ->>>>>>> develop "jsesc": "^2.5.1", "lodash": "^4.17.10", "source-map": "^0.5.0", @@ -177,11 +146,7 @@ "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==", "dev": true, "requires": { -<<<<<<< HEAD - "@babel/types": "^7.0.0", -======= "@babel/types": "^7.3.0", ->>>>>>> develop "esutils": "^2.0.0" } }, @@ -206,11 +171,7 @@ "@babel/helper-member-expression-to-functions": "^7.0.0", "@babel/helper-optimise-call-expression": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", -<<<<<<< HEAD - "@babel/helper-replace-supers": "^7.1.0" -======= "@babel/helper-replace-supers": "^7.2.3" ->>>>>>> develop } }, "@babel/helper-define-map": { @@ -340,11 +301,7 @@ "requires": { "@babel/helper-member-expression-to-functions": "^7.0.0", "@babel/helper-optimise-call-expression": "^7.0.0", -<<<<<<< HEAD - "@babel/traverse": "^7.1.0", -======= "@babel/traverse": "^7.2.3", ->>>>>>> develop "@babel/types": "^7.0.0" } }, @@ -387,11 +344,7 @@ "requires": { "@babel/template": "^7.1.2", "@babel/traverse": "^7.1.5", -<<<<<<< HEAD - "@babel/types": "^7.2.0" -======= "@babel/types": "^7.3.0" ->>>>>>> develop } }, "@babel/highlight": { @@ -428,11 +381,7 @@ "integrity": "sha512-wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg==", "dev": true, "requires": { -<<<<<<< HEAD - "@babel/helper-create-class-features-plugin": "^7.2.1", -======= "@babel/helper-create-class-features-plugin": "^7.3.0", ->>>>>>> develop "@babel/helper-plugin-utils": "^7.0.0" } }, @@ -759,8 +708,6 @@ "requires": { "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" -<<<<<<< HEAD -======= } }, "@babel/plugin-transform-named-capturing-groups-regex": { @@ -770,7 +717,6 @@ "dev": true, "requires": { "regexp-tree": "^0.1.0" ->>>>>>> develop } }, "@babel/plugin-transform-new-target": { @@ -828,11 +774,7 @@ "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==", "dev": true, "requires": { -<<<<<<< HEAD - "@babel/helper-builder-react-jsx": "^7.0.0", -======= "@babel/helper-builder-react-jsx": "^7.3.0", ->>>>>>> develop "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-jsx": "^7.2.0" } @@ -947,33 +889,20 @@ } }, "@babel/preset-env": { -<<<<<<< HEAD - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.0.tgz", - "integrity": "sha512-haGR38j5vOGVeBatrQPr3l0xHbs14505DcM57cbJy48kgMFvvHHoYEhHuRV+7vi559yyAUAVbTWzbK/B/pzJng==", -======= "version": "7.3.1", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz", "integrity": "sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==", ->>>>>>> develop "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-proposal-async-generator-functions": "^7.2.0", "@babel/plugin-proposal-json-strings": "^7.2.0", -<<<<<<< HEAD - "@babel/plugin-proposal-object-rest-spread": "^7.2.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", - "@babel/plugin-syntax-async-generators": "^7.2.0", -======= "@babel/plugin-proposal-object-rest-spread": "^7.3.1", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", "@babel/plugin-syntax-async-generators": "^7.2.0", "@babel/plugin-syntax-json-strings": "^7.2.0", ->>>>>>> develop "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", "@babel/plugin-transform-arrow-functions": "^7.2.0", @@ -993,10 +922,7 @@ "@babel/plugin-transform-modules-commonjs": "^7.2.0", "@babel/plugin-transform-modules-systemjs": "^7.2.0", "@babel/plugin-transform-modules-umd": "^7.2.0", -<<<<<<< HEAD -======= "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0", ->>>>>>> develop "@babel/plugin-transform-new-target": "^7.0.0", "@babel/plugin-transform-object-super": "^7.2.0", "@babel/plugin-transform-parameters": "^7.2.0", @@ -1042,27 +968,6 @@ "integrity": "sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==", "requires": { "regenerator-runtime": "^0.12.0" -<<<<<<< HEAD -======= - } - }, - "@babel/runtime-corejs2": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.3.4.tgz", - "integrity": "sha512-QwPuQE65kNxjsNKk34Rfgen2R5fk0J2So99SD45uXBp34QOfyz11SqVgJ4xvyCpnCIieSQ0X0hSSc9z/ymlJJw==", - "dev": true, - "requires": { - "core-js": "^2.5.7", - "regenerator-runtime": "^0.12.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", - "dev": true - } ->>>>>>> develop } }, "@babel/template": { @@ -1086,11 +991,7 @@ "@babel/generator": "^7.2.2", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.0.0", -<<<<<<< HEAD - "@babel/parser": "^7.2.2", -======= "@babel/parser": "^7.2.3", ->>>>>>> develop "@babel/types": "^7.2.2", "debug": "^4.1.0", "globals": "^11.1.0", @@ -1188,21 +1089,6 @@ "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==", "dev": true }, - "@date-io/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-1.1.0.tgz", - "integrity": "sha512-PyjhyR2fbp7Q8xpB5zoOyT3dqr8Bn4kXfREf1w6AnQalwdftNxChB2/p88fI1qsx8KNmHDJY12eCgLoZaPegTw==", - "dev": true - }, - "@date-io/date-fns": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.1.0.tgz", - "integrity": "sha512-FMRhYWfoGiIXdN4xWAArpkdEbqsg2Fr+6Yda7Np2eVWCNx6gSMYsHIM51IIcI+3762ajYbhoEYjHYXVFNZIk1g==", - "dev": true, - "requires": { - "@date-io/core": "^1.1.0" - } - }, "@emotion/babel-utils": { "version": "0.6.10", "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz", @@ -1277,11 +1163,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.14.tgz", "integrity": "sha512-T1qCqkwm9PuvK53J64D1ovfrOTa1kG+SrHNj5cFst/rrskhCnbxpRdbqFIdc/thmXC0ebBX8nOUyja2/mrxe4g==", "requires": { -<<<<<<< HEAD - "@fortawesome/fontawesome-common-types": "^0.2.10" -======= "@fortawesome/fontawesome-common-types": "^0.2.14" ->>>>>>> develop } }, "@fortawesome/free-brands-svg-icons": { @@ -1289,11 +1171,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.7.1.tgz", "integrity": "sha512-YU+np8UJGjHUmzfGS5yyK0wWR0QHbx5lTFRSylBfEkm8QXvOkRxB03sUhOSIWVXU7iPiePuqrsglQRgxoG4nrw==", "requires": { -<<<<<<< HEAD - "@fortawesome/fontawesome-common-types": "^0.2.10" -======= "@fortawesome/fontawesome-common-types": "^0.2.14" ->>>>>>> develop } }, "@fortawesome/free-solid-svg-icons": { @@ -1301,11 +1179,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.1.tgz", "integrity": "sha512-5V/Q+JoPzuiIHW2JwmZGvE9bHguvNJKa7611DPo51uIvYv9LweX/SnDF+HC23X2W5T3myHhnGi+EZJTmidAmyg==", "requires": { -<<<<<<< HEAD - "@fortawesome/fontawesome-common-types": "^0.2.10" -======= "@fortawesome/fontawesome-common-types": "^0.2.14" ->>>>>>> develop } }, "@fortawesome/react-fontawesome": { @@ -1318,14 +1192,6 @@ } }, "@material-ui/core": { -<<<<<<< HEAD - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.2.tgz", - "integrity": "sha512-ONWU8ZCrhzzmeh6QXbYwicZxD0wSxj32UOSmPHXReZs4RTaeXOtLVloIxh7810fIR/GkfGXa/UJIK/woSHW4/Q==", - "requires": { - "@babel/runtime": "7.1.2", - "@material-ui/utils": "^3.0.0-alpha.0", -======= "version": "3.9.2", "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.9.2.tgz", "integrity": "sha512-aukR3mSH3g115St2OnqoeMRtmxzxxx+Mch7pFKRV3Tz3URExBlZwOolimjxKZpG4LGec8HlhREawafLsDzjVWQ==", @@ -1333,7 +1199,6 @@ "@babel/runtime": "^7.2.0", "@material-ui/system": "^3.0.0-alpha.0", "@material-ui/utils": "^3.0.0-alpha.2", ->>>>>>> develop "@types/jss": "^9.5.6", "@types/react-transition-group": "^2.0.8", "brcast": "^3.0.1", @@ -1344,21 +1209,13 @@ "dom-helpers": "^3.2.1", "hoist-non-react-statics": "^3.2.1", "is-plain-object": "^2.0.4", -<<<<<<< HEAD - "jss": "^9.3.3", -======= "jss": "^9.8.7", ->>>>>>> develop "jss-camel-case": "^6.0.0", "jss-default-unit": "^8.0.2", "jss-global": "^3.0.0", "jss-nested": "^6.0.1", "jss-props-sort": "^6.0.0", "jss-vendor-prefixer": "^7.0.0", -<<<<<<< HEAD - "keycode": "^2.1.9", -======= ->>>>>>> develop "normalize-scroll-left": "^0.1.2", "popper.js": "^1.14.1", "prop-types": "^15.6.0", @@ -1373,38 +1230,6 @@ "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-3.0.2.tgz", "integrity": "sha512-QY/3gJnObZQ3O/e6WjH+0ah2M3MOgLOzCy8HTUoUx9B6dDrS18vP7Ycw3qrDEKlB6q1KNxy6CZHm5FCauWGy2g==", "requires": { -<<<<<<< HEAD - "@babel/runtime": "7.0.0", - "recompose": "^0.29.0" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz", - "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==", - "requires": { - "regenerator-runtime": "^0.12.0" - } - }, - "hoist-non-react-statics": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" - }, - "recompose": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.29.0.tgz", - "integrity": "sha512-J/qLXNU4W+AeHCDR70ajW8eMd1uroqZaECTj6qqDLPMILz3y0EzpYlvrnxKB9DnqcngWrtGwjXY9JeXaW9kS1A==", - "requires": { - "@babel/runtime": "^7.0.0", - "change-emitter": "^0.1.2", - "fbjs": "^0.8.1", - "hoist-non-react-statics": "^2.3.1", - "react-lifecycles-compat": "^3.0.2", - "symbol-observable": "^1.0.4" - } - } -======= "@babel/runtime": "^7.2.0", "recompose": "0.28.0 - 0.30.0" } @@ -1418,7 +1243,6 @@ "deepmerge": "^3.0.0", "prop-types": "^15.6.0", "warning": "^4.0.1" ->>>>>>> develop } }, "@material-ui/utils": { @@ -1474,15 +1298,9 @@ } }, "@superalgos/key-vault-client": { -<<<<<<< HEAD - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/@superalgos/key-vault-client/-/key-vault-client-0.0.28.tgz", - "integrity": "sha512-MkOk+bUF8rg0CAHIJoYexAKJG3mfTfC1JnqoJjwSzUETqh1EUuuSur7ZComDIhC6bhkfQdT2Ox9DDiYqZWDjGA==", -======= "version": "0.0.31", "resolved": "https://registry.npmjs.org/@superalgos/key-vault-client/-/key-vault-client-0.0.31.tgz", "integrity": "sha512-cP0AmTHa2bfSmJMlHNlU5qWcn3eadFtG1z+vq0MW3RYWlOW78e8pZSPffAihr8xQ6bnG9x2KV6YCRRPeVE0MXw==", ->>>>>>> develop "dev": true, "requires": { "@material-ui/core": "^3.2.2", @@ -1497,14 +1315,6 @@ "react-apollo": "^2.2.4", "react-dom": "^16.6.1", "react-router-dom": "^4.3.1" -<<<<<<< HEAD - } - }, - "@superalgos/operations-client": { - "version": "0.0.14", - "resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.14.tgz", - "integrity": "sha512-RJepMVz8wDit7plaJI+ygNX7BuASTICRe4JVyv3KpT+247vai0yhla0gEwrYkYCJQQftw+cq3cRz/fBLl+y6Lg==", -======= } }, "@superalgos/logs-client": { @@ -1524,144 +1334,10 @@ "react-router-dom": "^4.3.1" } }, - "@superalgos/miners-client": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@superalgos/miners-client/-/miners-client-0.0.1.tgz", - "integrity": "sha512-3C5qJuApb9YR0Ru2NMrUUob/EV+V1vRZ40dJWdzgop6lXx6LdiECrUwx2b1su0ZchQsOLBiAr7jf8M7ZX9s/tA==", - "dev": true, - "requires": { - "@material-ui/core": "3.9.2", - "@material-ui/icons": "3.0.2", - "apollo-client": "2.4.4", - "graphql": "14.1.1", - "graphql-tag": "2.10.1", - "material-table": "^1.21.0", - "react": "16.5.2", - "react-apollo": "2.5.2", - "react-dom": "16.6.0", - "react-router-dom": "4.3.1" - }, - "dependencies": { - "@types/async": { - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", - "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", - "dev": true, - "optional": true - }, - "apollo-cache": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.19.tgz", - "integrity": "sha512-p163+GVne1Gyw2v9L5kHEQhUhih7btWvyUFOl4uKf7brieqd4tHZt8ZA3vT1SaXbCeQZNSp/tFI3yFyi8RPKzw==", - "dev": true, - "requires": { - "apollo-utilities": "^1.0.24" - } - }, - "apollo-client": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.4.tgz", - "integrity": "sha512-i29w/+aa9O4fe8NxzJNOViHdsjpN2723Q2mNl0HiOJFwG+VjA4RXdTpyZHPZqcO8FwgK1k43l8nULD4Cdlx/Ww==", - "dev": true, - "requires": { - "@types/async": "2.0.50", - "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.19", - "apollo-link": "^1.0.0", - "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.24", - "symbol-observable": "^1.0.2", - "zen-observable": "^0.8.0" - } - }, - "apollo-utilities": { - "version": "1.0.24", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.24.tgz", - "integrity": "sha512-cOXtrkio3wKfggp/zKCzQYxSZZRND/njNVmUksM1cckoJF3g/2o3bhh6z0HPhNhee8qzJzVXtl+3vmwXYGh0Gg==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "^2.0.0" - } - }, - "react": { - "version": "16.5.2", - "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz", - "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "schedule": "^0.5.0" - } - }, - "react-apollo": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.5.2.tgz", - "integrity": "sha512-lmglhG6NQ+lfAUDzx8ZgelWKUbvxBhhy1l7Z2ksgtQ8+FVqwX7i6p5O3zicAZZlIdKzdq82V0kqq5WkxEsffrA==", - "dev": true, - "requires": { - "apollo-utilities": "^1.2.1", - "hoist-non-react-statics": "^3.0.0", - "lodash.isequal": "^4.5.0", - "prop-types": "^15.6.0", - "ts-invariant": "^0.3.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "apollo-utilities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz", - "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "^2.0.0", - "ts-invariant": "^0.2.1", - "tslib": "^1.9.3" - }, - "dependencies": { - "ts-invariant": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz", - "integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==", - "dev": true, - "requires": { - "tslib": "^1.9.3" - } - } - } - } - } - }, - "react-dom": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz", - "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.10.0" - } - }, - "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - } - } - }, "@superalgos/operations-client": { "version": "0.0.20", "resolved": "https://registry.npmjs.org/@superalgos/operations-client/-/operations-client-0.0.20.tgz", "integrity": "sha512-PZtr3XIzkGS3RezInDoUrbL00mFmhjskNrFQ3HV8AAz9RprwKE3YivcZdGzQGcrnerB2caa6Da7aX+jpbUkdnQ==", ->>>>>>> develop "dev": true, "requires": { "@material-ui/core": "^3.2.2", @@ -1679,6 +1355,124 @@ "react-router-dom": "^4.3.1" } }, + "@superalgos/strategizer-client": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.2.tgz", + "integrity": "sha512-c62Ug2fmRVgLTmKy0o6TNQBp7OOI5jkKu3QB0d1+H36oJCg/uDiWLvr17fGXmAWdSr4o8Y3I1dW9H7P9MubO0g==", + "dev": true, + "requires": { + "@material-ui/core": "^3.2.0", + "@material-ui/icons": "^3.0.1", + "apollo-client": "^2.5.1", + "graphql": "^14.0.2", + "graphql-tag": "^2.10.0", + "lodash": "^4.17.11", + "react": "^16.8.4", + "react-apollo": "^2.5.2", + "react-apollo-hooks": "^0.4.3", + "react-dom": "^16.8.4", + "react-router-dom": "^4.3.1" + }, + "dependencies": { + "apollo-cache": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz", + "integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==", + "dev": true, + "requires": { + "apollo-utilities": "^1.2.1", + "tslib": "^1.9.3" + } + }, + "apollo-client": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz", + "integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==", + "dev": true, + "requires": { + "@types/zen-observable": "^0.8.0", + "apollo-cache": "1.2.1", + "apollo-link": "^1.0.0", + "apollo-link-dedup": "^1.0.0", + "apollo-utilities": "1.2.1", + "symbol-observable": "^1.0.2", + "ts-invariant": "^0.2.1", + "tslib": "^1.9.3", + "zen-observable": "^0.8.0" + } + }, + "apollo-utilities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz", + "integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "^2.0.0", + "ts-invariant": "^0.2.1", + "tslib": "^1.9.3" + } + }, + "react": { + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react/-/react-16.8.4.tgz", + "integrity": "sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.13.4" + } + }, + "react-apollo": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.5.2.tgz", + "integrity": "sha512-lmglhG6NQ+lfAUDzx8ZgelWKUbvxBhhy1l7Z2ksgtQ8+FVqwX7i6p5O3zicAZZlIdKzdq82V0kqq5WkxEsffrA==", + "dev": true, + "requires": { + "apollo-utilities": "^1.2.1", + "hoist-non-react-statics": "^3.0.0", + "lodash.isequal": "^4.5.0", + "prop-types": "^15.6.0", + "ts-invariant": "^0.3.0", + "tslib": "^1.9.3" + }, + "dependencies": { + "ts-invariant": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz", + "integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==", + "dev": true, + "requires": { + "tslib": "^1.9.3" + } + } + } + }, + "react-dom": { + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.4.tgz", + "integrity": "sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.13.4" + } + }, + "scheduler": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.4.tgz", + "integrity": "sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } + }, "@superalgos/teams-client": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/@superalgos/teams-client/-/teams-client-0.0.33.tgz", @@ -1687,53 +1481,6 @@ "requires": { "@azure/storage-blob": "^10.0.0-preview", "@superalgos/web-components": "0.0.18", -<<<<<<< HEAD - "apollo-cache-inmemory": "1.3.11", - "apollo-client": "2.4.7", - "apollo-link": "1.2.6", - "apollo-link-context": "1.0.12", - "apollo-link-error": "1.1.5", - "apollo-link-http": "1.5.9", - "apollo-link-ws": "1.0.12", - "apollo-utilities": "1.0.26", - "auth0-lock": "11.12.1", - "babel-polyfill": "6.26.0", - "blob-util": "2.0.2", - "classnames": "2.2.6", - "cross-fetch": "2.2.3", - "dotenv-webpack": "1.5.7", - "graphql": "14.0.2", - "graphql-tag": "2.10.0", - "minilog": "3.1.0", - "prop-types": "15.6.2", - "query-string": "6.2.0", - "react": "16.6.3", - "react-apollo": "2.3.3", - "react-dom": "16.6.3", - "react-router-dom": "4.3.1", - "recompose": "0.30.0", - "subscriptions-transport-ws": "0.9.15" - }, - "dependencies": { - "@azure/storage-blob": { - "version": "10.0.0-preview", - "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.0.0-preview.tgz", - "integrity": "sha512-PFXKm+gipKDfg5h08hPiEr0Za4RMiFzzte+ewh4ACZeRQa0XZK55NAZxW67ZytGBd7WXdQq6pcAgo5dBnwQANQ==", - "dev": true, - "requires": { - "ms-rest-js": "0.21.413" - } - }, - "apollo-link-ws": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.12.tgz", - "integrity": "sha512-BjbskhfuuIgk9e4XHdrqmjxkY+RkD1tuerrs4PLiPTkJYcQrvA8t27lGBSrDUKHWH4esCdhQF1UhKPwhlouEHw==", - "dev": true, - "requires": { - "apollo-link": "^1.2.6" - } - } -======= "apollo-cache-inmemory": "^1.3.5", "apollo-client": "^2.4.2", "apollo-link": "^1.2.3", @@ -1759,7 +1506,6 @@ "react-router-dom": "^4.3.1", "recompose": "^0.30.0", "subscriptions-transport-ws": "^0.9.15" ->>>>>>> develop } }, "@superalgos/users-client": { @@ -1822,11 +1568,7 @@ "@superalgos/web-components": { "version": "0.0.18", "resolved": "https://registry.npmjs.org/@superalgos/web-components/-/web-components-0.0.18.tgz", -<<<<<<< HEAD - "integrity": "sha512-zkfIRdiyJwRhtdcyTEltx3gQcVZPFh8IYMIDiFbFBfWbihwYLHpDQctR9DjSOCFeUsNqbV6OCzaSD7pZa51w8Q==", -======= "integrity": "sha512-siLammrkkntvYShqy8DjO6Zt6ZxHyZMHjb0jUhGUjIN3Ca4GiBbrSnCz3F3/1xx82mK6HK8lnGZyjQwWs4rJ8A==", ->>>>>>> develop "dev": true, "requires": { "@azure/storage-blob": "^10.1.0-preview", @@ -1845,22 +1587,6 @@ "react-dropzone": "^5.1.0", "react-helmet": "^5.2.0", "react-router-dom": "^4.3.1" -<<<<<<< HEAD - }, - "dependencies": { - "@azure/storage-blob": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.3.0.tgz", - "integrity": "sha512-KZbJ3q8RpAdeIB5Em1lgXkiq7Mll9bSHHbHavOFMepkkF7HQa3Sez9FdkAVIkVVWK5YoBlshBGZ+mtiSQiS9Fw==", - "dev": true, - "requires": { - "@azure/ms-rest-js": "1.2.3", - "events": "3.0.0", - "tslib": "^1.9.3" - } - } -======= ->>>>>>> develop } }, "@svgr/core": { @@ -1893,67 +1619,11 @@ } }, "@types/async": { -<<<<<<< HEAD - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", - "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", - "optional": true - }, - "@types/body-parser": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz", - "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==", - "dev": true, - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, - "@types/connect": { - "version": "3.4.32", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", - "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/express": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz", - "integrity": "sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==", - "dev": true, - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz", - "integrity": "sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/range-parser": "*" - } - }, - "@types/form-data": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", - "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", - "dev": true, - "requires": { - "@types/node": "*" - } -======= "version": "2.0.49", "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.49.tgz", "integrity": "sha512-Benr3i5odUkvpFkOpzGqrltGdbSs+EVCkEBGXbuR7uT0VzhXKIkhem6PDzHdx5EonA+rfbB3QvP6aDOw5+zp5Q==", "dev": true, "optional": true ->>>>>>> develop }, "@types/jss": { "version": "9.5.7", @@ -1964,15 +1634,6 @@ "indefinite-observable": "^1.0.1" } }, -<<<<<<< HEAD - "@types/mime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", - "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==", - "dev": true - }, -======= ->>>>>>> develop "@types/node": { "version": "10.12.24", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.24.tgz", @@ -1998,26 +1659,12 @@ "csstype": "^2.2.0" } }, - "@types/react-text-mask": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/@types/react-text-mask/-/react-text-mask-5.4.4.tgz", - "integrity": "sha512-mnwyDgUwFtJVAZ8f+tzPGmYjpH7TLXxHSGty338abca6aAjdjRLCOC4h+CxlvB8xrVAIU5pkNllpHhfJCA3hXQ==", - "dev": true, - "requires": { - "@types/react": "*" - } - }, "@types/react-transition-group": { "version": "2.0.15", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.15.tgz", "integrity": "sha512-S0QnNzbHoWXDbKBl/xk5dxA4FT+BNlBcI3hku991cl8Cz3ytOkUMcCRtzdX11eb86E131bSsQqy5WrPCdJYblw==", "requires": { -<<<<<<< HEAD - "@types/express-serve-static-core": "*", - "@types/mime": "*" -======= "@types/react": "*" ->>>>>>> develop } }, "@types/tapable": { @@ -2033,18 +1680,6 @@ "dev": true, "requires": { "source-map": "^0.6.1" -<<<<<<< HEAD - } - }, - "@types/uuid": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz", - "integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==", - "dev": true, - "requires": { - "@types/node": "*" -======= ->>>>>>> develop } }, "@types/webpack": { @@ -2698,12 +2333,8 @@ "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz", "integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==", "requires": { -<<<<<<< HEAD - "apollo-utilities": "^1.0.26" -======= "apollo-utilities": "^1.1.2", "tslib": "^1.9.3" ->>>>>>> develop } }, "apollo-cache-inmemory": { @@ -2711,16 +2342,10 @@ "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz", "integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==", "requires": { -<<<<<<< HEAD - "apollo-cache": "^1.1.21", - "apollo-utilities": "^1.0.26", - "optimism": "^0.6.6" -======= "apollo-cache": "^1.1.25", "apollo-utilities": "^1.1.2", "optimism": "^0.6.9", "tslib": "^1.9.3" ->>>>>>> develop } }, "apollo-client": { @@ -2728,15 +2353,6 @@ "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz", "integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==", "requires": { -<<<<<<< HEAD - "@types/async": "2.0.50", - "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.21", - "apollo-link": "^1.0.0", - "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.26", - "symbol-observable": "^1.0.2", -======= "@types/zen-observable": "^0.8.0", "apollo-cache": "1.1.25", "apollo-link": "^1.0.0", @@ -2744,7 +2360,6 @@ "apollo-utilities": "1.1.2", "symbol-observable": "^1.0.2", "tslib": "^1.9.3", ->>>>>>> develop "zen-observable": "^0.8.0" } }, @@ -2753,12 +2368,7 @@ "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz", "integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==", "requires": { -<<<<<<< HEAD - "apollo-utilities": "^1.0.0", - "zen-observable-ts": "^0.8.13" -======= "zen-observable-ts": "^0.8.15" ->>>>>>> develop } }, "apollo-link-context": { @@ -2766,11 +2376,7 @@ "resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz", "integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==", "requires": { -<<<<<<< HEAD - "apollo-link": "^1.2.6" -======= "apollo-link": "^1.2.8" ->>>>>>> develop } }, "apollo-link-dedup": { @@ -2778,11 +2384,7 @@ "resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz", "integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==", "requires": { -<<<<<<< HEAD - "apollo-link": "^1.2.6" -======= "apollo-link": "^1.2.8" ->>>>>>> develop } }, "apollo-link-error": { @@ -2790,13 +2392,8 @@ "resolved": "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.7.tgz", "integrity": "sha512-olPTKr3yFoavFHSXSLqC5QSWrRACN8TK3+E0pVL8uVR0zILJflUSCRb8HizKQmxZWtr9yM+D2gRLu9mStI8qTA==", "requires": { -<<<<<<< HEAD - "apollo-link": "^1.2.6", - "apollo-link-http-common": "^0.2.8" -======= "apollo-link": "^1.2.8", "apollo-link-http-common": "^0.2.10" ->>>>>>> develop } }, "apollo-link-http": { @@ -2804,13 +2401,8 @@ "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.11.tgz", "integrity": "sha512-wDG+I9UmpfaZRPIvTYBgkvqiCgmz6yWgvuzW/S24Q4r4Xrfe6sLpg2FmarhtdP+hdN+IXTLbFNCZ+Trgfpifow==", "requires": { -<<<<<<< HEAD - "apollo-link": "^1.2.6", - "apollo-link-http-common": "^0.2.8" -======= "apollo-link": "^1.2.8", "apollo-link-http-common": "^0.2.10" ->>>>>>> develop } }, "apollo-link-http-common": { @@ -2818,9 +2410,6 @@ "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz", "integrity": "sha512-KY9nhpAurw3z48OIYV0sCZFXrzWp/wjECsveK+Q9GUhhSe1kEbbUjFfmi+qigg+iELgdp5V8ioRJhinl1vPojw==", "requires": { -<<<<<<< HEAD - "apollo-link": "^1.2.6" -======= "apollo-link": "^1.2.8" } }, @@ -2831,7 +2420,6 @@ "dev": true, "requires": { "apollo-link": "^1.2.8" ->>>>>>> develop } }, "apollo-utilities": { @@ -2839,12 +2427,8 @@ "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz", "integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==", "requires": { -<<<<<<< HEAD - "fast-json-stable-stringify": "^2.0.0" -======= "fast-json-stable-stringify": "^2.0.0", "tslib": "^1.9.3" ->>>>>>> develop } }, "append-transform": { @@ -3114,15 +2698,9 @@ } }, "auth0-js": { -<<<<<<< HEAD - "version": "9.8.2", - "resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.8.2.tgz", - "integrity": "sha512-fwUkIABBA0e1B6hfkePtjOFlhXzvOUc/ZFx3NE1X9Ij3VZeqtJK7QU/Pc6tar+NkOpgZbRUXkxEG5qPGiwixWQ==", -======= "version": "9.10.0", "resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.10.0.tgz", "integrity": "sha512-cHE4cGQRMjCS6IorIWdH2wdYSpDQchHq/xQOn7FlEaquDrb2zgQi4G5AWzO7wW2ED4UZsX4rHElc2BMZev8rGA==", ->>>>>>> develop "requires": { "base64-js": "^1.2.0", "idtoken-verifier": "^1.2.0", @@ -3145,11 +2723,7 @@ "resolved": "https://registry.npmjs.org/auth0-lock/-/auth0-lock-11.14.0.tgz", "integrity": "sha512-JpxmRoGLxFxoHLuE7ViJBEDWIwy0pmvwj+yEfysjWlv0qme2UkOgSuIYtdjh5uBygi7Ye9j9XznjuAoe7uL9zg==", "requires": { -<<<<<<< HEAD - "auth0-js": "^9.8.2", -======= "auth0-js": "^9.10.0", ->>>>>>> develop "auth0-password-policies": "^1.0.2", "blueimp-md5": "2.3.1", "fbjs": "^0.3.1", @@ -3166,7 +2740,7 @@ "dependencies": { "fbjs": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz", + "resolved": "http://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz", "integrity": "sha1-AzpUBZUIS13jUJpAXQbxoqjlufs=", "requires": { "core-js": "^1.0.0", @@ -3233,7 +2807,7 @@ }, "whatwg-fetch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz", + "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz", "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=" } } @@ -3252,19 +2826,11 @@ "integrity": "sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==", "dev": true, "requires": { -<<<<<<< HEAD - "browserslist": "^4.3.6", - "caniuse-lite": "^1.0.30000921", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.6", -======= "browserslist": "^4.4.1", "caniuse-lite": "^1.0.30000932", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", "postcss": "^7.0.14", ->>>>>>> develop "postcss-value-parser": "^3.3.1" } }, @@ -3282,7 +2848,7 @@ }, "axios": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "dev": true, "requires": { @@ -3443,82 +3009,10 @@ "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==", "dev": true, "requires": { -<<<<<<< HEAD - "find-cache-dir": "^1.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1", - "util.promisify": "^1.0.0" - }, - "dependencies": { - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - } -======= "find-cache-dir": "^2.0.0", "loader-utils": "^1.0.2", "mkdirp": "^0.5.1", "util.promisify": "^1.0.0" ->>>>>>> develop } }, "babel-messages": { @@ -3927,8 +3421,6 @@ "dev": true, "requires": { "regenerator-runtime": "^0.12.0" -<<<<<<< HEAD -======= } }, "babel-loader": { @@ -3941,7 +3433,6 @@ "loader-utils": "^1.0.2", "mkdirp": "^0.5.1", "util.promisify": "^1.0.0" ->>>>>>> develop } }, "babel-plugin-macros": { @@ -3952,8 +3443,6 @@ "requires": { "cosmiconfig": "^5.0.5", "resolve": "^1.8.1" -<<<<<<< HEAD -======= } }, "find-cache-dir": { @@ -3974,7 +3463,6 @@ "dev": true, "requires": { "locate-path": "^2.0.0" ->>>>>>> develop } }, "json5": { @@ -4568,15 +4056,9 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", "requires": { -<<<<<<< HEAD - "caniuse-lite": "^1.0.30000921", - "electron-to-chromium": "^1.3.92", - "node-releases": "^1.1.1" -======= "caniuse-lite": "^1.0.30000929", "electron-to-chromium": "^1.3.103", "node-releases": "^1.1.3" ->>>>>>> develop } }, "bser": { @@ -4635,18 +4117,6 @@ "dev": true }, "cacache": { -<<<<<<< HEAD - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.1.tgz", - "integrity": "sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==", - "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "figgy-pudding": "^3.1.0", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.3", -======= "version": "11.3.2", "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", @@ -4657,19 +4127,13 @@ "glob": "^7.1.3", "graceful-fs": "^4.1.15", "lru-cache": "^5.1.1", ->>>>>>> develop "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.2", -<<<<<<< HEAD - "ssri": "^6.0.0", - "unique-filename": "^1.1.0", -======= "ssri": "^6.0.1", "unique-filename": "^1.1.1", ->>>>>>> develop "y18n": "^4.0.0" } }, @@ -4802,8 +4266,6 @@ "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" -<<<<<<< HEAD -======= }, "dependencies": { "supports-color": { @@ -4814,7 +4276,6 @@ "has-flag": "^3.0.0" } } ->>>>>>> develop } }, "change-emitter": { @@ -4835,26 +4296,6 @@ "dev": true }, "chokidar": { -<<<<<<< HEAD - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" -======= "version": "2.1.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.0.tgz", "integrity": "sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==", @@ -4872,7 +4313,6 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", "upath": "^1.1.0" ->>>>>>> develop }, "dependencies": { "array-unique": { @@ -4927,13 +4367,8 @@ "dev": true, "optional": true, "requires": { -<<<<<<< HEAD - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" -======= "nan": "^2.9.2", "node-pre-gyp": "^0.10.0" ->>>>>>> develop }, "dependencies": { "abbrev": { @@ -4960,10 +4395,6 @@ "dev": true, "optional": true, "requires": { -<<<<<<< HEAD - "is-extglob": "^2.1.0" - } -======= "delegates": "^1.0.0", "readable-stream": "^2.0.6" } @@ -5495,7 +4926,6 @@ "requires": { "is-extglob": "^2.1.0" } ->>>>>>> develop } } }, @@ -5522,15 +4952,12 @@ "requires": { "kind-of": "^3.0.2" } -<<<<<<< HEAD -======= }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true ->>>>>>> develop } } }, @@ -5614,8 +5041,6 @@ "dev": true, "requires": { "restore-cursor": "^2.0.0" -<<<<<<< HEAD -======= } }, "cli-table3": { @@ -5627,7 +5052,6 @@ "colors": "^1.1.2", "object-assign": "^4.1.0", "string-width": "^2.1.1" ->>>>>>> develop } }, "cli-width": { @@ -5645,26 +5069,6 @@ "string-width": "^2.1.1", "strip-ansi": "^4.0.0", "wrap-ansi": "^2.0.0" -<<<<<<< HEAD - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } -======= ->>>>>>> develop } }, "clone": { @@ -5686,12 +5090,6 @@ "shallow-clone": "^0.1.2" } }, - "clsx": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.0.3.tgz", - "integrity": "sha512-xLoSw6DMp7YvbEeLrQJBcWWRRerdHrU1WHoL1hYJOKUeDpVMRq7pv7NI2JHQbCRAe5ptINNzhdYmtfN6MsdCUw==", - "dev": true - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -6037,13 +5435,13 @@ "dependencies": { "node-fetch": { "version": "2.1.2", - "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=", "dev": true }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==", "dev": true } @@ -6086,15 +5484,6 @@ "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" }, - "css-box-model": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.1.1.tgz", - "integrity": "sha512-ZxbuLFeAPEDb0wPbGfT7783Vb00MVAkvOlMKwr0kA2PD5EGxk6P3MAhedvVuyVJCWb54bb+6HQ7pdPYENf8AZw==", - "dev": true, - "requires": { - "tiny-invariant": "^1.0.3" - } - }, "css-color-names": { "version": "0.0.4", "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -6138,8 +5527,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -6149,7 +5536,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -6277,25 +5663,15 @@ "integrity": "sha512-5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig==", "requires": { "cosmiconfig": "^5.0.0", -<<<<<<< HEAD - "cssnano-preset-default": "^4.0.5", -======= "cssnano-preset-default": "^4.0.6", ->>>>>>> develop "is-resolvable": "^1.0.0", "postcss": "^7.0.0" } }, "cssnano-preset-default": { -<<<<<<< HEAD - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz", - "integrity": "sha512-f1uhya0ZAjPYtDD58QkBB0R+uYdzHPei7cDxJyQQIHt5acdhyGXaSXl2nDLzWHLwGFbZcHxQtkJS8mmNwnxTvw==", -======= "version": "4.0.6", "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.6.tgz", "integrity": "sha512-UPboYbFaJFtDUhJ4fqctThWbbyF4q01/7UhsZbLzp35l+nUxtzh1SifoVlEfyLM3n3Z0htd8B1YlCxy9i+bQvg==", ->>>>>>> develop "requires": { "css-declaration-sorter": "^4.0.1", "cssnano-util-raw-cache": "^4.0.1", @@ -6307,11 +5683,7 @@ "postcss-discard-duplicates": "^4.0.2", "postcss-discard-empty": "^4.0.1", "postcss-discard-overridden": "^4.0.1", -<<<<<<< HEAD - "postcss-merge-longhand": "^4.0.9", -======= "postcss-merge-longhand": "^4.0.10", ->>>>>>> develop "postcss-merge-rules": "^4.0.2", "postcss-minify-font-values": "^4.0.2", "postcss-minify-gradients": "^4.0.1", @@ -6446,12 +5818,6 @@ "whatwg-url": "^7.0.0" } }, - "date-fns": { - "version": "2.0.0-alpha.27", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.27.tgz", - "integrity": "sha512-cqfVLS+346P/Mpj2RpDrBv0P4p2zZhWWvfY5fuWrXNR/K38HaAGEkeOwb47hIpQP9Jr/TIxjZ2/sNMQwdXuGMg==", - "dev": true - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -6916,11 +6282,7 @@ "integrity": "sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==", "dev": true, "requires": { -<<<<<<< HEAD - "dotenv": "^5.0.1" -======= "dotenv-defaults": "^1.0.2" ->>>>>>> develop } }, "duplexer": { @@ -7056,20 +6418,12 @@ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", "requires": { -<<<<<<< HEAD - "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": "^1.2.0", "function-bind": "^1.1.1", "has": "^1.0.3", "is-callable": "^1.1.4", "is-regex": "^1.0.4", "object-keys": "^1.0.12" ->>>>>>> develop } }, "es-to-primitive": { @@ -7115,15 +6469,9 @@ } }, "eslint": { -<<<<<<< HEAD - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz", - "integrity": "sha512-HpqzC+BHULKlnPwWae9MaVZ5AXJKpkxCVXQHrFaRw3hbDj26V/9ArYM4Rr/SQ8pi6qUPLXSSXC4RBJlyq2Z2OQ==", -======= "version": "5.13.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz", "integrity": "sha512-nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg==", ->>>>>>> develop "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -7143,10 +6491,7 @@ "glob": "^7.1.2", "globals": "^11.7.0", "ignore": "^4.0.6", -<<<<<<< HEAD -======= "import-fresh": "^3.0.0", ->>>>>>> develop "imurmurhash": "^0.1.4", "inquirer": "^6.1.0", "js-yaml": "^3.12.0", @@ -7158,15 +6503,8 @@ "natural-compare": "^1.4.0", "optionator": "^0.8.2", "path-is-inside": "^1.0.2", -<<<<<<< HEAD - "pluralize": "^7.0.0", "progress": "^2.0.0", "regexpp": "^2.0.1", - "require-uncached": "^1.0.3", -======= - "progress": "^2.0.0", - "regexpp": "^2.0.1", ->>>>>>> develop "semver": "^5.5.1", "strip-ansi": "^4.0.0", "strip-json-comments": "^2.0.1", @@ -7201,14 +6539,8 @@ "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" -======= "parent-module": "^1.0.0", "resolve-from": "^4.0.0" ->>>>>>> develop } }, "resolve-from": { @@ -7223,13 +6555,9 @@ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "^3.0.0" -======= "ansi-styles": "^3.2.0", "astral-regex": "^1.0.0", "is-fullwidth-code-point": "^2.0.0" ->>>>>>> develop } }, "table": { @@ -7240,11 +6568,7 @@ "requires": { "ajv": "^6.6.1", "lodash": "^4.17.11", -<<<<<<< HEAD - "slice-ansi": "2.0.0", -======= "slice-ansi": "^2.0.0", ->>>>>>> develop "string-width": "^2.1.1" } } @@ -7327,11 +6651,7 @@ "dev": true, "requires": { "debug": "^2.6.8", -<<<<<<< HEAD - "pkg-dir": "^1.0.0" -======= "pkg-dir": "^2.0.0" ->>>>>>> develop }, "dependencies": { "debug": { @@ -7349,10 +6669,6 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { -<<<<<<< HEAD - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" -======= "locate-path": "^2.0.0" } }, @@ -7364,7 +6680,6 @@ "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" ->>>>>>> develop } }, "ms": { @@ -7379,11 +6694,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { -<<<<<<< HEAD - "pinkie-promise": "^2.0.0" -======= "p-try": "^1.0.0" ->>>>>>> develop } }, "p-locate": { @@ -7407,11 +6718,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { -<<<<<<< HEAD - "find-up": "^1.0.0" -======= "find-up": "^2.1.0" ->>>>>>> develop } } } @@ -7442,17 +6749,6 @@ "dev": true, "requires": { "contains-path": "^0.1.0", -<<<<<<< HEAD - "debug": "^2.6.8", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.1", - "eslint-module-utils": "^2.2.0", - "has": "^1.0.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.3", - "read-pkg-up": "^2.0.0", - "resolve": "^1.6.0" -======= "debug": "^2.6.9", "doctrine": "1.5.0", "eslint-import-resolver-node": "^0.3.2", @@ -7462,7 +6758,6 @@ "minimatch": "^3.0.4", "read-pkg-up": "^2.0.0", "resolve": "^1.9.0" ->>>>>>> develop }, "dependencies": { "debug": { @@ -7495,7 +6790,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { @@ -7638,13 +6933,9 @@ "doctrine": "^2.1.0", "has": "^1.0.3", "jsx-ast-utils": "^2.0.1", -<<<<<<< HEAD - "prop-types": "^15.6.2" -======= "object.fromentries": "^2.0.0", "prop-types": "^15.6.2", "resolve": "^1.9.0" ->>>>>>> develop } }, "eslint-plugin-standard": { @@ -7773,34 +7064,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { -<<<<<<< HEAD - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", -======= "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", ->>>>>>> develop "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" -<<<<<<< HEAD - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } -======= ->>>>>>> develop } }, "exenv": { @@ -8415,12 +7685,6 @@ "schema-utils": "^1.0.0" } }, - "filefy": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/filefy/-/filefy-0.1.9.tgz", - "integrity": "sha512-M+9HcR+Hu0LTh5qYTHRnmA2dm+WBHCG6WU+Biw/84RamiV41DzEArSLockUQ0qCSV1fJI0BoCpnniVG/Ch5tMw==", - "dev": true - }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -8712,36 +7976,11 @@ } } } -<<<<<<< HEAD - } - } - }, - "finalhandler": { - "version": "1.1.1", - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", - "dev": true, - "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" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -======= }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", ->>>>>>> develop "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -8860,33 +8099,6 @@ } } }, -<<<<<<< HEAD - "find-cache-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz", - "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^3.0.0" - } - }, - "find-root": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", - "dev": true - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, -======= ->>>>>>> develop "flat-cache": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", @@ -8916,13 +8128,8 @@ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "requires": { -<<<<<<< HEAD - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" -======= "inherits": "^2.0.3", "readable-stream": "^2.3.6" ->>>>>>> develop } }, "follow-redirects": { @@ -9956,8 +9163,6 @@ "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" -<<<<<<< HEAD -======= } }, "strip-ansi": { @@ -9967,7 +9172,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } } } @@ -10286,8 +9490,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "ansi-regex": { @@ -10296,7 +9498,6 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true } ->>>>>>> develop } }, "has-flag": { @@ -10442,11 +9643,7 @@ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", "requires": { -<<<<<<< HEAD - "react-is": "^16.3.2" -======= "react-is": "^16.7.0" ->>>>>>> develop } }, "home-or-tmp": { @@ -10549,7 +9746,7 @@ }, "html-webpack-plugin": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", + "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { @@ -11041,8 +10238,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -11052,7 +10247,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -11262,23 +10456,6 @@ "dev": true }, "inquirer": { -<<<<<<< HEAD - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", - "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.0", - "figures": "^2.0.0", - "lodash": "^4.17.10", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.1.0", -======= "version": "6.2.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==", @@ -11294,7 +10471,6 @@ "mute-stream": "0.0.7", "run-async": "^2.2.0", "rxjs": "^6.4.0", ->>>>>>> develop "string-width": "^2.1.0", "strip-ansi": "^5.0.0", "through": "^2.3.6" @@ -12049,11 +11225,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "^3.0.0" -======= "camelcase": "^4.1.0" ->>>>>>> develop } } } @@ -12457,8 +11629,6 @@ "private": "^0.1.8", "slash": "^1.0.0", "source-map": "^0.5.7" -<<<<<<< HEAD -======= } }, "camelcase": { @@ -12644,7 +11814,6 @@ "which-module": "^2.0.0", "y18n": "^3.2.1", "yargs-parser": "^9.0.2" ->>>>>>> develop } }, "yargs-parser": { @@ -12778,15 +11947,9 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsdom": { -<<<<<<< HEAD - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-13.1.0.tgz", - "integrity": "sha512-C2Kp0qNuopw0smXFaHeayvharqF3kkcNqlcIlSX71+3XrsOFwkEPLt/9f5JksMmaul2JZYIQuY+WTpqHpQQcLg==", -======= "version": "13.2.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz", "integrity": "sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw==", ->>>>>>> develop "dev": true, "requires": { "abab": "^2.0.0", @@ -12804,11 +11967,7 @@ "pn": "^1.1.0", "request": "^2.88.0", "request-promise-native": "^1.0.5", -<<<<<<< HEAD - "saxes": "^3.1.4", -======= "saxes": "^3.1.5", ->>>>>>> develop "symbol-tree": "^3.2.2", "tough-cookie": "^2.5.0", "w3c-hr-time": "^1.0.1", @@ -13076,11 +12235,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { -<<<<<<< HEAD - "invert-kv": "^1.0.0" -======= "invert-kv": "^2.0.0" ->>>>>>> develop } }, "left-pad": { @@ -13179,15 +12334,9 @@ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "requires": { -<<<<<<< HEAD - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0" -======= "big.js": "^5.2.2", "emojis-list": "^2.0.0", "json5": "^1.0.1" ->>>>>>> develop } }, "locate-path": { @@ -13336,8 +12485,6 @@ "has-ansi": "^2.0.0", "strip-ansi": "^3.0.0", "supports-color": "^2.0.0" -<<<<<<< HEAD -======= } }, "strip-ansi": { @@ -13347,7 +12494,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } }, "supports-color": { @@ -13387,12 +12533,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "requires": { -<<<<<<< HEAD - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" -======= "yallist": "^3.0.2" ->>>>>>> develop } }, "luxon": { @@ -13416,18 +12557,6 @@ "dev": true, "requires": { "minimist": "^1.2.0" -<<<<<<< HEAD - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true, - "optional": true - } -======= ->>>>>>> develop } }, "makeerror": { @@ -13473,52 +12602,6 @@ "dev": true, "requires": { "object-visit": "^1.0.0" -<<<<<<< HEAD -======= - } - }, - "material-table": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/material-table/-/material-table-1.24.0.tgz", - "integrity": "sha512-TwG+pyRrbisMNGhicvdSkdR5fh/nVo6Oeb8wLw763AhGFQeS0wzw+q74uCbrQJm+JOwnWYEfz9goTe3DQKqw8w==", - "dev": true, - "requires": { - "@date-io/date-fns": "^1.1.0", - "@material-ui/core": "^3.9.2", - "classnames": "^2.2.6", - "date-fns": "^2.0.0-alpha.27", - "debounce": "^1.2.0", - "filefy": "0.1.9", - "material-ui-pickers": "2.2.4", - "prop-types": "^15.6.2", - "react-beautiful-dnd": "10.0.4", - "react-double-scrollbar": "0.0.15" - }, - "dependencies": { - "material-ui-pickers": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/material-ui-pickers/-/material-ui-pickers-2.2.4.tgz", - "integrity": "sha512-QCQh08Ylmnt+o4laW+rPs92QRAcESv3sPXl50YadLm++rAZAXAOh3K8lreGdynCMYFgZfdyu81Oz9xzTlAZNfw==", - "dev": true, - "requires": { - "@types/react-text-mask": "^5.4.3", - "clsx": "^1.0.2", - "react-event-listener": "^0.6.6", - "react-text-mask": "^5.4.3", - "react-transition-group": "^2.5.3", - "tslib": "^1.9.3" - } - }, - "react-text-mask": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/react-text-mask/-/react-text-mask-5.4.3.tgz", - "integrity": "sha1-mR77QpnjDC5sLEbRP2FxaUY+DS0=", - "dev": true, - "requires": { - "prop-types": "^15.5.6" - } - } ->>>>>>> develop } }, "material-ui-pickers": { @@ -13569,13 +12652,9 @@ "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", "dev": true, "requires": { -<<<<<<< HEAD - "mimic-fn": "^1.0.0" -======= "map-age-cleaner": "^0.1.1", "mimic-fn": "^1.0.0", "p-is-promise": "^2.0.0" ->>>>>>> develop } }, "memoize-one": { @@ -13616,17 +12695,6 @@ "read-pkg-up": "^1.0.1", "redent": "^1.0.0", "trim-newlines": "^1.0.0" -<<<<<<< HEAD - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } -======= ->>>>>>> develop } }, "merge": { @@ -13919,24 +12987,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, - "ms-rest-js": { - "version": "0.21.413", - "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.21.413.tgz", - "integrity": "sha512-eX+M98Y9s+zo85Unt83TYkpuJkW4d0wuiHrpWjAxx/7YzZd3uVq8HRhJHXGDqCd22nlEvtwlchfgwILmBcWnOg==", - "dev": true, - "requires": { - "@types/express": "^4.11.1", - "@types/form-data": "^2.2.1", - "@types/node": "^9.4.6", - "@types/uuid": "^3.4.3", - "axios": "^0.18.0", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, "multicast-dns": { "version": "6.2.3", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", @@ -14096,15 +13146,9 @@ "dev": true }, "node-libs-browser": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", -======= "version": "2.2.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz", "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==", ->>>>>>> develop "dev": true, "requires": { "assert": "^1.1.1", @@ -14114,11 +13158,7 @@ "constants-browserify": "^1.0.0", "crypto-browserify": "^3.11.0", "domain-browser": "^1.1.1", -<<<<<<< HEAD - "events": "^1.0.0", -======= "events": "^3.0.0", ->>>>>>> develop "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", "path-browserify": "0.0.0", @@ -14132,11 +13172,7 @@ "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", "url": "^0.11.0", -<<<<<<< HEAD - "util": "^0.10.3", -======= "util": "^0.11.0", ->>>>>>> develop "vm-browserify": "0.0.4" }, "dependencies": { @@ -14155,10 +13191,7 @@ "dev": true, "requires": { "growly": "^1.3.0", -<<<<<<< HEAD -======= "is-wsl": "^1.1.0", ->>>>>>> develop "semver": "^5.5.0", "shellwords": "^0.1.1", "which": "^1.3.0" @@ -14213,7 +13246,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -14232,8 +13265,6 @@ "requires": { "lru-cache": "^4.0.1", "which": "^1.2.9" -<<<<<<< HEAD -======= } }, "lru-cache": { @@ -14253,7 +13284,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } }, "supports-color": { @@ -14317,27 +13347,6 @@ "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==" }, "npm": { -<<<<<<< HEAD - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/npm/-/npm-6.5.0.tgz", - "integrity": "sha512-SPq8zG2Kto+Xrq55E97O14Jla13PmQT5kSnvwBj88BmJZ5Nvw++OmlWfhjkB67pcgP5UEXljEtnGFKZtOgt6MQ==", - "requires": { - "JSONStream": "^1.3.4", - "abbrev": "~1.1.1", - "ansicolors": "~0.3.2", - "ansistyles": "~0.1.3", - "aproba": "~1.2.0", - "archy": "~1.0.0", - "bin-links": "^1.1.2", - "bluebird": "^3.5.3", - "byte-size": "^4.0.3", - "cacache": "^11.2.0", - "call-limit": "~1.1.0", - "chownr": "~1.0.1", - "ci-info": "^1.6.0", - "cli-columns": "^3.1.2", - "cli-table3": "^0.5.0", -======= "version": "6.7.0", "resolved": "https://registry.npmjs.org/npm/-/npm-6.7.0.tgz", "integrity": "sha512-OtxCLzx+pcsjMGrjZpBp214ZjxzHcAe3zLYIlaVpRYqFHff6bgggyTLf2OZPO8lfxN0RHLJnFFUU016JCzM/Ww==", @@ -14357,7 +13366,6 @@ "ci-info": "^2.0.0", "cli-columns": "^3.1.2", "cli-table3": "^0.5.1", ->>>>>>> develop "cmd-shim": "~2.0.2", "columnify": "~1.5.4", "config-chain": "^1.1.12", @@ -14381,13 +13389,6 @@ "inherits": "~2.0.3", "ini": "^1.3.5", "init-package-json": "^1.10.3", -<<<<<<< HEAD - "is-cidr": "^2.0.6", - "json-parse-better-errors": "^1.0.2", - "lazy-property": "~1.0.0", - "libcipm": "^2.0.2", - "libnpmhook": "^4.0.1", -======= "is-cidr": "^3.0.0", "json-parse-better-errors": "^1.0.2", "lazy-property": "~1.0.0", @@ -14398,7 +13399,6 @@ "libnpmorg": "*", "libnpmsearch": "*", "libnpmteam": "*", ->>>>>>> develop "libnpx": "^10.2.0", "lock-verify": "^2.0.2", "lockfile": "^1.0.4", @@ -14413,11 +13413,7 @@ "lodash.union": "~4.6.0", "lodash.uniq": "~4.5.0", "lodash.without": "~4.4.0", -<<<<<<< HEAD - "lru-cache": "^4.1.3", -======= "lru-cache": "^4.1.5", ->>>>>>> develop "meant": "~1.0.1", "mississippi": "^3.0.0", "mkdirp": "~0.5.1", @@ -14425,60 +13421,31 @@ "node-gyp": "^3.8.0", "nopt": "~4.0.1", "normalize-package-data": "~2.4.0", -<<<<<<< HEAD - "npm-audit-report": "^1.3.1", -======= "npm-audit-report": "^1.3.2", ->>>>>>> develop "npm-cache-filename": "~1.0.2", "npm-install-checks": "~3.0.0", "npm-lifecycle": "^2.1.0", "npm-package-arg": "^6.1.0", -<<<<<<< HEAD - "npm-packlist": "^1.1.12", - "npm-pick-manifest": "^2.1.0", - "npm-profile": "^3.0.2", - "npm-registry-client": "^8.6.0", - "npm-registry-fetch": "^1.1.0", -======= "npm-packlist": "^1.2.0", "npm-pick-manifest": "^2.2.3", "npm-profile": "*", "npm-registry-fetch": "^3.8.0", ->>>>>>> develop "npm-user-validate": "~1.0.0", "npmlog": "~4.1.2", "once": "~1.4.0", "opener": "^1.5.1", "osenv": "^0.1.5", -<<<<<<< HEAD - "pacote": "^8.1.6", - "path-is-inside": "~1.0.2", - "promise-inflight": "~1.0.1", - "qrcode-terminal": "^0.12.0", - "query-string": "^6.1.0", -======= "pacote": "^9.4.0", "path-is-inside": "~1.0.2", "promise-inflight": "~1.0.1", "qrcode-terminal": "^0.12.0", "query-string": "^6.2.0", ->>>>>>> develop "qw": "~1.0.1", "read": "~1.0.7", "read-cmd-shim": "~1.0.1", "read-installed": "~4.0.3", "read-package-json": "^2.0.13", "read-package-tree": "^5.2.1", -<<<<<<< HEAD - "readable-stream": "^2.3.6", - "readdir-scoped-modules": "*", - "request": "^2.88.0", - "retry": "^0.12.0", - "rimraf": "~2.6.2", - "safe-buffer": "^5.1.2", - "semver": "^5.5.1", -======= "readable-stream": "^3.1.1", "readdir-scoped-modules": "*", "request": "^2.88.0", @@ -14486,7 +13453,6 @@ "rimraf": "^2.6.3", "safe-buffer": "^5.1.2", "semver": "^5.6.0", ->>>>>>> develop "sha": "~2.0.1", "slide": "~1.1.6", "sorted-object": "~2.0.1", @@ -14498,11 +13464,7 @@ "tiny-relative-date": "^1.3.0", "uid-number": "0.0.6", "umask": "~1.1.0", -<<<<<<< HEAD - "unique-filename": "~1.1.0", -======= "unique-filename": "^1.1.1", ->>>>>>> develop "unpipe": "~1.0.0", "update-notifier": "^2.5.0", "uuid": "^3.3.2", @@ -14510,11 +13472,7 @@ "validate-npm-package-name": "~3.0.0", "which": "^1.3.1", "worker-farm": "^1.6.0", -<<<<<<< HEAD - "write-file-atomic": "^2.3.0" -======= "write-file-atomic": "^2.4.2" ->>>>>>> develop }, "dependencies": { "JSONStream": { @@ -14593,8 +13551,6 @@ "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -14617,7 +13573,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "asap": { @@ -14726,31 +13681,17 @@ "version": "11.3.2", "bundled": true, "requires": { -<<<<<<< HEAD - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "figgy-pudding": "^3.1.0", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.3", -======= "bluebird": "^3.5.3", "chownr": "^1.1.1", "figgy-pudding": "^3.5.1", "glob": "^7.1.3", "graceful-fs": "^4.1.15", "lru-cache": "^5.1.1", ->>>>>>> develop "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.2", -<<<<<<< HEAD - "ssri": "^6.0.0", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" -======= "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" @@ -14778,7 +13719,6 @@ "version": "3.0.3", "bundled": true } ->>>>>>> develop } }, "call-limit": { @@ -14927,8 +13867,6 @@ "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -14951,7 +13889,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "config-chain": { @@ -15118,8 +14055,6 @@ "inherits": "^2.0.1", "readable-stream": "^2.0.0", "stream-shift": "^1.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -15142,7 +14077,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "ecc-jsbn": { @@ -15209,15 +14143,12 @@ "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "get-stream": { "version": "3.0.0", "bundled": true } ->>>>>>> develop } }, "extend": { @@ -15257,8 +14188,6 @@ "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.4" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -15281,7 +14210,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "forever-agent": { @@ -15303,8 +14231,6 @@ "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -15327,7 +14253,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "fs-minipass": { @@ -15505,15 +14430,12 @@ "timed-out": "^4.0.0", "unzip-response": "^2.0.1", "url-parse-lax": "^1.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "get-stream": { "version": "3.0.0", "bundled": true } ->>>>>>> develop } }, "graceful-fs": { @@ -15660,26 +14582,19 @@ "bundled": true, "requires": { "ci-info": "^1.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "ci-info": { "version": "1.6.0", "bundled": true } ->>>>>>> develop } }, "is-cidr": { "version": "3.0.0", "bundled": true, "requires": { -<<<<<<< HEAD - "cidr-regex": "^2.0.8" -======= "cidr-regex": "^2.0.10" ->>>>>>> develop } }, "is-fullwidth-code-point": { @@ -15844,22 +14759,6 @@ "version": "3.0.1", "bundled": true, "requires": { -<<<<<<< HEAD - "bin-links": "^1.1.2", - "bluebird": "^3.5.1", - "find-npm-prefix": "^1.0.2", - "graceful-fs": "^4.1.11", - "lock-verify": "^2.0.2", - "mkdirp": "^0.5.1", - "npm-lifecycle": "^2.0.3", - "npm-logical-tree": "^1.2.1", - "npm-package-arg": "^6.1.0", - "pacote": "^8.1.6", - "protoduck": "^5.0.0", - "read-package-json": "^2.0.13", - "rimraf": "^2.6.2", - "worker-farm": "^1.6.0" -======= "aproba": "^2.0.0", "get-stream": "^4.0.0", "npm-package-arg": "^6.1.0", @@ -15870,21 +14769,15 @@ "version": "2.0.0", "bundled": true } ->>>>>>> develop } }, "libnpmconfig": { "version": "1.2.1", "bundled": true, "requires": { -<<<<<<< HEAD - "figgy-pudding": "^3.1.0", - "npm-registry-fetch": "^3.0.0" -======= "figgy-pudding": "^3.5.1", "find-up": "^3.0.0", "ini": "^1.3.5" ->>>>>>> develop }, "dependencies": { "find-up": { @@ -15913,15 +14806,7 @@ "version": "3.0.0", "bundled": true, "requires": { -<<<<<<< HEAD - "bluebird": "^3.5.1", - "figgy-pudding": "^3.1.0", - "lru-cache": "^4.1.2", - "make-fetch-happen": "^4.0.0", - "npm-package-arg": "^6.0.0" -======= "p-limit": "^2.0.0" ->>>>>>> develop } }, "p-try": { @@ -16219,15 +15104,12 @@ "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.3" -<<<<<<< HEAD -======= }, "dependencies": { "aproba": { "version": "1.2.0", "bundled": true } ->>>>>>> develop } }, "ms": { @@ -16368,176 +15250,30 @@ "version": "2.2.3", "bundled": true, "requires": { -<<<<<<< HEAD -======= "figgy-pudding": "^3.5.1", ->>>>>>> develop "npm-package-arg": "^6.0.0", "semver": "^5.4.1" } }, "npm-profile": { -<<<<<<< HEAD - "version": "3.0.2", - "bundled": true, - "requires": { - "aproba": "^1.1.2 || 2", - "make-fetch-happen": "^2.5.0 || 3 || 4" - } - }, - "npm-registry-client": { - "version": "8.6.0", - "bundled": true, - "requires": { - "concat-stream": "^1.5.2", - "graceful-fs": "^4.1.6", - "normalize-package-data": "~1.0.1 || ^2.0.0", - "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", - "npmlog": "2 || ^3.1.0 || ^4.0.0", - "once": "^1.3.3", - "request": "^2.74.0", - "retry": "^0.10.0", - "safe-buffer": "^5.1.1", - "semver": "2 >=2.2.1 || 3.x || 4 || 5", - "slide": "^1.1.3", - "ssri": "^5.2.4" - }, - "dependencies": { - "retry": { - "version": "0.10.1", - "bundled": true - }, - "ssri": { - "version": "5.3.0", - "bundled": true, - "requires": { - "safe-buffer": "^5.1.1" - } - } -======= "version": "4.0.1", "bundled": true, "requires": { "aproba": "^1.1.2 || 2", "figgy-pudding": "^3.4.1", "npm-registry-fetch": "^3.8.0" ->>>>>>> develop } }, "npm-registry-fetch": { "version": "3.8.0", "bundled": true, "requires": { -<<<<<<< HEAD - "bluebird": "^3.5.1", - "figgy-pudding": "^2.0.1", - "lru-cache": "^4.1.2", - "make-fetch-happen": "^3.0.0", - "npm-package-arg": "^6.0.0", - "safe-buffer": "^5.1.1" - }, - "dependencies": { - "cacache": { - "version": "10.0.4", - "bundled": true, - "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" - }, - "dependencies": { - "mississippi": { - "version": "2.0.0", - "bundled": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - } - } - }, - "figgy-pudding": { - "version": "2.0.1", - "bundled": true - }, - "make-fetch-happen": { - "version": "3.0.0", - "bundled": true, - "requires": { - "agentkeepalive": "^3.4.1", - "cacache": "^10.0.4", - "http-cache-semantics": "^3.8.1", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.0", - "lru-cache": "^4.1.2", - "mississippi": "^3.0.0", - "node-fetch-npm": "^2.0.2", - "promise-retry": "^1.1.1", - "socks-proxy-agent": "^3.0.1", - "ssri": "^5.2.4" - } - }, - "pump": { - "version": "2.0.1", - "bundled": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "smart-buffer": { - "version": "1.1.15", - "bundled": true - }, - "socks": { - "version": "1.1.10", - "bundled": true, - "requires": { - "ip": "^1.1.4", - "smart-buffer": "^1.0.13" - } - }, - "socks-proxy-agent": { - "version": "3.0.1", - "bundled": true, - "requires": { - "agent-base": "^4.1.0", - "socks": "^1.1.10" - } - }, - "ssri": { - "version": "5.3.0", - "bundled": true, - "requires": { - "safe-buffer": "^5.1.1" - } - } -======= "JSONStream": "^1.3.4", "bluebird": "^3.5.1", "figgy-pudding": "^3.4.1", "lru-cache": "^4.1.3", "make-fetch-happen": "^4.0.1", "npm-package-arg": "^6.1.0" ->>>>>>> develop } }, "npm-run-path": { @@ -16645,16 +15381,6 @@ "version": "9.4.0", "bundled": true, "requires": { -<<<<<<< HEAD - "bluebird": "^3.5.1", - "cacache": "^11.0.2", - "get-stream": "^3.0.0", - "glob": "^7.1.2", - "lru-cache": "^4.1.3", - "make-fetch-happen": "^4.0.1", - "minimatch": "^3.0.4", - "minipass": "^2.3.3", -======= "bluebird": "^3.5.3", "cacache": "^11.3.2", "figgy-pudding": "^3.5.1", @@ -16664,26 +15390,10 @@ "make-fetch-happen": "^4.0.1", "minimatch": "^3.0.4", "minipass": "^2.3.5", ->>>>>>> develop "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "normalize-package-data": "^2.4.0", "npm-package-arg": "^6.1.0", -<<<<<<< HEAD - "npm-packlist": "^1.1.10", - "npm-pick-manifest": "^2.1.0", - "osenv": "^0.1.5", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "protoduck": "^5.0.0", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.2", - "semver": "^5.5.0", - "ssri": "^6.0.0", - "tar": "^4.4.3", - "unique-filename": "^1.1.0", - "which": "^1.3.0" -======= "npm-packlist": "^1.1.12", "npm-pick-manifest": "^2.2.3", "npm-registry-fetch": "^3.8.0", @@ -16719,7 +15429,6 @@ "version": "3.0.3", "bundled": true } ->>>>>>> develop } }, "parallel-transform": { @@ -16729,8 +15438,6 @@ "cyclist": "~0.2.2", "inherits": "^2.0.3", "readable-stream": "^2.1.5" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -16753,7 +15460,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "path-exists": { @@ -16821,11 +15527,7 @@ "version": "5.0.1", "bundled": true, "requires": { -<<<<<<< HEAD - "genfun": "^4.0.1" -======= "genfun": "^5.0.0" ->>>>>>> develop } }, "prr": { @@ -16960,19 +15662,9 @@ "version": "3.1.1", "bundled": true, "requires": { -<<<<<<< HEAD - "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" -======= "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" ->>>>>>> develop } }, "readdir-scoped-modules": { @@ -17046,11 +15738,7 @@ "version": "2.6.3", "bundled": true, "requires": { -<<<<<<< HEAD - "glob": "^7.0.5" -======= "glob": "^7.1.3" ->>>>>>> develop } }, "run-queue": { @@ -17058,15 +15746,12 @@ "bundled": true, "requires": { "aproba": "^1.1.1" -<<<<<<< HEAD -======= }, "dependencies": { "aproba": { "version": "1.2.0", "bundled": true } ->>>>>>> develop } }, "safe-buffer": { @@ -17098,8 +15783,6 @@ "requires": { "graceful-fs": "^4.1.2", "readable-stream": "^2.0.2" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -17122,7 +15805,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "shebang-command": { @@ -17268,8 +15950,6 @@ "requires": { "readable-stream": "^2.1.5", "stream-shift": "^1.0.0" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -17292,7 +15972,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "stream-shift": { @@ -17413,8 +16092,6 @@ "requires": { "readable-stream": "^2.1.5", "xtend": "~4.0.1" -<<<<<<< HEAD -======= }, "dependencies": { "readable-stream": { @@ -17437,7 +16114,6 @@ "safe-buffer": "~5.1.0" } } ->>>>>>> develop } }, "timed-out": { @@ -17825,8 +16501,6 @@ "function-bind": "^1.1.1", "has-symbols": "^1.0.0", "object-keys": "^1.0.11" -<<<<<<< HEAD -======= } }, "object.fromentries": { @@ -17839,7 +16513,6 @@ "es-abstract": "^1.11.0", "function-bind": "^1.1.1", "has": "^1.0.1" ->>>>>>> develop } }, "object.getownpropertydescriptors": { @@ -17875,17 +16548,10 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", "requires": { -<<<<<<< HEAD - "define-properties": "^1.1.2", - "es-abstract": "^1.6.1", - "function-bind": "^1.1.0", - "has": "^1.0.1" -======= "define-properties": "^1.1.3", "es-abstract": "^1.12.0", "function-bind": "^1.1.1", "has": "^1.0.3" ->>>>>>> develop } }, "obuf": { @@ -18017,15 +16683,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { -<<<<<<< HEAD - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" -======= "execa": "^1.0.0", "lcid": "^2.0.0", "mem": "^4.0.0" ->>>>>>> develop } }, "os-tmpdir": { @@ -18112,8 +16772,6 @@ "dev": true, "requires": { "no-case": "^2.2.0" -<<<<<<< HEAD -======= } }, "parent-module": { @@ -18131,7 +16789,6 @@ "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==", "dev": true } ->>>>>>> develop } }, "parse-asn1": { @@ -18144,12 +16801,8 @@ "browserify-aes": "^1.0.0", "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", -<<<<<<< HEAD - "pbkdf2": "^3.0.3" -======= "pbkdf2": "^3.0.3", "safe-buffer": "^5.1.1" ->>>>>>> develop } }, "parse-glob": { @@ -18441,15 +17094,9 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", "requires": { -<<<<<<< HEAD - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.5.0" -======= "chalk": "^2.4.2", "source-map": "^0.6.1", "supports-color": "^6.1.0" ->>>>>>> develop } }, "postcss-attribute-case-insensitive": { @@ -18460,22 +17107,6 @@ "requires": { "postcss": "^7.0.2", "postcss-selector-parser": "^5.0.0" -<<<<<<< HEAD - }, - "dependencies": { - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", - "dev": true, - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } -======= ->>>>>>> develop } }, "postcss-calc": { @@ -18893,8 +17524,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -18904,7 +17533,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -18928,8 +17556,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -18939,7 +17565,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -18963,8 +17588,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -18974,7 +17597,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -18998,8 +17620,6 @@ "chalk": "^2.4.1", "source-map": "^0.6.1", "supports-color": "^5.4.0" -<<<<<<< HEAD -======= } }, "supports-color": { @@ -19009,7 +17629,6 @@ "dev": true, "requires": { "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -19545,18 +18164,6 @@ "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", "dev": true }, -<<<<<<< HEAD - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, -======= ->>>>>>> develop "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", @@ -19614,7 +18221,7 @@ }, "acorn-jsx": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { @@ -19623,7 +18230,7 @@ "dependencies": { "acorn": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } @@ -19681,7 +18288,7 @@ }, "eslint": { "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { @@ -19727,7 +18334,7 @@ }, "espree": { "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz", "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { @@ -19737,7 +18344,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -19865,7 +18472,7 @@ }, "regexpp": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", "dev": true }, @@ -19878,18 +18485,6 @@ "symbol-observable": "1.0.1" } }, -<<<<<<< HEAD - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, -======= ->>>>>>> develop "symbol-observable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", @@ -19942,17 +18537,6 @@ "requires": { "ansi-regex": "^3.0.0", "ansi-styles": "^3.2.0" -<<<<<<< HEAD - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - } -======= ->>>>>>> develop } }, "private": { @@ -20132,12 +18716,6 @@ "performance-now": "^2.1.0" } }, - "raf-schd": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.0.tgz", - "integrity": "sha512-m7zq0JkIrECzw9mO5Zcq6jN4KayE34yoIS9hJoiZNXyOAT06PPA8PrR+WtJIeFW09YjUfNkMMN9lrmAt6BURCA==", - "dev": true - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -20219,15 +18797,6 @@ "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", -<<<<<<< HEAD - "scheduler": "^0.11.2" - } - }, - "react-apollo": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz", - "integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==", -======= "scheduler": "^0.13.1" } }, @@ -20235,7 +18804,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.4.1.tgz", "integrity": "sha512-fSaiwXzY5xRmqKuGCtkMON8paL4/rKf4pB2aSI/0Ot8tn+gJisFqZ0iz9Pxvl6MHnJm1/gjJD3X1J4KmbYN2Yw==", ->>>>>>> develop "requires": { "fbjs": "^1.0.0", "hoist-non-react-statics": "^3.0.0", @@ -20267,6 +18835,15 @@ } } }, + "react-apollo-hooks": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/react-apollo-hooks/-/react-apollo-hooks-0.4.3.tgz", + "integrity": "sha512-mRFPb7bk42wOlGnIdwLc4XO43uTczdx7CzpdTmNwjzAgb/H/nKEXeZitoF1Wgtj0Zb6R5wTGs2nBIMfz0/DzEA==", + "dev": true, + "requires": { + "lodash": "^4.17.11" + } + }, "react-app-polyfill": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-0.2.0.tgz", @@ -20306,30 +18883,6 @@ } } }, - "react-beautiful-dnd": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-10.0.4.tgz", - "integrity": "sha512-j2Ra/mW48tXz1Mk6bNBuiENpRBt8wQcPbJgHSswmLDonUE8JPwVikaONoMavdowoMKQJoOJ9IwPTo82d/8aKKg==", - "dev": true, - "requires": { - "@babel/runtime-corejs2": "^7.3.0", - "css-box-model": "^1.1.1", - "memoize-one": "^5.0.0", - "prop-types": "^15.6.1", - "raf-schd": "^4.0.0", - "react-redux": "^5.0.7", - "redux": "^4.0.1", - "tiny-invariant": "^1.0.3" - }, - "dependencies": { - "memoize-one": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.0.tgz", - "integrity": "sha512-7g0+ejkOaI9w5x6LvQwmj68kUj6rxROywPSCqmclG/HBacmFnZqhVscQ8kovkn9FBCNJmOz6SY42+jnvZzDWdw==", - "dev": true - } - } - }, "react-d3-tree": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/react-d3-tree/-/react-d3-tree-1.12.2.tgz", @@ -20415,8 +18968,6 @@ "caniuse-lite": "^1.0.30000884", "electron-to-chromium": "^1.3.62", "node-releases": "^1.0.0-alpha.11" -<<<<<<< HEAD -======= } }, "chalk": { @@ -20428,7 +18979,6 @@ "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" ->>>>>>> develop } }, "inquirer": { @@ -20475,11 +19025,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "^3.0.0" -======= "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -20492,19 +19038,9 @@ "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", -<<<<<<< HEAD - "scheduler": "^0.11.2" -======= "scheduler": "^0.13.1" ->>>>>>> develop } }, - "react-double-scrollbar": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz", - "integrity": "sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=", - "dev": true - }, "react-dropzone": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-5.1.1.tgz", @@ -20526,25 +19062,9 @@ "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz", "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==", "requires": { -<<<<<<< HEAD - "@babel/runtime": "7.0.0", - "prop-types": "^15.6.0", - "warning": "^4.0.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz", - "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==", - "requires": { - "regenerator-runtime": "^0.12.0" - } - } -======= "@babel/runtime": "^7.2.0", "prop-types": "^15.6.0", "warning": "^4.0.1" ->>>>>>> develop } }, "react-helmet": { @@ -20560,15 +19080,9 @@ } }, "react-hot-loader": { -<<<<<<< HEAD - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.6.1.tgz", - "integrity": "sha512-BrMa/zyVq7aeHa2TDG6cVFgMiUut6OHZ/RkPqVHovsFbo0VI8VX7qCz2dYTDHFc9HtVrSUbJGd9LpFPIWtExBg==", -======= "version": "4.6.5", "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.6.5.tgz", "integrity": "sha512-ZPAJEWVd8KDdm6dcK0iWrnJiGHruLrcbkIpqn/wQmNjnROpsm2nzrWh23Yh3I/XAjB+35pMa/ZgariwGqwFD9A==", ->>>>>>> develop "dev": true, "requires": { "fast-levenshtein": "^2.0.6", @@ -20865,18 +19379,6 @@ "postcss-modules-values": "^1.3.0", "postcss-value-parser": "^3.3.0", "source-list-map": "^2.0.0" -<<<<<<< HEAD - } - }, - "decamelize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", - "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", - "dev": true, - "requires": { - "xregexp": "4.0.0" -======= ->>>>>>> develop } }, "dotenv": { @@ -20957,10 +19459,6 @@ "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==", "dev": true, "requires": { -<<<<<<< HEAD - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" -======= "contains-path": "^0.1.0", "debug": "^2.6.8", "doctrine": "1.5.0", @@ -20998,7 +19496,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } ->>>>>>> develop } }, "eslint-plugin-react": { @@ -21007,15 +19504,11 @@ "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==", "dev": true, "requires": { -<<<<<<< HEAD - "original": "^1.0.0" -======= "array-includes": "^3.0.3", "doctrine": "^2.1.0", "has": "^1.0.3", "jsx-ast-utils": "^2.0.1", "prop-types": "^15.6.2" ->>>>>>> develop } }, "eslint-scope": { @@ -21024,18 +19517,8 @@ "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { -<<<<<<< HEAD - "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" -======= "esrecurse": "^4.1.0", "estraverse": "^4.1.1" ->>>>>>> develop } }, "expand-brackets": { @@ -21222,30 +19705,6 @@ "dev": true, "requires": { "locate-path": "^2.0.0" -<<<<<<< HEAD - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - }, - "dependencies": { - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } -======= ->>>>>>> develop } }, "html-webpack-plugin": { @@ -21263,79 +19722,6 @@ "util.promisify": "1.0.0" } }, -<<<<<<< HEAD - "import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true, - "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "requires": { - "find-up": "^3.0.0" - } - } - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, -======= ->>>>>>> develop "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -21406,14 +19792,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { -<<<<<<< HEAD - "invert-kv": "^2.0.0" -======= "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" ->>>>>>> develop } }, "locate-path": { @@ -21432,14 +19814,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { -<<<<<<< HEAD - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^1.1.0" -======= "pseudomap": "^1.0.2", "yallist": "^2.1.2" ->>>>>>> develop } }, "micromatch": { @@ -21490,20 +19866,6 @@ "pumpify": "^1.3.3", "stream-each": "^1.1.0", "through2": "^2.0.0" -<<<<<<< HEAD - } - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" -======= ->>>>>>> develop } }, "p-limit": { @@ -21598,15 +19960,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { -<<<<<<< HEAD - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" -======= "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", "path-type": "^2.0.0" ->>>>>>> develop } }, "read-pkg-up": { @@ -21615,12 +19971,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { -<<<<<<< HEAD - "path-parse": "^1.0.5" -======= "find-up": "^2.0.0", "read-pkg": "^2.0.0" ->>>>>>> develop } }, "resolve": { @@ -21629,27 +19981,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { -<<<<<<< HEAD - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } -======= "path-parse": "^1.0.5" ->>>>>>> develop } }, "source-map": { @@ -21658,36 +19990,6 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, -<<<<<<< HEAD - "spdy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz", - "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - } - }, -======= ->>>>>>> develop "ssri": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", @@ -21703,11 +20005,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "^3.0.0" -======= "has-flag": "^3.0.0" ->>>>>>> develop } }, "uglify-es": { @@ -21802,152 +20100,15 @@ "requires": { "ajv": "^6.1.0", "ajv-keywords": "^3.1.0" -<<<<<<< HEAD } } } }, - "webpack-dev-server": { - "version": "3.1.14", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz", - "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.0.0", - "compression": "^1.5.2", - "connect-history-api-fallback": "^1.3.0", - "debug": "^3.1.0", - "del": "^3.0.0", - "express": "^4.16.2", - "html-entities": "^1.2.0", - "http-proxy-middleware": "~0.18.0", - "import-local": "^2.0.0", - "internal-ip": "^3.0.1", - "ip": "^1.1.5", - "killable": "^1.0.0", - "loglevel": "^1.4.1", - "opn": "^5.1.0", - "portfinder": "^1.0.9", - "schema-utils": "^1.0.0", - "selfsigned": "^1.9.1", - "semver": "^5.6.0", - "serve-index": "^1.7.2", - "sockjs": "0.3.19", - "sockjs-client": "1.3.0", - "spdy": "^4.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^5.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "3.4.0", - "webpack-log": "^2.0.0", - "yargs": "12.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "yargs": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz", - "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^2.0.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": "^10.1.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" -======= ->>>>>>> develop - } - } - } - }, -<<<<<<< HEAD - "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } -======= "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true ->>>>>>> develop } } }, @@ -22521,8 +20682,6 @@ "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" -<<<<<<< HEAD -======= } }, "regexp-tree": { @@ -22534,7 +20693,6 @@ "cli-table3": "^0.5.0", "colors": "^1.1.2", "yargs": "^12.0.5" ->>>>>>> develop } }, "regexpp": { @@ -22631,8 +20789,6 @@ "requires": { "dom-serializer": "0", "domelementtype": "1" -<<<<<<< HEAD -======= } }, "strip-ansi": { @@ -22642,7 +20798,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } } } @@ -22884,11 +21039,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { -<<<<<<< HEAD - "glob": "^7.0.5" -======= "glob": "^7.1.3" ->>>>>>> develop } }, "ripemd160": { @@ -23325,11 +21476,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { -<<<<<<< HEAD - "number-is-nan": "^1.0.0" -======= "invert-kv": "^1.0.0" ->>>>>>> develop } }, "os-locale": { @@ -23350,8 +21497,6 @@ "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" -<<<<<<< HEAD -======= } }, "strip-ansi": { @@ -23361,7 +21506,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } }, "which-module": { @@ -24250,26 +22394,6 @@ "requires": { "astral-regex": "^1.0.0", "strip-ansi": "^4.0.0" -<<<<<<< HEAD - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } -======= ->>>>>>> develop } }, "string-width": { @@ -24280,26 +22404,6 @@ "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" -<<<<<<< HEAD - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } -======= ->>>>>>> develop } }, "string.prototype.padend": { @@ -24338,11 +22442,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { -<<<<<<< HEAD - "ansi-regex": "^2.0.0" -======= "ansi-regex": "^3.0.0" ->>>>>>> develop } }, "strip-bom": { @@ -24557,11 +22657,7 @@ "requires": { "commander": "~2.17.1", "source-map": "~0.6.1", -<<<<<<< HEAD - "source-map-support": "~0.5.6" -======= "source-map-support": "~0.5.9" ->>>>>>> develop }, "dependencies": { "source-map-support": { @@ -24652,12 +22748,6 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, - "tiny-invariant": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.3.tgz", - "integrity": "sha512-ytQx8T4DL8PjlX53yYzcIC0WhIZbpR0p1qcYjw2pHu3w6UtgWwFJQ/02cnhOnBBhlFx/edUIfcagCaQSe3KMWg==", - "dev": true - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -24803,9 +22893,9 @@ "dev": true }, "ts-invariant": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz", - "integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz", + "integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==", "dev": true, "requires": { "tslib": "^1.9.3" @@ -25340,17 +23430,6 @@ "requires": { "exec-sh": "^0.2.0", "minimist": "^1.2.0" -<<<<<<< HEAD - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } -======= ->>>>>>> develop } }, "watchpack": { @@ -25389,13 +23468,8 @@ "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/wasm-edit": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", -<<<<<<< HEAD - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", -======= "acorn": "^6.0.5", "acorn-dynamic-import": "^4.0.0", ->>>>>>> develop "ajv": "^6.1.0", "ajv-keywords": "^3.1.0", "chrome-trace-event": "^1.0.0", @@ -25409,11 +23483,7 @@ "mkdirp": "~0.5.0", "neo-async": "^2.5.0", "node-libs-browser": "^2.0.0", -<<<<<<< HEAD - "schema-utils": "^0.4.4", -======= "schema-utils": "^1.0.0", ->>>>>>> develop "tapable": "^1.1.0", "terser-webpack-plugin": "^1.1.0", "watchpack": "^1.5.0", @@ -25890,72 +23960,28 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true -<<<<<<< HEAD - }, - "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - } -======= ->>>>>>> develop } } }, "webpack-cli": { -<<<<<<< HEAD - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz", - "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==", -======= "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz", "integrity": "sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==", ->>>>>>> develop "dev": true, "requires": { "chalk": "^2.4.1", "cross-spawn": "^6.0.5", "enhanced-resolve": "^4.1.0", -<<<<<<< HEAD - "global-modules-path": "^2.3.0", -======= "findup-sync": "^2.0.0", "global-modules": "^1.0.0", ->>>>>>> develop "import-local": "^2.0.0", "interpret": "^1.1.0", "loader-utils": "^1.1.0", "supports-color": "^5.5.0", "v8-compile-cache": "^2.0.2", -<<<<<<< HEAD - "yargs": "^12.0.2" - }, - "dependencies": { - "execa": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", - "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, -======= "yargs": "^12.0.4" }, "dependencies": { ->>>>>>> develop "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -25964,66 +23990,6 @@ "requires": { "pkg-dir": "^3.0.0", "resolve-cwd": "^2.0.0" -<<<<<<< HEAD - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "mem": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", - "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^1.1.0" - } - }, - "os-locale": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz", - "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==", - "dev": true, - "requires": { - "execa": "^0.10.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "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" -======= ->>>>>>> develop } }, "supports-color": { @@ -26032,12 +23998,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" -======= "has-flag": "^3.0.0" ->>>>>>> develop } } } @@ -26137,33 +24098,6 @@ "dev": true, "requires": { "original": "^1.0.0" -<<<<<<< HEAD - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "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" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" -======= ->>>>>>> develop } }, "import-local": { @@ -26174,24 +24108,6 @@ "requires": { "pkg-dir": "^3.0.0", "resolve-cwd": "^2.0.0" -<<<<<<< HEAD - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" -======= ->>>>>>> develop } }, "sockjs-client": { @@ -26200,18 +24116,12 @@ "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", "dev": true, "requires": { -<<<<<<< HEAD - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^1.1.0" -======= "debug": "^3.2.5", "eventsource": "^1.0.7", "faye-websocket": "~0.11.1", "inherits": "^2.0.3", "json3": "^3.3.2", "url-parse": "^1.4.3" ->>>>>>> develop } }, "strip-ansi": { @@ -26220,13 +24130,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { -<<<<<<< HEAD - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" -======= "ansi-regex": "^2.0.0" ->>>>>>> develop } }, "supports-color": { @@ -26235,16 +24139,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { -<<<<<<< HEAD - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" -======= "has-flag": "^3.0.0" ->>>>>>> develop } }, "yargs": { @@ -26609,8 +24504,6 @@ "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" -<<<<<<< HEAD -======= } }, "strip-ansi": { @@ -26620,7 +24513,6 @@ "dev": true, "requires": { "ansi-regex": "^2.0.0" ->>>>>>> develop } } } @@ -26677,7 +24569,7 @@ }, "xmlbuilder": { "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true }, @@ -26709,18 +24601,6 @@ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" }, "yargs": { -<<<<<<< HEAD - "version": "11.1.0", - "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", - "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", -======= "version": "12.0.5", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", @@ -26731,70 +24611,13 @@ "find-up": "^3.0.0", "get-caller-file": "^1.0.1", "os-locale": "^3.0.0", ->>>>>>> develop "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", -<<<<<<< HEAD - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - } -======= "y18n": "^3.2.1 || ^4.0.0", "yargs-parser": "^11.1.1" ->>>>>>> develop } }, "yargs-parser": { @@ -26803,20 +24626,8 @@ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { -<<<<<<< HEAD - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } -======= "camelcase": "^5.0.0", "decamelize": "^1.2.0" ->>>>>>> develop } }, "zen-observable": { diff --git a/client/package.json b/client/package.json index 631bbf844..bab074396 100644 --- a/client/package.json +++ b/client/package.json @@ -25,20 +25,21 @@ }, "homepage": "https://github.com/Algoteers/MasterApp#readme", "devDependencies": { - "@superalgos/logs-client": "0.0.1", - "@superalgos/events-client": "0.0.2", "@advancedalgos/financial-beings-client": "0.0.5", - "@superalgos/operations-client": "0.0.20", - "@superalgos/key-vault-client": "0.0.31", - "@superalgos/teams-client": "0.0.33", - "@superalgos/users-client": "0.0.25", - "@superalgos/web-components": "0.0.18", "@babel/core": "^7.1.2", "@babel/plugin-proposal-class-properties": "^7.1.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-transform-runtime": "^7.1.0", "@babel/preset-env": "^7.1.0", "@babel/preset-react": "^7.0.0", + "@superalgos/events-client": "0.0.2", + "@superalgos/key-vault-client": "0.0.31", + "@superalgos/logs-client": "0.0.1", + "@superalgos/operations-client": "0.0.20", + "@superalgos/strategizer-client": "0.0.2", + "@superalgos/teams-client": "0.0.33", + "@superalgos/users-client": "0.0.25", + "@superalgos/web-components": "0.0.18", "autoprefixer": "^9.2.0", "babel-loader": "^8.0.4", "babel-preset-flow": "6.23.0",