diff options
| -rw-r--r-- | package-lock.json | 3028 | ||||
| -rw-r--r-- | src/.DS_Store | bin | 6148 -> 8196 bytes | |||
| -rw-r--r-- | src/client/documents/Documents.ts | 5 | ||||
| -rw-r--r-- | src/client/views/EditableView.tsx | 9 | ||||
| -rw-r--r-- | src/client/views/nodes/ScriptingBox.scss | 73 | ||||
| -rw-r--r-- | src/client/views/nodes/ScriptingBox.tsx | 424 | ||||
| -rw-r--r-- | src/server/database.ts | 1 |
7 files changed, 2868 insertions, 672 deletions
diff --git a/package-lock.json b/package-lock.json index e4881e08a..fe80430ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,26 +36,26 @@ } }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz", - "integrity": "sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz", + "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -202,9 +202,9 @@ } }, "@hig/flyout": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@hig/flyout/-/flyout-1.2.0.tgz", - "integrity": "sha512-/maJI6COH1UyUX3LCa0muG2VmPiXBtacyz8RAdLLcDIgeTpmyvxpb0FFZI/ib2HUbO2iILBN7qnXiMJ4YNJ/bQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@hig/flyout/-/flyout-1.2.1.tgz", + "integrity": "sha512-oNybmhStyMmEC07DPsjMZg4Dgm65X7Jcp2nDFR9zZghVof/1C3WJtJvdouVgqx7BJw2IedVj8CUGoPuoll/0IQ==", "requires": { "@hig/utils": "^0.4.0", "emotion": "^10.0.0", @@ -222,9 +222,9 @@ } }, "@hig/theme-data": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/@hig/theme-data/-/theme-data-2.15.1.tgz", - "integrity": "sha512-jsKt9HrHsCbnwqY1gPE4/503np7jU0cZTeAJx8R7KPRQF1TAtNzKHcPnzJXJaw74xDyXmTiEX8n+Ya6xVAtvjg==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@hig/theme-data/-/theme-data-2.16.1.tgz", + "integrity": "sha512-3nBnzRqYyc6ejoCgA+zBjQGqe6LAXlcemTs0257E5bWu/JyZe8YyOLN+psq2zyjF+FUk35p38wWNPyaOcPnhvw==", "requires": { "tinycolor2": "^1.4.1" } @@ -269,9 +269,9 @@ "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==" }, "@restart/hooks": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.22.tgz", - "integrity": "sha512-tW0T3hP6emYNOc76/iC96rlu+f7JYLSVk/Wnn+7dj1gJUcw4CkQNLy16vx2mBLtVKsFMZ9miVEZXat8blruDHQ==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.25.tgz", + "integrity": "sha512-m2v3N5pxTsIiSH74/sb1yW8D9RxkJidGW+5Mfwn/lHb2QzhZNlaU1su7abSyT9EGf0xS/0waLjrf7/XxQHUk7w==", "requires": { "lodash": "^4.17.15", "lodash-es": "^4.17.15" @@ -380,9 +380,9 @@ "integrity": "sha1-TN2WtJKTs5MhIuS34pVD415rrlg=" }, "@types/bluebird": { - "version": "3.5.30", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz", - "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==" + "version": "3.5.31", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.31.tgz", + "integrity": "sha512-0PKlnDIxOh3xJHwJpVONR2PP11LhdM+QYiLJGLIbzMqRwLAPxN6lQar2RpdRhfIEh/HjVMgMdhHWJA0CgC5X6w==" }, "@types/body-parser": { "version": "1.19.0", @@ -484,6 +484,14 @@ "@types/node": "*" } }, + "@types/engine.io": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.3.tgz", + "integrity": "sha512-h0bIEHAKT2HGnp5qPEE4hzI9QkTn7FlWeTJquGvK1ZqF0dguDdTSzWm/CG0n9MhSLawzBd6OVxKdve2ABXIu0w==", + "requires": { + "@types/node": "*" + } + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -518,11 +526,12 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz", - "integrity": "sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==", + "version": "4.17.7", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz", + "integrity": "sha512-EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw==", "requires": { "@types/node": "*", + "@types/qs": "*", "@types/range-parser": "*" } }, @@ -581,28 +590,22 @@ } }, "@types/google-maps-react": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/google-maps-react/-/google-maps-react-2.0.4.tgz", - "integrity": "sha512-8EGr84L6ozODnfjWN9xVUFIxFedBbZinuDe5lBEJ757yh/lZqoKkqxrYLqvrLksDRVVwQYwWdFvfEASujmk36A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/google-maps-react/-/google-maps-react-2.0.5.tgz", + "integrity": "sha512-qcsYlHiNH169Vf7jmkEwbzBDqBfqqzYkTgK1vL7qkWVZI04wFESADYVITuQunrZ9swY/SG+tTWUIXMlY4W8byw==", "requires": { - "@types/googlemaps": "*", - "@types/react": "*" + "google-maps-react": "*" } }, - "@types/googlemaps": { - "version": "3.39.3", - "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.39.3.tgz", - "integrity": "sha512-L8O9HAVFZj0TuiS8h5ORthiMsrrhjxTC8XUusp5k47oXCst4VTm+qWKvrAvmYMybZVokbp4Udco1mNwJrTNZPQ==" - }, "@types/isstream": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@types/isstream/-/isstream-0.1.0.tgz", "integrity": "sha512-jo6R5XtVMgu1ej3H4o9NXiUE/4ZxyxmDrGslGiBa4/ugJr+Olw2viio/F2Vlc+zrwC9HJzuApOCCVC2g5jqV0w==" }, "@types/istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz", + "integrity": "sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==" }, "@types/istanbul-lib-report": { "version": "3.0.0", @@ -613,9 +616,9 @@ } }, "@types/istanbul-reports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz", - "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", "requires": { "@types/istanbul-lib-coverage": "*", "@types/istanbul-lib-report": "*" @@ -630,9 +633,9 @@ } }, "@types/jquery": { - "version": "3.3.36", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.36.tgz", - "integrity": "sha512-jHL8J5y5fJ0+C9zCTkeOvX4zqRnPug3r6JhAqAYl2YyBCYHiXTbZSH0MRCpayZADed5TigPjH92dEKczUFT2TQ==", + "version": "3.3.38", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.38.tgz", + "integrity": "sha512-nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA==", "requires": { "@types/sizzle": "*" } @@ -646,9 +649,9 @@ } }, "@types/jsonwebtoken": { - "version": "8.3.9", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.3.9.tgz", - "integrity": "sha512-00rI8GbOKuRtoYxltFSRTVUXCRLbuYwln2/nUMPtFU9JGS7if+nnmLjeoFGmqsNCmblPLAaeQ/zMLVsHr6T5bg==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz", + "integrity": "sha512-9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg==", "requires": { "@types/node": "*" } @@ -667,9 +670,9 @@ } }, "@types/lodash": { - "version": "4.14.150", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", - "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==" + "version": "4.14.151", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.151.tgz", + "integrity": "sha512-Zst90IcBX5wnwSu7CAS0vvJkTjTELY4ssKbHiTnGcJgi170uiS8yQDdc3v6S77bRqYQIN1App5a1Pc2lceE5/g==" }, "@types/memory-fs": { "version": "0.3.2", @@ -681,9 +684,9 @@ } }, "@types/mime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", - "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz", + "integrity": "sha512-4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q==" }, "@types/minimatch": { "version": "3.0.3", @@ -705,18 +708,18 @@ "dev": true }, "@types/mongodb": { - "version": "3.5.14", - "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.5.14.tgz", - "integrity": "sha512-6SBBf4/pFTPu+Xmio6A4JPv/zXbsS/h7d3SdhaXRfTdE8pPNKUfOG3Tn7O0sjcu7Nz0syorSiQE6CMcoQD15TQ==", + "version": "3.5.18", + "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.5.18.tgz", + "integrity": "sha512-fEmnRmwXt4pEFhqWB/ZlyNaDhLfQv5GALaZAlH9Pb0kEttvsCr66umJ9pfBEEP3ks1hjlwAuMtqk/+DyZDLAXQ==", "requires": { "@types/bson": "*", "@types/node": "*" } }, "@types/mongoose": { - "version": "5.7.14", - "resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.7.14.tgz", - "integrity": "sha512-jdMhuIluxmPKP58juOvQEl1C0syqyG0LK19zP+FRha0gvlFUwttXr2uxX4pzTHcuu/V6omzia9iGeXCoTEOT+w==", + "version": "5.7.20", + "resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.7.20.tgz", + "integrity": "sha512-s9zTkj3rTaeS16VcNCUAYsO/SS5ePEcnWmX0SrvzpuHGngtL54zXbVwS7LhTwNFXNrlTVgzhnYp9kgGwFvftVg==", "requires": { "@types/mongodb": "*", "@types/node": "*" @@ -806,9 +809,9 @@ } }, "@types/pdfjs-dist": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-2.1.3.tgz", - "integrity": "sha512-aGyFfB4Q8QjaSR3cBTiJfnFXBU6SXQaBVM7ADfBaZzq4L7EGbjuSoqXfHJofZmLFBfKzZ9b+9nXO2FfUIsw77w==" + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-2.1.4.tgz", + "integrity": "sha512-KnEc8W2IcntVL/SKfRWy2lcJax07xEaO7ghcT0/hc2Lp5UOcmaXAi887RKOLhP8BLKsVGJ7uYH0mYo1uSvbu2A==" }, "@types/prop-types": { "version": "15.7.3", @@ -889,9 +892,9 @@ } }, "@types/prosemirror-state": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz", - "integrity": "sha512-6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/prosemirror-state/-/prosemirror-state-1.2.4.tgz", + "integrity": "sha512-Gch4THfZ9QNsRQ7myibU8cG99F3b8/3Gto083ZuutNG72E0VmS8yfQzA5ahbndr5GUIbmKyOD5LqKTBvx/M0qw==", "requires": { "@types/prosemirror-model": "*", "@types/prosemirror-transform": "*", @@ -930,9 +933,9 @@ } }, "@types/qs": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz", - "integrity": "sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==" + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz", + "integrity": "sha512-a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A==" }, "@types/range-parser": { "version": "1.2.3", @@ -948,18 +951,18 @@ } }, "@types/react": { - "version": "16.9.34", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.34.tgz", - "integrity": "sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==", + "version": "16.9.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.35.tgz", + "integrity": "sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" } }, "@types/react-autosuggest": { - "version": "9.3.13", - "resolved": "https://registry.npmjs.org/@types/react-autosuggest/-/react-autosuggest-9.3.13.tgz", - "integrity": "sha512-J1RB5KAIk6vOJ+TkIE+EqjCWBjXxjobzeA6D9KrS64kzrt6ixC6uSoKMFnG6ByeWoC+1g0756NILCpIpTV62dw==", + "version": "9.3.14", + "resolved": "https://registry.npmjs.org/@types/react-autosuggest/-/react-autosuggest-9.3.14.tgz", + "integrity": "sha512-cvGpKaQaNsFbDxTwP56VKVj2FO6SpJ9PsrQtlVzN7aVa/SsMZoQrBLEUx5HQKfIS4Zupb6K4tHmIyTjF7AEcow==", "requires": { "@types/react": "*" } @@ -973,9 +976,9 @@ } }, "@types/react-dom": { - "version": "16.9.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.7.tgz", - "integrity": "sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==", + "version": "16.9.8", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.8.tgz", + "integrity": "sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==", "dev": true, "requires": { "@types/react": "*" @@ -998,9 +1001,9 @@ } }, "@types/request": { - "version": "2.48.4", - "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz", - "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==", + "version": "2.48.5", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz", + "integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==", "requires": { "@types/caseless": "*", "@types/node": "*", @@ -1049,9 +1052,9 @@ } }, "@types/shelljs": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.7.tgz", - "integrity": "sha512-Mg2qGjLIJIieeJ1/NjswAOY9qXDShLeh6JwpD1NZsvUvI0hxdUCNDpnBXv9YQeugKi2EHU+BqkbUE4jpY4GKmQ==", + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.8.tgz", + "integrity": "sha512-lD3LWdg6j8r0VRBFahJVaxoW0SIcswxKaFUrmKl33RJVeeoNYQAz4uqCJ5Z6v4oIBOsC5GozX+I5SorIKiTcQA==", "requires": { "@types/glob": "*", "@types/node": "*" @@ -1063,17 +1066,18 @@ "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==" }, "@types/socket.io": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.4.tgz", - "integrity": "sha512-cI98INy7tYnweTsUlp8ocveVdAxENUThO0JsLSCs51cjOP2yV5Mqo5QszMDPckyRRA+PO6+wBgKvGvHUCc23TQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.6.tgz", + "integrity": "sha512-z1+D0k2arj+6dy9vnOy4/PxT3gmI7/BInzL8Jtbr5ijKOQyvSx+nOUhax+Hw69htpRmEdVNkWZUOVxsvvm1SrQ==", "requires": { + "@types/engine.io": "*", "@types/node": "*" } }, "@types/socket.io-client": { - "version": "1.4.32", - "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz", - "integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==" + "version": "1.4.33", + "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz", + "integrity": "sha512-m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ==" }, "@types/source-list-map": { "version": "0.1.2", @@ -1111,9 +1115,9 @@ } }, "@types/uglify-js": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.0.tgz", - "integrity": "sha512-3ZcoyPYHVOCcLpnfZwD47KFLr8W/mpUcgjpf1M4Q78TMJIw7KMAHSjiCLJp1z3ZrBR9pTLbe191O0TldFK5zcw==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.1.tgz", + "integrity": "sha512-rdBIeMQyRBOXogop/EYBvSkYFn9D9yGxUa5hagBVG55KIdSUbp22EACJSHCs6kmmfunojAhf7zJH+Ds06/qLaQ==", "requires": { "source-map": "^0.6.1" }, @@ -1151,9 +1155,9 @@ "integrity": "sha512-PACt1xdErJbMUOUweSrbVM7gSIYm1vTncW2hF6Os/EeWi6TXYAYMPp+8v6rzHmypE5gHrxaxZNXgMkJVIdZpHw==" }, "@types/webpack": { - "version": "4.41.12", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.12.tgz", - "integrity": "sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==", + "version": "4.41.13", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.13.tgz", + "integrity": "sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==", "requires": { "@types/anymatch": "*", "@types/node": "*", @@ -1171,9 +1175,9 @@ } }, "@types/webpack-dev-middleware": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/webpack-dev-middleware/-/webpack-dev-middleware-2.0.4.tgz", - "integrity": "sha512-hk+OI2FmngHuTu5jNqipjbKxqeDOv6Xz2Aex86rHvYun+wZmHmiQA4l9NjlIubYtMxQGLqe01XF3i+Fb4tluzA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/webpack-dev-middleware/-/webpack-dev-middleware-2.0.5.tgz", + "integrity": "sha512-B/1X0xAYz62rtjn3gYWaYLRISKzjWehpjndCvpCNuv0OJi4TbIV6QQt9xq/moVxB83u2RjsG8E8S6U/Efg/Vvw==", "dev": true, "requires": { "@types/connect": "*", @@ -1182,9 +1186,9 @@ } }, "@types/webpack-hot-middleware": { - "version": "2.25.2", - "resolved": "https://registry.npmjs.org/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.2.tgz", - "integrity": "sha512-Q05ffLL61Gk4rDmQzb4xYuxXepStWWcdAvKXUg9NgcnVaiXsSPyr9m96I33Ui8k8iuPFKxCQ5XjfwFl0qReHJg==", + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz", + "integrity": "sha512-zGkTzrwQnhSadIXGYGZLu7tpXQwn4+6y9nGeql+5UeRtW/k54Jp4SnzB0Qw00ednw0ZFoZOvqTFfXSbFXohc5Q==", "dev": true, "requires": { "@types/connect": "*", @@ -1227,9 +1231,9 @@ "integrity": "sha512-3gJTS9gt27pS7U9q5IVqo4YvKSlkf2ck8ish6etuDj6LIRxkL/2Y8RMUtK/QzvE1Yv2zwWV5yemI2BS0GGGFnA==" }, "@types/yargs": { - "version": "13.0.8", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz", - "integrity": "sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==", + "version": "13.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz", + "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==", "requires": { "@types/yargs-parser": "*" } @@ -1780,9 +1784,9 @@ }, "dependencies": { "@types/node": { - "version": "12.12.37", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz", - "integrity": "sha512-4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg==" + "version": "12.12.39", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.39.tgz", + "integrity": "sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg==" }, "glob": { "version": "7.1.3", @@ -1917,6 +1921,13 @@ "bn.js": "^4.0.0", "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "assert": { @@ -2363,9 +2374,9 @@ "integrity": "sha512-6sTGh1OiUmuH8ftAYvUzALivoOmcnahinGmjZFI4puZVowXoKTn/bXtth7N1skW5AlezEOfjgFH4lNXHeNRQog==" }, "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz", + "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==" }, "body-parser": { "version": "1.19.0", @@ -2432,9 +2443,9 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "bootstrap": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", - "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", + "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" }, "boxen": { "version": "1.3.0", @@ -2555,20 +2566,36 @@ "requires": { "bn.js": "^4.1.0", "randombytes": "^2.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz", + "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==", + "requires": { + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.2", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, "browserify-zlib": { @@ -2888,17 +2915,109 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", "upath": "^1.1.1" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "chrome-trace-event": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", + "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "ci-info": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", + "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==" + }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "class-transformer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.2.3.tgz", + "integrity": "sha512-qsP+0xoavpOlJHuYsQJsN58HXSl8Jvveo+T37rEvCEeRfMWoytAyR0Ua/YsFgpM6AZYZ/og2PJwArwzJl1aXtQ==" + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "file-uri-to-path": "1.0.0" + "is-descriptor": "^0.1.0" } + } + } + }, + "classnames": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", + "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" + }, + "clean-css": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", + "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "requires": { + "source-map": "~0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" + }, + "cliss": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz", + "integrity": "sha512-6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw==", + "requires": { + "command-line-usage": "^4.0.1", + "deepmerge": "^2.0.0", + "get-stdin": "^5.0.1", + "inspect-parameters-declaration": "0.0.9", + "object-to-arguments": "0.0.8", + "pipe-functions": "^1.3.0", + "strip-ansi": "^4.0.0", + "yargs-parser": "^7.0.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, +<<<<<<< HEAD +======= "fsevents": { "version": "1.2.12", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz", @@ -3464,6 +3583,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "yargs-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", @@ -4054,6 +4174,13 @@ "requires": { "bn.js": "^4.1.0", "elliptic": "^6.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "create-emotion": { @@ -4274,9 +4401,9 @@ "dev": true }, "cssstyle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", - "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", "dev": true, "requires": { "cssom": "~0.3.6" @@ -4659,6 +4786,13 @@ "bn.js": "^4.1.0", "miller-rabin": "^4.0.0", "randombytes": "^2.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "dir-glob": { @@ -4740,9 +4874,9 @@ "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==" }, "entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz", - "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz", + "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==" } } }, @@ -4884,6 +5018,13 @@ "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0", "minimalistic-crypto-utils": "^1.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "emoji-regex": { @@ -4955,11 +5096,11 @@ } }, "engine.io-client": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz", - "integrity": "sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.2.tgz", + "integrity": "sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==", "requires": { - "component-emitter": "1.2.1", + "component-emitter": "~1.3.0", "component-inherit": "0.0.3", "debug": "~4.1.0", "engine.io-parser": "~2.2.0", @@ -4972,11 +5113,6 @@ "yeast": "0.1.2" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -5667,9 +5803,9 @@ } }, "feedparser": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/feedparser/-/feedparser-2.2.9.tgz", - "integrity": "sha1-kTgZfa/a4F/K3eADa+6vYGbCxek=", + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/feedparser/-/feedparser-2.2.10.tgz", + "integrity": "sha512-WoAOooa61V8/xuKMi2pEtK86qQ3ZH/M72EEGdqlOTxxb3m6ve1NPvZcmPFs3wEDfcBbFLId2GqZ4YjsYi+h1xA==", "requires": { "addressparser": "^1.0.1", "array-indexofobject": "~0.0.1", @@ -5677,8 +5813,8 @@ "lodash.get": "^4.4.2", "lodash.has": "^4.5.2", "lodash.uniq": "^4.5.0", - "mri": "^1.1.0", - "readable-stream": "^2.2.2", + "mri": "^1.1.5", + "readable-stream": "^2.3.7", "sax": "^1.2.4" }, "dependencies": { @@ -6099,6 +6235,27 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "dependencies": { + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + } + } + }, "fstream": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", @@ -6428,9 +6585,9 @@ }, "dependencies": { "qs": { - "version": "6.9.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", - "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" } } }, @@ -6490,9 +6647,9 @@ }, "dependencies": { "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" } } }, @@ -6614,12 +6771,20 @@ } }, "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, "hash.js": { @@ -6669,9 +6834,9 @@ "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" }, "howler": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/howler/-/howler-2.1.3.tgz", - "integrity": "sha512-PSGbOi1EYgw80C5UQbxtJM7TmzD+giJunIMBYyH3RVzHZx2fZLYBoes0SpVVHi/SFa1GoNtgXj/j6I7NOKYBxQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/howler/-/howler-2.2.0.tgz", + "integrity": "sha512-sGPkrAQy7jh5mNDbkRNG0F82R2HFDYNsQXBcX4smXQT0y0F4UMsa/+jXaGwWvcrajWr2tDB7JUkH7G5qSnuIyQ==" }, "hpack.js": { "version": "2.1.6", @@ -6771,16 +6936,10 @@ } } }, - "http-parser-js": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz", - "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=", - "dev": true - }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { "eventemitter3": "^4.0.0", @@ -6789,9 +6948,9 @@ }, "dependencies": { "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", "dev": true } } @@ -6849,9 +7008,9 @@ "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=" }, "ibm-cloud-sdk-core": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/ibm-cloud-sdk-core/-/ibm-cloud-sdk-core-2.3.0.tgz", - "integrity": "sha512-s8qDwqHSp841q88Jo96nMlYwLcBPc/EakXFS27hCwbrG1ntZCb2QE7RJVKF26FxuCFmktbNwHIGg7ehiZZ+TUw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/ibm-cloud-sdk-core/-/ibm-cloud-sdk-core-2.4.1.tgz", + "integrity": "sha512-pr8FtHZYVvXzlrj/YuF6+KRILZWopplxaox+0+yAgQscFGmOf93KOfdkkWLk5Xhpgvz/gZnYDUsipv10C3wK+g==", "requires": { "@types/extend": "~3.0.0", "@types/file-type": "~5.2.1", @@ -7288,9 +7447,10 @@ } }, "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "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 }, "ip": { "version": "1.1.5", @@ -7662,9 +7822,9 @@ "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==" }, "jquery": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz", - "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==" + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", + "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" }, "jquery-awesome-cursor": { "version": "0.3.1", @@ -7743,9 +7903,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", + "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==", "dev": true }, "acorn-globals": { @@ -8041,11 +8201,12 @@ } }, "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "^2.0.0" } }, "levn": { @@ -8564,6 +8725,13 @@ "requires": { "bn.js": "^4.0.0", "brorand": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "mime": { @@ -8683,9 +8851,9 @@ } }, "mkdirp-classic": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz", - "integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "mobile-detect": { "version": "1.4.4", @@ -8803,9 +8971,9 @@ } }, "mongodb": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.6.tgz", - "integrity": "sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz", + "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==", "requires": { "bl": "^2.2.0", "bson": "^1.1.4", @@ -8855,13 +9023,13 @@ } }, "mongoose": { - "version": "5.9.10", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.10.tgz", - "integrity": "sha512-w1HNukfJzzDLfcI1f79h2Wj4ogVbf+X8hRkyFgqlcjK7OnDlAgahjDMIsT+mCS9jKojrMhjSsZIs9FiRPkLqMg==", + "version": "5.9.15", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.15.tgz", + "integrity": "sha512-dGIDqaQkAJoLl7lsRLy70mDg+VcL1IPOHr/0f23MLF45PtnM5exRdmienfyVjdrSVGgTus+1sMUKef6vSnrDZg==", "requires": { "bson": "^1.1.4", "kareem": "2.3.1", - "mongodb": "3.5.6", + "mongodb": "3.5.7", "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.7.0", "mquery": "3.2.2", @@ -9236,9 +9404,9 @@ } }, "node-sass": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", - "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "requires": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", @@ -9254,7 +9422,7 @@ "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", - "sass-graph": "^2.2.4", + "sass-graph": "2.2.5", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" }, @@ -9302,9 +9470,9 @@ } }, "node-stream-zip": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.9.2.tgz", - "integrity": "sha512-X9gnhFH8Egchv+CJwtiGYFtiRotf/gDL+MB3pV7KGFNbeYDo0NqAYocdQEU2czXj6npta9SbPj4bow1yQtoffA==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.1.tgz", + "integrity": "sha512-eiNM9UJ26OkbOLfv4VI8X94KRw28xMq2cpWapRsR/aWXGu+hNFvEY889Glm6qi43wtbjcMSU1oFxv5XZ0OKhbA==" }, "node-tesseract": { "version": "0.2.7", @@ -9397,9 +9565,9 @@ "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" }, "npm": { - "version": "6.14.4", - "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz", - "integrity": "sha512-B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw==", + "version": "6.14.5", + "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz", + "integrity": "sha512-CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA==", "requires": { "JSONStream": "^1.3.5", "abbrev": "~1.1.1", @@ -9430,7 +9598,7 @@ "fs-write-stream-atomic": "~1.0.10", "gentle-fs": "^2.3.0", "glob": "^7.1.6", - "graceful-fs": "^4.2.3", + "graceful-fs": "^4.2.4", "has-unicode": "~2.0.1", "hosted-git-info": "^2.8.8", "iferr": "^1.0.2", @@ -9467,10 +9635,10 @@ "lru-cache": "^5.1.1", "meant": "~1.0.1", "mississippi": "^3.0.0", - "mkdirp": "^0.5.4", + "mkdirp": "^0.5.5", "move-concurrently": "^1.0.1", "node-gyp": "^5.1.0", - "nopt": "~4.0.1", + "nopt": "^4.0.3", "normalize-package-data": "^2.5.0", "npm-audit-report": "^1.3.2", "npm-cache-filename": "~1.0.2", @@ -9480,7 +9648,7 @@ "npm-packlist": "^1.4.8", "npm-pick-manifest": "^3.0.2", "npm-profile": "^4.0.4", - "npm-registry-fetch": "^4.0.3", + "npm-registry-fetch": "^4.0.4", "npm-user-validate": "~1.0.0", "npmlog": "~4.1.2", "once": "~1.4.0", @@ -9528,8 +9696,12 @@ "dependencies": { "JSONStream": { "version": "1.3.5", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "jsonparse": "^1.2.0", "through": ">=2.2.7 <3" @@ -9537,6 +9709,13 @@ }, "abbrev": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true + }, + "agent-base": { + "version": "4.3.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, @@ -9544,22 +9723,31 @@ "version": "4.3.0", "resolved": false, "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "es6-promisify": "^5.0.0" } }, "agentkeepalive": { "version": "3.5.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "humanize-ms": "^1.2.1" } }, "ajv": { "version": "5.5.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "co": "^4.6.0", "fast-deep-equal": "^1.0.0", @@ -9569,14 +9757,25 @@ }, "ansi-align": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^2.0.0" } }, "ansi-regex": { "version": "2.1.1", +<<<<<<< HEAD + "bundled": true + }, + "ansi-styles": { + "version": "3.2.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, @@ -9584,12 +9783,32 @@ "version": "3.2.1", "resolved": false, "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "color-convert": "^1.9.0" } }, "ansicolors": { "version": "0.3.2", +<<<<<<< HEAD + "bundled": true + }, + "ansistyles": { + "version": "0.1.3", + "bundled": true + }, + "aproba": { + "version": "2.0.0", + "bundled": true + }, + "archy": { + "version": "1.0.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, +======= "resolved": false, "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=" }, @@ -9612,6 +9831,7 @@ "version": "1.1.4", "resolved": false, "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -9619,8 +9839,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -9633,8 +9857,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -9643,6 +9871,13 @@ }, "asap": { "version": "2.0.6", +<<<<<<< HEAD + "bundled": true + }, + "asn1": { + "version": "0.2.4", + "bundled": true, +======= "resolved": false, "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, @@ -9650,12 +9885,36 @@ "version": "0.2.4", "resolved": false, "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safer-buffer": "~2.1.0" } }, "assert-plus": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.7.0", + "bundled": true + }, + "aws4": { + "version": "1.8.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, @@ -9683,6 +9942,7 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "optional": true, "requires": { "tweetnacl": "^0.14.3" @@ -9690,8 +9950,12 @@ }, "bin-links": { "version": "1.1.7", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-/eaLaTu7G7/o7PV04QPy1HRT65zf+1tFkPGv0sPTV0tRwufooYBQO3zrcyGgm+ja+ZtBf2GEuKjDRJ2pPG+yqA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "bluebird": "^3.5.3", "cmd-shim": "^3.0.0", @@ -9703,6 +9967,13 @@ }, "bluebird": { "version": "3.5.5", +<<<<<<< HEAD + "bundled": true + }, + "boxen": { + "version": "1.3.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, @@ -9710,6 +9981,7 @@ "version": "1.3.0", "resolved": false, "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ansi-align": "^2.0.0", "camelcase": "^4.0.0", @@ -9722,8 +9994,12 @@ }, "brace-expansion": { "version": "1.1.11", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9731,6 +10007,25 @@ }, "buffer-from": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "builtins": { + "version": "1.0.3", + "bundled": true + }, + "byline": { + "version": "5.0.0", + "bundled": true + }, + "byte-size": { + "version": "5.0.1", + "bundled": true + }, + "cacache": { + "version": "12.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" }, @@ -9753,6 +10048,7 @@ "version": "12.0.3", "resolved": false, "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "bluebird": "^3.5.5", "chownr": "^1.1.1", @@ -9773,6 +10069,25 @@ }, "call-limit": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true + }, + "camelcase": { + "version": "4.1.0", + "bundled": true + }, + "capture-stack-trace": { + "version": "1.0.0", + "bundled": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "chalk": { + "version": "2.4.1", + "bundled": true, +======= "resolved": false, "integrity": "sha512-5twvci5b9eRBw2wCfPtN0GmlR2/gadZqyFpPhOK6CvMFoFgA+USnZ6Jpu1lhG9h85pQ3Ouil3PfXWRD4EUaRiQ==" }, @@ -9795,6 +10110,7 @@ "version": "2.4.1", "resolved": false, "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -9803,6 +10119,17 @@ }, "chownr": { "version": "1.1.4", +<<<<<<< HEAD + "bundled": true + }, + "ci-info": { + "version": "2.0.0", + "bundled": true + }, + "cidr-regex": { + "version": "2.0.10", + "bundled": true, +======= "resolved": false, "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, @@ -9815,12 +10142,20 @@ "version": "2.0.10", "resolved": false, "integrity": "sha512-sB3ogMQXWvreNPbJUZMRApxuRYd+KoIo4RGQ81VatjmMW6WJPo+IJZ2846FGItr9VzKo5w7DXzijPLGtSd0N3Q==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ip-regex": "^2.1.0" } }, "cli-boxes": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "cli-columns": { + "version": "3.1.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" }, @@ -9828,6 +10163,7 @@ "version": "3.1.2", "resolved": false, "integrity": "sha1-ZzLZcpee/CrkRKHwjgj6E5yWoY4=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^2.0.0", "strip-ansi": "^3.0.1" @@ -9835,8 +10171,12 @@ }, "cli-table3": { "version": "0.5.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "colors": "^1.1.2", "object-assign": "^4.1.0", @@ -9845,8 +10185,12 @@ }, "cliui": { "version": "4.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^2.1.1", "strip-ansi": "^4.0.0", @@ -9855,6 +10199,13 @@ "dependencies": { "ansi-regex": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, @@ -9862,6 +10213,7 @@ "version": "4.0.0", "resolved": false, "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ansi-regex": "^3.0.0" } @@ -9870,6 +10222,13 @@ }, "clone": { "version": "1.0.4", +<<<<<<< HEAD + "bundled": true + }, + "cmd-shim": { + "version": "3.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, @@ -9877,6 +10236,7 @@ "version": "3.0.3", "resolved": false, "integrity": "sha512-DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.2", "mkdirp": "~0.5.0" @@ -9884,6 +10244,17 @@ }, "co": { "version": "4.6.0", +<<<<<<< HEAD + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "color-convert": { + "version": "1.9.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, @@ -9896,12 +10267,20 @@ "version": "1.9.1", "resolved": false, "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "color-name": "^1.1.1" } }, "color-name": { "version": "1.1.3", +<<<<<<< HEAD + "bundled": true + }, + "colors": { + "version": "1.3.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, @@ -9909,12 +10288,17 @@ "version": "1.3.3", "resolved": false, "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "optional": true }, "columnify": { "version": "1.5.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "strip-ansi": "^3.0.0", "wcwidth": "^1.0.0" @@ -9922,14 +10306,25 @@ }, "combined-stream": { "version": "1.0.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "delayed-stream": "~1.0.0" } }, "concat-map": { "version": "0.0.1", +<<<<<<< HEAD + "bundled": true + }, + "concat-stream": { + "version": "1.6.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, @@ -9937,6 +10332,7 @@ "version": "1.6.2", "resolved": false, "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -9946,8 +10342,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -9960,8 +10360,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -9970,8 +10374,12 @@ }, "config-chain": { "version": "1.1.12", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ini": "^1.3.4", "proto-list": "~1.2.1" @@ -9979,8 +10387,12 @@ }, "configstore": { "version": "3.1.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "dot-prop": "^4.1.0", "graceful-fs": "^4.1.2", @@ -9992,6 +10404,13 @@ }, "console-control-strings": { "version": "1.1.0", +<<<<<<< HEAD + "bundled": true + }, + "copy-concurrently": { + "version": "1.0.5", + "bundled": true, +======= "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, @@ -9999,6 +10418,7 @@ "version": "1.0.5", "resolved": false, "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.1.1", "fs-write-stream-atomic": "^1.0.8", @@ -10010,6 +10430,13 @@ "dependencies": { "aproba": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true + }, + "iferr": { + "version": "0.1.5", + "bundled": true +======= "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, @@ -10017,11 +10444,19 @@ "version": "0.1.5", "resolved": false, "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "core-util-is": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "create-error-class": { + "version": "3.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, @@ -10029,14 +10464,19 @@ "version": "3.0.2", "resolved": false, "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "capture-stack-trace": "^1.0.0" } }, "cross-spawn": { "version": "5.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", @@ -10045,8 +10485,12 @@ "dependencies": { "lru-cache": { "version": "4.1.5", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "pseudomap": "^1.0.2", "yallist": "^2.1.2" @@ -10054,13 +10498,28 @@ }, "yallist": { "version": "2.1.2", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "crypto-random-string": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "cyclist": { + "version": "0.2.2", + "bundled": true + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" }, @@ -10073,27 +10532,55 @@ "version": "1.14.1", "resolved": false, "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "assert-plus": "^1.0.0" } }, "debug": { "version": "3.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ms": "2.0.0" }, "dependencies": { "ms": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "debuglog": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true + }, + "decode-uri-component": { + "version": "0.2.0", + "bundled": true + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true + }, + "defaults": { + "version": "1.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=" }, @@ -10116,20 +10603,44 @@ "version": "1.0.3", "resolved": false, "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "clone": "^1.0.2" } }, "define-properties": { "version": "1.1.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "object-keys": "^1.0.12" } }, "delayed-stream": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-indent": { + "version": "5.0.0", + "bundled": true + }, + "detect-newline": { + "version": "2.1.0", + "bundled": true + }, + "dezalgo": { + "version": "1.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, @@ -10152,6 +10663,7 @@ "version": "1.0.3", "resolved": false, "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "asap": "^2.0.0", "wrappy": "1" @@ -10159,14 +10671,29 @@ }, "dot-prop": { "version": "4.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "is-obj": "^1.0.0" } }, "dotenv": { "version": "5.0.1", +<<<<<<< HEAD + "bundled": true + }, + "duplexer3": { + "version": "0.1.4", + "bundled": true + }, + "duplexify": { + "version": "3.6.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==" }, @@ -10179,6 +10706,7 @@ "version": "3.6.0", "resolved": false, "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "end-of-stream": "^1.0.0", "inherits": "^2.0.1", @@ -10188,8 +10716,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10202,8 +10734,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -10212,8 +10748,12 @@ }, "ecc-jsbn": { "version": "0.1.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "optional": true, "requires": { "jsbn": "~0.1.0", @@ -10222,6 +10762,13 @@ }, "editor": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "encoding": { + "version": "0.1.12", + "bundled": true, +======= "resolved": false, "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I=" }, @@ -10229,20 +10776,36 @@ "version": "0.1.12", "resolved": false, "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "iconv-lite": "~0.4.13" } }, "end-of-stream": { "version": "1.4.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "once": "^1.4.0" } }, "env-paths": { "version": "2.2.0", +<<<<<<< HEAD + "bundled": true + }, + "err-code": { + "version": "1.1.2", + "bundled": true + }, + "errno": { + "version": "0.1.7", + "bundled": true, +======= "resolved": false, "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" }, @@ -10255,14 +10818,19 @@ "version": "0.1.7", "resolved": false, "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "prr": "~1.0.1" } }, "es-abstract": { "version": "1.12.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "es-to-primitive": "^1.1.1", "function-bind": "^1.1.1", @@ -10273,8 +10841,12 @@ }, "es-to-primitive": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -10283,6 +10855,13 @@ }, "es6-promise": { "version": "4.2.8", +<<<<<<< HEAD + "bundled": true + }, + "es6-promisify": { + "version": "5.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, @@ -10290,12 +10869,20 @@ "version": "5.0.0", "resolved": false, "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "es6-promise": "^4.0.3" } }, "escape-string-regexp": { "version": "1.0.5", +<<<<<<< HEAD + "bundled": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, @@ -10303,6 +10890,7 @@ "version": "0.7.0", "resolved": false, "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cross-spawn": "^5.0.1", "get-stream": "^3.0.0", @@ -10315,13 +10903,44 @@ "dependencies": { "get-stream": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "extend": { "version": "3.0.2", +<<<<<<< HEAD + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "fast-deep-equal": { + "version": "1.1.0", + "bundled": true + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "bundled": true + }, + "figgy-pudding": { + "version": "3.5.1", + "bundled": true + }, + "find-npm-prefix": { + "version": "1.0.2", + "bundled": true + }, + "find-up": { + "version": "2.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, @@ -10354,14 +10973,19 @@ "version": "2.1.0", "resolved": false, "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "locate-path": "^2.0.0" } }, "flush-write-stream": { "version": "1.0.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.4" @@ -10369,8 +10993,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10383,8 +11011,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -10393,6 +11025,13 @@ }, "forever-agent": { "version": "0.6.1", +<<<<<<< HEAD + "bundled": true + }, + "form-data": { + "version": "2.3.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, @@ -10400,6 +11039,7 @@ "version": "2.3.2", "resolved": false, "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "asynckit": "^0.4.0", "combined-stream": "1.0.6", @@ -10408,8 +11048,12 @@ }, "from2": { "version": "2.3.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "inherits": "^2.0.1", "readable-stream": "^2.0.0" @@ -10417,8 +11061,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10431,8 +11079,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -10441,16 +11093,24 @@ }, "fs-minipass": { "version": "1.2.7", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "minipass": "^2.6.0" }, "dependencies": { "minipass": { "version": "2.9.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -10460,8 +11120,12 @@ }, "fs-vacuum": { "version": "1.2.10", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-t2Kb7AekAxolSP35n17PHMizHjY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.2", "path-is-inside": "^1.0.1", @@ -10470,8 +11134,12 @@ }, "fs-write-stream-atomic": { "version": "1.0.10", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.2", "iferr": "^0.1.5", @@ -10481,6 +11149,13 @@ "dependencies": { "iferr": { "version": "0.1.5", +<<<<<<< HEAD + "bundled": true + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, +======= "resolved": false, "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, @@ -10488,6 +11163,7 @@ "version": "2.3.6", "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -10500,8 +11176,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -10510,6 +11190,17 @@ }, "fs.realpath": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "function-bind": { + "version": "1.1.1", + "bundled": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, +======= "resolved": false, "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, @@ -10522,6 +11213,7 @@ "version": "2.7.4", "resolved": false, "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -10535,6 +11227,13 @@ "dependencies": { "aproba": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, @@ -10542,6 +11241,7 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -10552,6 +11252,13 @@ }, "genfun": { "version": "5.0.0", +<<<<<<< HEAD + "bundled": true + }, + "gentle-fs": { + "version": "2.3.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==" }, @@ -10559,6 +11266,7 @@ "version": "2.3.0", "resolved": false, "integrity": "sha512-3k2CgAmPxuz7S6nKK+AqFE2AdM1QuwqKLPKzIET3VRwK++3q96MsNFobScDjlCrq97ZJ8y5R725MOlm6ffUCjg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.1.2", "chownr": "^1.1.2", @@ -10575,6 +11283,13 @@ "dependencies": { "aproba": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true + }, + "iferr": { + "version": "0.1.5", + "bundled": true +======= "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, @@ -10582,11 +11297,19 @@ "version": "0.1.5", "resolved": false, "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "get-caller-file": { "version": "1.0.3", +<<<<<<< HEAD + "bundled": true + }, + "get-stream": { + "version": "4.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, @@ -10594,22 +11317,31 @@ "version": "4.1.0", "resolved": false, "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "pump": "^3.0.0" } }, "getpass": { "version": "0.1.7", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "assert-plus": "^1.0.0" } }, "glob": { "version": "7.1.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -10621,16 +11353,24 @@ }, "global-dirs": { "version": "0.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ini": "^1.3.4" } }, "got": { "version": "6.7.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "create-error-class": "^3.0.0", "duplexer3": "^0.1.4", @@ -10647,12 +11387,28 @@ "dependencies": { "get-stream": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "graceful-fs": { +<<<<<<< HEAD + "version": "4.2.4", + "bundled": true + }, + "har-schema": { + "version": "2.0.0", + "bundled": true + }, + "har-validator": { + "version": "5.1.0", + "bundled": true, +======= "version": "4.2.3", "resolved": false, "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" @@ -10666,6 +11422,7 @@ "version": "5.1.0", "resolved": false, "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ajv": "^5.3.0", "har-schema": "^2.0.0" @@ -10673,14 +11430,41 @@ }, "has": { "version": "1.0.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "function-bind": "^1.1.1" } }, "has-flag": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true + }, + "has-symbols": { + "version": "1.0.0", + "bundled": true + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hosted-git-info": { + "version": "2.8.8", + "bundled": true + }, + "http-cache-semantics": { + "version": "3.8.1", + "bundled": true + }, + "http-proxy-agent": { + "version": "2.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, @@ -10708,6 +11492,7 @@ "version": "2.1.0", "resolved": false, "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "agent-base": "4", "debug": "3.1.0" @@ -10715,8 +11500,12 @@ }, "http-signature": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -10725,8 +11514,12 @@ }, "https-proxy-agent": { "version": "2.2.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "agent-base": "^4.3.0", "debug": "^3.1.0" @@ -10734,22 +11527,37 @@ }, "humanize-ms": { "version": "1.2.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ms": "^2.0.0" } }, "iconv-lite": { "version": "0.4.23", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, "iferr": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg==" }, @@ -10757,12 +11565,28 @@ "version": "3.0.3", "resolved": false, "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "minimatch": "^3.0.4" } }, "import-lazy": { "version": "2.1.0", +<<<<<<< HEAD + "bundled": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true + }, + "infer-owner": { + "version": "1.0.4", + "bundled": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, +======= "resolved": false, "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" }, @@ -10780,6 +11604,7 @@ "version": "1.0.6", "resolved": false, "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "once": "^1.3.0", "wrappy": "1" @@ -10787,6 +11612,17 @@ }, "inherits": { "version": "2.0.4", +<<<<<<< HEAD + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "init-package-json": { + "version": "1.10.3", + "bundled": true, +======= "resolved": false, "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, @@ -10799,6 +11635,7 @@ "version": "1.10.3", "resolved": false, "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "glob": "^7.1.1", "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0", @@ -10812,6 +11649,25 @@ }, "invert-kv": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true + }, + "ip": { + "version": "1.1.5", + "bundled": true + }, + "ip-regex": { + "version": "2.1.0", + "bundled": true + }, + "is-callable": { + "version": "1.1.4", + "bundled": true + }, + "is-ci": { + "version": "1.2.1", + "bundled": true, +======= "resolved": false, "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" }, @@ -10834,27 +11690,43 @@ "version": "1.2.1", "resolved": false, "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ci-info": "^1.5.0" }, "dependencies": { "ci-info": { "version": "1.6.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "is-cidr": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-8Xnnbjsb0x462VoYiGlhEi+drY8SFwrHiSYuzc/CEwco55vkehTaxAyIjEdpi3EMvLPPJAJi9FlzP+h+03gp0Q==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cidr-regex": "^2.0.10" } }, "is-date-object": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" }, @@ -10862,14 +11734,19 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "number-is-nan": "^1.0.0" } }, "is-installed-globally": { "version": "0.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "global-dirs": "^0.1.0", "is-path-inside": "^1.0.0" @@ -10877,6 +11754,17 @@ }, "is-npm": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "is-obj": { + "version": "1.0.1", + "bundled": true + }, + "is-path-inside": { + "version": "1.0.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=" }, @@ -10889,12 +11777,20 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "path-is-inside": "^1.0.1" } }, "is-redirect": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "is-regex": { + "version": "1.0.4", + "bundled": true, +======= "resolved": false, "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" }, @@ -10902,12 +11798,24 @@ "version": "1.0.4", "resolved": false, "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "has": "^1.0.1" } }, "is-retry-allowed": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true + }, + "is-symbol": { + "version": "1.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" }, @@ -10920,12 +11828,32 @@ "version": "1.0.2", "resolved": false, "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "has-symbols": "^1.0.0" } }, "is-typedarray": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, @@ -10948,10 +11876,34 @@ "version": "0.1.1", "resolved": false, "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "optional": true }, "json-parse-better-errors": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "bundled": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsonparse": { + "version": "1.3.1", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", + "bundled": true, +======= "resolved": false, "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, @@ -10979,6 +11931,7 @@ "version": "1.4.1", "resolved": false, "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -10988,14 +11941,25 @@ }, "latest-version": { "version": "3.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "package-json": "^4.0.0" } }, "lazy-property": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "lcid": { + "version": "2.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc=" }, @@ -11003,14 +11967,19 @@ "version": "2.0.0", "resolved": false, "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "invert-kv": "^2.0.0" } }, "libcipm": { "version": "4.0.7", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-fTq33otU3PNXxxCTCYCYe7V96o59v/o7bvtspmbORXpgFk+wcWrGf5x6tBgui5gCed/45/wtPomBsZBYm5KbIw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "bin-links": "^1.1.2", "bluebird": "^3.5.1", @@ -11031,8 +12000,12 @@ }, "libnpm": { "version": "3.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-d7jU5ZcMiTfBqTUJVZ3xid44fE5ERBm9vBnmhp2ECD2Ls+FNXWxHSkO7gtvrnbLO78gwPdNPz1HpsF3W4rjkBQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "bin-links": "^1.1.2", "bluebird": "^3.5.3", @@ -11058,8 +12031,12 @@ }, "libnpmaccess": { "version": "3.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-01512AK7MqByrI2mfC7h5j8N9V4I7MHJuk9buo8Gv+5QgThpOgpjB7sQBDDkeZqRteFb1QM/6YNdHfG7cDvfAQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^2.0.0", "get-stream": "^4.0.0", @@ -11069,8 +12046,12 @@ }, "libnpmconfig": { "version": "1.2.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "figgy-pudding": "^3.5.1", "find-up": "^3.0.0", @@ -11079,16 +12060,24 @@ "dependencies": { "find-up": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "locate-path": "^3.0.0" } }, "locate-path": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -11096,31 +12085,47 @@ }, "p-limit": { "version": "2.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-try": "^2.0.0" } }, "p-locate": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-limit": "^2.0.0" } }, "p-try": { "version": "2.2.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "libnpmhook": { "version": "5.0.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-UdNLMuefVZra/wbnBXECZPefHMGsVDTq5zaM/LgKNE9Keyl5YXQTnGAzEo+nFOpdRqTWI9LYi4ApqF9uVCCtuA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^2.0.0", "figgy-pudding": "^3.4.1", @@ -11130,8 +12135,12 @@ }, "libnpmorg": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-0sRUXLh+PLBgZmARvthhYXQAWn0fOsa6T5l3JSe2n9vKG/lCVK4nuG7pDsa7uMq+uTt2epdPK+a2g6btcY11Ww==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^2.0.0", "figgy-pudding": "^3.4.1", @@ -11141,8 +12150,12 @@ }, "libnpmpublish": { "version": "1.1.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-2yIwaXrhTTcF7bkJKIKmaCV9wZOALf/gsTDxVSu/Gu/6wiG3fA8ce8YKstiWKTxSFNC0R7isPUb6tXTVFZHt2g==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^2.0.0", "figgy-pudding": "^3.5.1", @@ -11157,8 +12170,12 @@ }, "libnpmsearch": { "version": "2.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-VTBbV55Q6fRzTdzziYCr64+f8AopQ1YZ+BdPOv16UegIEaE8C0Kch01wo4s3kRTFV64P121WZJwgmBwrq68zYg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "figgy-pudding": "^3.5.1", "get-stream": "^4.0.0", @@ -11167,8 +12184,12 @@ }, "libnpmteam": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-p420vM28Us04NAcg1rzgGW63LMM6rwe+6rtZpfDxCcXxM0zUTLl7nPFEnRF3JfFBF5skF/yuZDUthTsHgde8QA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^2.0.0", "figgy-pudding": "^3.4.1", @@ -11178,8 +12199,12 @@ }, "libnpx": { "version": "10.2.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-ujaYToga1SAX5r7FU5ShMFi88CWpY75meNZtr6RtEyv4l2ZK3+Wgvxq2IqlwWBiDZOqhumdeiocPS1aKrCMe3A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "dotenv": "^5.0.1", "npm-package-arg": "^6.0.0", @@ -11193,8 +12218,12 @@ }, "locate-path": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -11202,8 +12231,12 @@ }, "lock-verify": { "version": "2.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-vcLpxnGvrqisKvLQ2C2v0/u7LVly17ak2YSgoK4PrdsYBXQIax19vhKiLfvKNFx7FRrpTnitrpzF/uuCMuorIg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "npm-package-arg": "^6.1.0", "semver": "^5.4.1" @@ -11211,14 +12244,25 @@ }, "lockfile": { "version": "1.0.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "signal-exit": "^3.0.2" } }, "lodash._baseindexof": { "version": "3.1.0", +<<<<<<< HEAD + "bundled": true + }, + "lodash._baseuniq": { + "version": "4.6.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=" }, @@ -11226,6 +12270,7 @@ "version": "4.6.0", "resolved": false, "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "lodash._createset": "~4.0.0", "lodash._root": "~3.0.0" @@ -11233,6 +12278,17 @@ }, "lodash._bindcallback": { "version": "3.0.1", +<<<<<<< HEAD + "bundled": true + }, + "lodash._cacheindexof": { + "version": "3.0.2", + "bundled": true + }, + "lodash._createcache": { + "version": "3.1.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=" }, @@ -11245,12 +12301,52 @@ "version": "3.1.2", "resolved": false, "integrity": "sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "lodash._getnative": "^3.0.0" } }, "lodash._createset": { "version": "4.0.3", +<<<<<<< HEAD + "bundled": true + }, + "lodash._getnative": { + "version": "3.9.1", + "bundled": true + }, + "lodash._root": { + "version": "3.0.1", + "bundled": true + }, + "lodash.clonedeep": { + "version": "4.5.0", + "bundled": true + }, + "lodash.restparam": { + "version": "3.6.1", + "bundled": true + }, + "lodash.union": { + "version": "4.6.0", + "bundled": true + }, + "lodash.uniq": { + "version": "4.5.0", + "bundled": true + }, + "lodash.without": { + "version": "4.4.0", + "bundled": true + }, + "lowercase-keys": { + "version": "1.0.1", + "bundled": true + }, + "lru-cache": { + "version": "5.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=" }, @@ -11298,22 +12394,31 @@ "version": "5.1.1", "resolved": false, "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "yallist": "^3.0.2" } }, "make-dir": { "version": "1.3.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "pify": "^3.0.0" } }, "make-fetch-happen": { "version": "5.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "agentkeepalive": "^3.4.1", "cacache": "^12.0.0", @@ -11330,14 +12435,25 @@ }, "map-age-cleaner": { "version": "0.1.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-defer": "^1.0.0" } }, "meant": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "mem": { + "version": "4.3.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==" }, @@ -11345,6 +12461,7 @@ "version": "4.3.0", "resolved": false, "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^2.0.0", @@ -11353,13 +12470,24 @@ "dependencies": { "mimic-fn": { "version": "2.1.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "mime-db": { "version": "1.35.0", +<<<<<<< HEAD + "bundled": true + }, + "mime-types": { + "version": "2.1.19", + "bundled": true, +======= "resolved": false, "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" }, @@ -11367,30 +12495,43 @@ "version": "2.1.19", "resolved": false, "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "mime-db": "~1.35.0" } }, "minimatch": { "version": "3.0.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "brace-expansion": "^1.1.7" } }, "minizlib": { "version": "1.3.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "minipass": "^2.9.0" }, "dependencies": { "minipass": { "version": "2.9.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11400,8 +12541,12 @@ }, "mississippi": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "concat-stream": "^1.5.0", "duplexify": "^3.4.2", @@ -11416,24 +12561,37 @@ } }, "mkdirp": { +<<<<<<< HEAD + "version": "0.5.5", + "bundled": true, +======= "version": "0.5.4", "resolved": false, "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "minimist": "^1.2.5" }, "dependencies": { "minimist": { "version": "1.2.5", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "move-concurrently": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.1.1", "copy-concurrently": "^1.0.0", @@ -11445,13 +12603,32 @@ "dependencies": { "aproba": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "ms": { "version": "2.1.1", +<<<<<<< HEAD + "bundled": true + }, + "mute-stream": { + "version": "0.0.7", + "bundled": true + }, + "nice-try": { + "version": "1.0.5", + "bundled": true + }, + "node-fetch-npm": { + "version": "2.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, @@ -11469,6 +12646,7 @@ "version": "2.0.2", "resolved": false, "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "encoding": "^0.1.11", "json-parse-better-errors": "^1.0.0", @@ -11477,8 +12655,12 @@ }, "node-gyp": { "version": "5.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "env-paths": "^2.2.0", "glob": "^7.1.4", @@ -11494,9 +12676,14 @@ } }, "nopt": { +<<<<<<< HEAD + "version": "4.0.3", + "bundled": true, +======= "version": "4.0.1", "resolved": false, "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "abbrev": "1", "osenv": "^0.1.4" @@ -11504,8 +12691,12 @@ }, "normalize-package-data": { "version": "2.5.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -11515,8 +12706,12 @@ "dependencies": { "resolve": { "version": "1.10.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "path-parse": "^1.0.6" } @@ -11525,8 +12720,12 @@ }, "npm-audit-report": { "version": "1.3.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-abeqS5ONyXNaZJPGAf6TOUMNdSe1Y6cpc9MLBRn+CuUoYbfdca6AxOyXVlfIv9OgKX+cacblbG5w7A6ccwoTPw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cli-table3": "^0.5.0", "console-control-strings": "^1.1.0" @@ -11534,14 +12733,25 @@ }, "npm-bundled": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "npm-normalize-package-bin": "^1.0.1" } }, "npm-cache-filename": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "npm-install-checks": { + "version": "3.0.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE=" }, @@ -11549,14 +12759,19 @@ "version": "3.0.2", "resolved": false, "integrity": "sha512-E4kzkyZDIWoin6uT5howP8VDvkM+E8IQDcHAycaAxMbwkqhIg5eEYALnXOl3Hq9MrkdQB/2/g1xwBINXdKSRkg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "semver": "^2.3.0 || 3.x || 4 || 5" } }, "npm-lifecycle": { "version": "3.1.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "byline": "^5.0.0", "graceful-fs": "^4.1.15", @@ -11570,6 +12785,17 @@ }, "npm-logical-tree": { "version": "1.2.1", +<<<<<<< HEAD + "bundled": true + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true + }, + "npm-package-arg": { + "version": "6.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==" }, @@ -11582,6 +12808,7 @@ "version": "6.1.1", "resolved": false, "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "hosted-git-info": "^2.7.1", "osenv": "^0.1.5", @@ -11591,8 +12818,12 @@ }, "npm-packlist": { "version": "1.4.8", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1", @@ -11601,8 +12832,12 @@ }, "npm-pick-manifest": { "version": "3.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "figgy-pudding": "^3.5.1", "npm-package-arg": "^6.0.0", @@ -11611,8 +12846,12 @@ }, "npm-profile": { "version": "4.0.4", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-Ta8xq8TLMpqssF0H60BXS1A90iMoM6GeKwsmravJ6wYjWwSzcYBTdyWa3DZCYqPutacBMEm7cxiOkiIeCUAHDQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.1.2 || 2", "figgy-pudding": "^3.4.1", @@ -11620,9 +12859,14 @@ } }, "npm-registry-fetch": { +<<<<<<< HEAD + "version": "4.0.4", + "bundled": true, +======= "version": "4.0.3", "resolved": false, "integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "JSONStream": "^1.3.4", "bluebird": "^3.5.1", @@ -11635,21 +12879,36 @@ "dependencies": { "safe-buffer": { "version": "5.2.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "npm-run-path": { "version": "2.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "path-key": "^2.0.0" } }, "npm-user-validate": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=" }, @@ -11657,6 +12916,7 @@ "version": "4.1.2", "resolved": false, "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -11666,6 +12926,25 @@ }, "number-is-nan": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "oauth-sign": { + "version": "0.9.0", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "object-keys": { + "version": "1.0.12", + "bundled": true + }, + "object.getownpropertydescriptors": { + "version": "2.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, @@ -11688,6 +12967,7 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "define-properties": "^1.1.2", "es-abstract": "^1.5.1" @@ -11695,14 +12975,29 @@ }, "once": { "version": "1.4.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "wrappy": "1" } }, "opener": { "version": "1.5.1", +<<<<<<< HEAD + "bundled": true + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-locale": { + "version": "3.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==" }, @@ -11715,6 +13010,7 @@ "version": "3.1.0", "resolved": false, "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "execa": "^1.0.0", "lcid": "^2.0.0", @@ -11723,8 +13019,12 @@ "dependencies": { "cross-spawn": { "version": "6.0.5", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -11735,8 +13035,12 @@ }, "execa": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", @@ -11751,6 +13055,13 @@ }, "os-tmpdir": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, +======= "resolved": false, "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, @@ -11758,6 +13069,7 @@ "version": "0.1.5", "resolved": false, "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" @@ -11765,6 +13077,21 @@ }, "p-defer": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "p-finally": { + "version": "1.0.0", + "bundled": true + }, + "p-is-promise": { + "version": "2.1.0", + "bundled": true + }, + "p-limit": { + "version": "1.2.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" }, @@ -11782,20 +13109,32 @@ "version": "1.2.0", "resolved": false, "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-try": "^1.0.0" } }, "p-locate": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "p-limit": "^1.1.0" } }, "p-try": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "package-json": { + "version": "4.0.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" }, @@ -11803,6 +13142,7 @@ "version": "4.0.1", "resolved": false, "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "got": "^6.7.1", "registry-auth-token": "^3.0.1", @@ -11812,8 +13152,12 @@ }, "pacote": { "version": "9.5.12", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "bluebird": "^3.5.3", "cacache": "^12.0.2", @@ -11849,8 +13193,12 @@ "dependencies": { "minipass": { "version": "2.9.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -11860,8 +13208,12 @@ }, "parallel-transform": { "version": "1.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cyclist": "~0.2.2", "inherits": "^2.0.3", @@ -11870,8 +13222,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -11884,8 +13240,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -11894,6 +13254,49 @@ }, "path-exists": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "path-is-inside": { + "version": "1.0.2", + "bundled": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true + }, + "path-parse": { + "version": "1.0.6", + "bundled": true + }, + "performance-now": { + "version": "2.1.0", + "bundled": true + }, + "pify": { + "version": "3.0.0", + "bundled": true + }, + "prepend-http": { + "version": "1.0.4", + "bundled": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "promise-inflight": { + "version": "1.0.1", + "bundled": true + }, + "promise-retry": { + "version": "1.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, @@ -11946,6 +13349,7 @@ "version": "1.1.1", "resolved": false, "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "err-code": "^1.0.0", "retry": "^0.10.0" @@ -11953,21 +13357,36 @@ "dependencies": { "retry": { "version": "0.10.1", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "promzard": { "version": "0.3.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "read": "1" } }, "proto-list": { "version": "1.2.4", +<<<<<<< HEAD + "bundled": true + }, + "protoduck": { + "version": "5.0.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" }, @@ -11975,12 +13394,28 @@ "version": "5.0.1", "resolved": false, "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "genfun": "^5.0.0" } }, "prr": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true + }, + "psl": { + "version": "1.1.29", + "bundled": true + }, + "pump": { + "version": "3.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, @@ -11998,6 +13433,7 @@ "version": "3.0.0", "resolved": false, "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -12005,8 +13441,12 @@ }, "pumpify": { "version": "1.5.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "duplexify": "^3.6.0", "inherits": "^2.0.3", @@ -12015,8 +13455,12 @@ "dependencies": { "pump": { "version": "2.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -12026,6 +13470,21 @@ }, "punycode": { "version": "1.4.1", +<<<<<<< HEAD + "bundled": true + }, + "qrcode-terminal": { + "version": "0.12.0", + "bundled": true + }, + "qs": { + "version": "6.5.2", + "bundled": true + }, + "query-string": { + "version": "6.8.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, @@ -12043,6 +13502,7 @@ "version": "6.8.2", "resolved": false, "integrity": "sha512-J3Qi8XZJXh93t2FiKyd/7Ec6GNifsjKXUsVFkSBj/kjLsDylWhnCz4NT1bkPcKotttPW+QbKGqqPH8OoI2pdqw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "decode-uri-component": "^0.2.0", "split-on-first": "^1.0.0", @@ -12051,6 +13511,13 @@ }, "qw": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, +======= "resolved": false, "integrity": "sha1-77/cdA+a0FQwRCassYNBLMi5ltQ=" }, @@ -12058,6 +13525,7 @@ "version": "1.2.8", "resolved": false, "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "deep-extend": "^0.6.0", "ini": "~1.3.0", @@ -12067,31 +13535,47 @@ "dependencies": { "minimist": { "version": "1.2.5", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "read": { "version": "1.0.7", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "mute-stream": "~0.0.4" } }, "read-cmd-shim": { "version": "1.0.5", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.2" } }, "read-installed": { "version": "4.0.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "debuglog": "^1.0.1", "graceful-fs": "^4.1.2", @@ -12104,8 +13588,12 @@ }, "read-package-json": { "version": "2.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "glob": "^7.1.1", "graceful-fs": "^4.1.2", @@ -12116,8 +13604,12 @@ }, "read-package-tree": { "version": "5.3.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "read-package-json": "^2.0.0", "readdir-scoped-modules": "^1.0.0", @@ -12126,8 +13618,12 @@ }, "readable-stream": { "version": "3.6.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -12136,8 +13632,12 @@ }, "readdir-scoped-modules": { "version": "1.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "debuglog": "^1.0.1", "dezalgo": "^1.0.0", @@ -12147,8 +13647,12 @@ }, "registry-auth-token": { "version": "3.4.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "rc": "^1.1.6", "safe-buffer": "^5.0.1" @@ -12156,16 +13660,24 @@ }, "registry-url": { "version": "3.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "rc": "^1.0.1" } }, "request": { "version": "2.88.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -12191,6 +13703,25 @@ }, "require-directory": { "version": "2.1.1", +<<<<<<< HEAD + "bundled": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true + }, + "resolve-from": { + "version": "4.0.0", + "bundled": true + }, + "retry": { + "version": "0.12.0", + "bundled": true + }, + "rimraf": { + "version": "2.7.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, @@ -12213,27 +13744,51 @@ "version": "2.7.1", "resolved": false, "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "glob": "^7.1.3" } }, "run-queue": { "version": "1.0.3", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "aproba": "^1.1.1" }, "dependencies": { "aproba": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "safe-buffer": { "version": "5.1.2", +<<<<<<< HEAD + "bundled": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true + }, + "semver": { + "version": "5.7.1", + "bundled": true + }, + "semver-diff": { + "version": "2.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, @@ -12251,12 +13806,20 @@ "version": "2.1.0", "resolved": false, "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "semver": "^5.0.3" } }, "set-blocking": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true + }, + "sha": { + "version": "3.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, @@ -12264,20 +13827,44 @@ "version": "3.0.0", "resolved": false, "integrity": "sha512-DOYnM37cNsLNSGIG/zZWch5CKIRNoLdYUQTQlcgkRkoYIUwDYjqDyye16YcDZg/OPdcbUgTKMjc4SY6TB7ZAPw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.2" } }, "shebang-command": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "slide": { + "version": "1.1.6", + "bundled": true + }, + "smart-buffer": { + "version": "4.1.0", + "bundled": true + }, + "socks": { + "version": "2.3.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, @@ -12300,6 +13887,7 @@ "version": "2.3.3", "resolved": false, "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ip": "1.1.5", "smart-buffer": "^4.1.0" @@ -12307,8 +13895,12 @@ }, "socks-proxy-agent": { "version": "4.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "agent-base": "~4.2.1", "socks": "~2.3.2" @@ -12316,8 +13908,12 @@ "dependencies": { "agent-base": { "version": "4.2.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "es6-promisify": "^5.0.0" } @@ -12326,6 +13922,13 @@ }, "sorted-object": { "version": "2.0.1", +<<<<<<< HEAD + "bundled": true + }, + "sorted-union-stream": { + "version": "2.1.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-fWMfS9OnmKJK8d/8+/6DM3pd9fw=" }, @@ -12333,6 +13936,7 @@ "version": "2.1.3", "resolved": false, "integrity": "sha1-x3lMfgd4gAUv9xqNSi27Sppjisc=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "from2": "^1.3.0", "stream-iterate": "^1.1.0" @@ -12340,8 +13944,12 @@ "dependencies": { "from2": { "version": "1.3.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-iEE7qqX5pZfP3pIh2GmGzTwGHf0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "inherits": "~2.0.1", "readable-stream": "~1.1.10" @@ -12349,6 +13957,13 @@ }, "isarray": { "version": "0.0.1", +<<<<<<< HEAD + "bundled": true + }, + "readable-stream": { + "version": "1.1.14", + "bundled": true, +======= "resolved": false, "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, @@ -12356,6 +13971,7 @@ "version": "1.1.14", "resolved": false, "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -12365,15 +13981,23 @@ }, "string_decoder": { "version": "0.10.31", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "spdx-correct": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -12381,6 +14005,13 @@ }, "spdx-exceptions": { "version": "2.1.0", +<<<<<<< HEAD + "bundled": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==" }, @@ -12388,6 +14019,7 @@ "version": "3.0.0", "resolved": false, "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -12395,6 +14027,17 @@ }, "spdx-license-ids": { "version": "3.0.3", +<<<<<<< HEAD + "bundled": true + }, + "split-on-first": { + "version": "1.1.0", + "bundled": true + }, + "sshpk": { + "version": "1.14.2", + "bundled": true, +======= "resolved": false, "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" }, @@ -12407,6 +14050,7 @@ "version": "1.14.2", "resolved": false, "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -12421,16 +14065,24 @@ }, "ssri": { "version": "6.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "figgy-pudding": "^3.5.1" } }, "stream-each": { "version": "1.2.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "end-of-stream": "^1.1.0", "stream-shift": "^1.0.0" @@ -12438,8 +14090,12 @@ }, "stream-iterate": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-K9fHcpbBcCpGSIuK1B95hl7s1OE=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "readable-stream": "^2.1.5", "stream-shift": "^1.0.0" @@ -12447,8 +14103,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12461,8 +14121,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -12471,6 +14135,17 @@ }, "stream-shift": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "strict-uri-encode": { + "version": "2.0.0", + "bundled": true + }, + "string-width": { + "version": "2.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, @@ -12483,6 +14158,7 @@ "version": "2.1.1", "resolved": false, "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -12490,6 +14166,17 @@ "dependencies": { "ansi-regex": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, @@ -12502,6 +14189,7 @@ "version": "4.0.0", "resolved": false, "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ansi-regex": "^3.0.0" } @@ -12510,21 +14198,36 @@ }, "string_decoder": { "version": "1.3.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.2.0" }, "dependencies": { "safe-buffer": { "version": "5.2.0", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "stringify-package": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, +======= "resolved": false, "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==" }, @@ -12532,12 +14235,24 @@ "version": "3.0.1", "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "ansi-regex": "^2.0.0" } }, "strip-eof": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "supports-color": { + "version": "5.4.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, @@ -12550,14 +14265,19 @@ "version": "5.4.0", "resolved": false, "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "has-flag": "^3.0.0" } }, "tar": { "version": "4.4.13", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", @@ -12570,8 +14290,12 @@ "dependencies": { "minipass": { "version": "2.9.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -12581,14 +14305,29 @@ }, "term-size": { "version": "1.2.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "execa": "^0.7.0" } }, "text-table": { "version": "0.2.0", +<<<<<<< HEAD + "bundled": true + }, + "through": { + "version": "2.3.8", + "bundled": true + }, + "through2": { + "version": "2.0.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, @@ -12601,6 +14340,7 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "readable-stream": "^2.1.5", "xtend": "~4.0.1" @@ -12608,8 +14348,12 @@ "dependencies": { "readable-stream": { "version": "2.3.6", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12622,8 +14366,12 @@ }, "string_decoder": { "version": "1.1.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "~5.1.0" } @@ -12632,6 +14380,17 @@ }, "timed-out": { "version": "4.0.1", +<<<<<<< HEAD + "bundled": true + }, + "tiny-relative-date": { + "version": "1.3.0", + "bundled": true + }, + "tough-cookie": { + "version": "2.4.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, @@ -12644,6 +14403,7 @@ "version": "2.4.3", "resolved": false, "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" @@ -12651,20 +14411,43 @@ }, "tunnel-agent": { "version": "0.6.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "safe-buffer": "^5.0.1" } }, "tweetnacl": { "version": "0.14.5", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "optional": true }, "typedarray": { "version": "0.0.6", +<<<<<<< HEAD + "bundled": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "umask": { + "version": "1.1.0", + "bundled": true + }, + "unique-filename": { + "version": "1.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, @@ -12682,28 +14465,48 @@ "version": "1.1.1", "resolved": false, "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "unique-slug": "^2.0.0" } }, "unique-slug": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "imurmurhash": "^0.1.4" } }, "unique-string": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "crypto-random-string": "^1.0.0" } }, "unpipe": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true + }, + "unzip-response": { + "version": "2.0.1", + "bundled": true + }, + "update-notifier": { + "version": "2.5.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, @@ -12716,6 +14519,7 @@ "version": "2.5.0", "resolved": false, "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "boxen": "^1.2.1", "chalk": "^2.0.1", @@ -12731,14 +14535,29 @@ }, "url-parse-lax": { "version": "1.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "prepend-http": "^1.0.1" } }, "util-deprecate": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "util-extend": { + "version": "1.0.3", + "bundled": true + }, + "util-promisify": { + "version": "2.1.0", + "bundled": true, +======= "resolved": false, "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, @@ -12751,12 +14570,20 @@ "version": "2.1.0", "resolved": false, "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "object.getownpropertydescriptors": "^2.0.3" } }, "uuid": { "version": "3.3.3", +<<<<<<< HEAD + "bundled": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "bundled": true, +======= "resolved": false, "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, @@ -12764,6 +14591,7 @@ "version": "3.0.4", "resolved": false, "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -12771,16 +14599,24 @@ }, "validate-npm-package-name": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "builtins": "^1.0.3" } }, "verror": { "version": "1.10.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -12789,22 +14625,37 @@ }, "wcwidth": { "version": "1.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "defaults": "^1.0.3" } }, "which": { "version": "1.3.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "isexe": "^2.0.0" } }, "which-module": { "version": "2.0.0", +<<<<<<< HEAD + "bundled": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, +======= "resolved": false, "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, @@ -12812,14 +14663,19 @@ "version": "1.1.2", "resolved": false, "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^1.0.2" }, "dependencies": { "string-width": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12830,24 +14686,36 @@ }, "widest-line": { "version": "2.0.1", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^2.1.1" } }, "worker-farm": { "version": "1.7.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "errno": "~0.1.7" } }, "wrap-ansi": { "version": "2.1.0", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -12855,8 +14723,12 @@ "dependencies": { "string-width": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12867,6 +14739,13 @@ }, "wrappy": { "version": "1.0.2", +<<<<<<< HEAD + "bundled": true + }, + "write-file-atomic": { + "version": "2.4.3", + "bundled": true, +======= "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, @@ -12874,6 +14753,7 @@ "version": "2.4.3", "resolved": false, "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", @@ -12882,6 +14762,25 @@ }, "xdg-basedir": { "version": "3.0.0", +<<<<<<< HEAD + "bundled": true + }, + "xtend": { + "version": "4.0.1", + "bundled": true + }, + "y18n": { + "version": "4.0.0", + "bundled": true + }, + "yallist": { + "version": "3.0.3", + "bundled": true + }, + "yargs": { + "version": "11.1.1", + "bundled": true, +======= "resolved": false, "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" }, @@ -12904,6 +14803,7 @@ "version": "11.1.1", "resolved": false, "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "cliui": "^4.0.0", "decamelize": "^1.1.1", @@ -12921,15 +14821,23 @@ "dependencies": { "y18n": { "version": "3.2.1", +<<<<<<< HEAD + "bundled": true +======= "resolved": false, "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa } } }, "yargs-parser": { "version": "9.0.2", +<<<<<<< HEAD + "bundled": true, +======= "resolved": false, "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", +>>>>>>> 3f97c632bc13075a4c13a6485d2e53e6694b36fa "requires": { "camelcase": "^4.1.0" } @@ -13226,11 +15134,53 @@ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "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": { - "lcid": "^1.0.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "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" + } + } } }, "os-tmpdir": { @@ -13563,6 +15513,13 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true, + "optional": true + }, "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -13663,9 +15620,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.30", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz", + "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13954,9 +15911,9 @@ } }, "prosemirror-keymap": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz", - "integrity": "sha512-PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz", + "integrity": "sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg==", "requires": { "prosemirror-state": "^1.0.0", "w3c-keyname": "^2.2.0" @@ -14016,9 +15973,9 @@ } }, "prosemirror-view": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.14.7.tgz", - "integrity": "sha512-ZCRbGAmJa0ORIY4xrDvOpxS/oAnph3egDauvQEI7SX4eex0zovUfC61I5X4AtPCaNN4JpLWEk60voCWi0cE2vA==", + "version": "1.14.10", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.14.10.tgz", + "integrity": "sha512-kzZxAmEZrYfBPU9igmZhks7b10kjOB837/CdUgfIvmdB+zvPRvrPK+3En475f7Eafb+lRPqmMTp2RB1To48smg==", "requires": { "prosemirror-model": "^1.1.0", "prosemirror-state": "^1.0.0", @@ -14056,9 +16013,9 @@ "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "pstree.remy": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.7.tgz", - "integrity": "sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==" + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" }, "public-encrypt": { "version": "4.0.3", @@ -14071,6 +16028,13 @@ "parse-asn1": "^5.0.0", "randombytes": "^2.0.1", "safe-buffer": "^5.1.2" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + } } }, "pug": { @@ -14457,9 +16421,9 @@ } }, "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -14483,9 +16447,9 @@ "integrity": "sha512-o35fODF4GsNxEzmnRWZuoe29a6x3fXqRsLXOlAvS4d+TvO3yoLTM8iZnSZpJCkHQnjOOWRnGvDh5tryqJCKZ0w==" }, "react-color": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.0.tgz", - "integrity": "sha512-FyVeU1kQiSokWc8NPz22azl1ezLpJdUyTbWL0LPUpcuuYDrZ/Y1veOk9rRK5B3pMlyDGvTk4f4KJhlkIQNRjEA==", + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.1.tgz", + "integrity": "sha512-X5XpyJS6ncplZs74ak0JJoqPi+33Nzpv5RYWWxn17bslih+X7OlgmfpmGC1fNvdkK7/SGWYf1JJdn7D2n5gSuQ==", "requires": { "@icons/material": "^0.2.4", "lodash": "^4.17.11", @@ -14560,9 +16524,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==" + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", + "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==" } } }, @@ -14613,9 +16577,9 @@ } }, "react-overlays": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-3.1.3.tgz", - "integrity": "sha512-FH82W0R9lFJm/YCTDeSvEKQxXyTaZmjMEQlAjRhgjQhknTkyMsft+X4Wep5l95QveqdxGVxl/P41WUOzTGJUcw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-3.2.0.tgz", + "integrity": "sha512-YTgCmw6l4uBOYylSnc3V8WLX+A0EoGnzDrqkYz0K7MUKbMBZFpaxLXH4EF9eZbspd+syZHQ5XAABI7n/zak1EA==", "requires": { "@babel/runtime": "^7.4.5", "@popperjs/core": "^2.0.0", @@ -15172,119 +17136,14 @@ } }, "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "requires": { - "camelcase": "^3.0.0" - } - } + "yargs": "^13.3.2" } }, "sass-loader": { @@ -15620,9 +17479,9 @@ } }, "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", + "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "requires": { "yallist": "^4.0.0" } @@ -15956,9 +17815,9 @@ } }, "socket.io-parser": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz", - "integrity": "sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", + "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", "requires": { "component-emitter": "1.2.1", "debug": "~4.1.0", @@ -15986,13 +17845,14 @@ } }, "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", + "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "dev": true, "requires": { "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "uuid": "^3.4.0", + "websocket-driver": "0.6.5" } }, "sockjs-client": { @@ -16107,9 +17967,9 @@ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -16594,9 +18454,9 @@ } }, "tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", + "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -16630,9 +18490,9 @@ } }, "terser": { - "version": "4.6.12", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.12.tgz", - "integrity": "sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz", + "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==", "dev": true, "requires": { "commander": "^2.20.0", @@ -17100,9 +18960,9 @@ } }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", "dev": true }, "tslint": { @@ -17234,9 +19094,9 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==" + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz", + "integrity": "sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==" }, "typescript-collections": { "version": "1.3.3", @@ -17523,9 +19383,9 @@ }, "dependencies": { "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" }, "schema-utils": { "version": "1.0.0", @@ -17684,14 +19544,136 @@ } }, "watchpack": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz", - "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz", + "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==", "dev": true, "requires": { - "chokidar": "^2.1.8", + "chokidar": "^3.4.0", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.0" + }, + "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true, + "optional": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "optional": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "optional": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true + }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "dev": true, + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "watchpack-chokidar2": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", + "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "dev": true, + "optional": true, + "requires": { + "chokidar": "^2.1.8" } }, "wbuf": { @@ -17847,36 +19829,6 @@ "tapable": "^1.0.0" } }, - "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" - } - }, - "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 - }, "json5": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", @@ -17886,15 +19838,6 @@ "minimist": "^1.2.0" } }, - "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" - } - }, "loader-utils": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", @@ -17916,17 +19859,6 @@ "readable-stream": "^2.0.1" } }, - "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" - } - }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -18016,9 +19948,9 @@ } }, "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "readable-stream": { @@ -18049,9 +19981,9 @@ } }, "webpack-dev-server": { - "version": "3.10.3", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz", - "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", + "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==", "dev": true, "requires": { "ansi-html": "0.0.7", @@ -18062,31 +19994,31 @@ "debug": "^4.1.1", "del": "^4.1.1", "express": "^4.17.1", - "html-entities": "^1.2.1", + "html-entities": "^1.3.1", "http-proxy-middleware": "0.19.1", "import-local": "^2.0.0", "internal-ip": "^4.3.0", "ip": "^1.1.5", "is-absolute-url": "^3.0.3", "killable": "^1.0.1", - "loglevel": "^1.6.6", + "loglevel": "^1.6.8", "opn": "^5.5.0", "p-retry": "^3.0.1", - "portfinder": "^1.0.25", + "portfinder": "^1.0.26", "schema-utils": "^1.0.0", "selfsigned": "^1.10.7", "semver": "^6.3.0", "serve-index": "^1.9.1", - "sockjs": "0.3.19", + "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "^4.0.1", + "spdy": "^4.0.2", "strip-ansi": "^3.0.1", "supports-color": "^6.1.0", "url": "^0.11.0", "webpack-dev-middleware": "^3.7.2", "webpack-log": "^2.0.0", "ws": "^6.2.1", - "yargs": "12.0.5" + "yargs": "^13.3.2" }, "dependencies": { "ansi-regex": { @@ -18095,55 +20027,6 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - }, - "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" - } - } - } - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -18153,77 +20036,6 @@ "ms": "^2.1.1" } }, - "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-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "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" - } - }, - "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 - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "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" - } - }, - "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" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -18269,29 +20081,6 @@ "uuid": "^3.3.2" } }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -18300,36 +20089,6 @@ "requires": { "async-limiter": "~1.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" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -18393,9 +20152,9 @@ } }, "webrtc-adapter": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.5.1.tgz", - "integrity": "sha512-R5LkIR/APjODkstSXFOztOmINXQ0nqIGfUoKTtCzjyiDXHNgwhkqZ9vi8UzGyjfUBibuZ0ZzVyV10qtuLGW3CQ==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.6.0.tgz", + "integrity": "sha512-l/f+IEfqiupo0mUA8Ye8eFI4BmGiL+8vRXJuwc+rq1bP2oa/5s7EH+rLRD/KoMiM+EDHYdozi0RXQK8K4cu2gg==", "requires": { "rtcpeerconnection-shim": "^1.2.15", "sdp": "^2.12.0" @@ -18429,13 +20188,11 @@ } }, "websocket-driver": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", - "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", + "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "dev": true, "requires": { - "http-parser-js": ">=0.4.0 <0.4.11", - "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" } }, @@ -18666,9 +20423,9 @@ } }, "ws": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", - "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==" + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" }, "xdg-basedir": { "version": "3.0.0", @@ -18735,12 +20492,9 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "yaml": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz", - "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==", - "requires": { - "@babel/runtime": "^7.9.2" - } + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==" }, "yargs": { "version": "13.3.2", diff --git a/src/.DS_Store b/src/.DS_Store Binary files differindex 5b35884bd..942a5672b 100644 --- a/src/.DS_Store +++ b/src/.DS_Store diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index 18a0b43ff..471045400 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -699,6 +699,11 @@ export namespace Docs { } export function ButtonDocument(options?: DocumentOptions) { + // const btn = InstanceFromProto(Prototypes.get(DocumentType.BUTTON), undefined, { ...(options || {}), "onClick-rawScript": "-script-" }); + // btn.layoutKey = "layout_onClick"; + // btn.height = 250; + // btn.width = 200; + // btn.layout_onClick = ScriptingBox.LayoutString("onClick"); return InstanceFromProto(Prototypes.get(DocumentType.BUTTON), undefined, { ...(options || {}), "onClick-rawScript": "-script-" }); } diff --git a/src/client/views/EditableView.tsx b/src/client/views/EditableView.tsx index e0e205df9..4f3da70d7 100644 --- a/src/client/views/EditableView.tsx +++ b/src/client/views/EditableView.tsx @@ -5,6 +5,7 @@ import * as Autosuggest from 'react-autosuggest'; import { ObjectField } from '../../fields/ObjectField'; import { SchemaHeaderField } from '../../fields/SchemaHeaderField'; import "./EditableView.scss"; +import { DragManager } from '../util/DragManager'; export interface EditableProps { /** @@ -48,6 +49,7 @@ export interface EditableProps { HeadingObject?: SchemaHeaderField | undefined; toggle?: () => void; color?: string | undefined; + onDrop?: any; } /** @@ -77,6 +79,13 @@ export class EditableView extends React.Component<EditableProps> { } } + @action + componentDidMount() { + if (this._ref.current && this.props.onDrop) { + DragManager.MakeDropTarget(this._ref.current, this.props.onDrop.bind(this)); + } + } + _didShow = false; @action diff --git a/src/client/views/nodes/ScriptingBox.scss b/src/client/views/nodes/ScriptingBox.scss index 43695f00d..6029966ac 100644 --- a/src/client/views/nodes/ScriptingBox.scss +++ b/src/client/views/nodes/ScriptingBox.scss @@ -5,31 +5,84 @@ flex-direction: column; background-color: rgb(241, 239, 235); padding: 10px; + .scriptingBox-inputDiv { display: flex; flex-direction: column; height: calc(100% - 30px); + table-layout: fixed; + + overflow-y: hidden; + white-space: nowrap; + + .scriptingBox-wrapper { + width: 100%; + height: 100%; + max-height: calc(100%-30px); + display: flex; + flex-direction: row; + justify-content: center; + overflow-y: scroll; + + .scriptingBox-textArea { + flex: 70; + width: 70%; + height: 100%; + box-sizing: border-box; + resize: none; + padding: 7px; + overflow-y: scroll; + } + + .scriptingBox-plist { + flex: 30; + width: 30%; + height: 100%; + box-sizing: border-box; + resize: none; + padding: 2px; + overflow-y: scroll; + } + + .scriptingBox-paramNames { + flex: 60; + width: 60%; + box-sizing: border-box; + resize: none; + padding: 7px; + overflow-y: scroll; + } + + .scriptingBox-paramInputs { + flex: 40; + width: 40%; + box-sizing: border-box; + resize: none; + padding: 2px; + overflow-y: scroll; + } + } + .scriptingBox-errorMessage { overflow: auto; + background: "red"; + background-color: "red"; + height: 40px; } + .scripting-params { background: "beige"; } - .scriptingBox-textArea { - width: 100%; - height: 100%; - box-sizing: border-box; - resize: none; - padding: 7px; - } } .scriptingBox-toolbar { width: 100%; height: 30px; + .scriptingBox-button { - width: 50% + width: 50%; + resize: auto; + } } -} - +}
\ No newline at end of file diff --git a/src/client/views/nodes/ScriptingBox.tsx b/src/client/views/nodes/ScriptingBox.tsx index 0944edf60..86baa0f6f 100644 --- a/src/client/views/nodes/ScriptingBox.tsx +++ b/src/client/views/nodes/ScriptingBox.tsx @@ -1,4 +1,4 @@ -import { action, observable, computed } from "mobx"; +import { action, observable, computed, _allowStateChangesInsideComputed, runInAction } from "mobx"; import { observer } from "mobx-react"; import * as React from "react"; import { documentSchema } from "../../../fields/documentSchemas"; @@ -12,25 +12,37 @@ import { EditableView } from "../EditableView"; import { FieldView, FieldViewProps } from "../nodes/FieldView"; import "./ScriptingBox.scss"; import { OverlayView } from "../OverlayView"; -import { DocumentIconContainer } from "./DocumentIcon"; +import { DocumentIconContainer, DocumentIcon } from "./DocumentIcon"; import { List } from "../../../fields/List"; +import { DragManager } from "../../util/DragManager"; +import { Doc } from "../../../fields/Doc"; +import { Dropdown } from "prosemirror-menu"; const ScriptingSchema = createSchema({}); type ScriptingDocument = makeInterface<[typeof ScriptingSchema, typeof documentSchema]>; const ScriptingDocument = makeInterface(ScriptingSchema, documentSchema); + @observer export class ScriptingBox extends ViewBoxAnnotatableComponent<FieldViewProps, ScriptingDocument>(ScriptingDocument) { + protected multiTouchDisposer?: InteractionUtils.MultiTouchEventDisposer | undefined; + rowProps: any; + _paramNum: number = 0; public static LayoutString(fieldStr: string) { return FieldView.LayoutString(ScriptingBox, fieldStr); } _overlayDisposer?: () => void; @observable private _errorMessage: string = ""; + @observable private _applied: boolean = false; + @observable private _paramsNames: string[] = []; + @observable private _paramsTypes: string[] = []; + @observable private _paramsValues: any[] = []; @computed get rawScript() { return StrCast(this.dataDoc[this.props.fieldKey + "-rawScript"], StrCast(this.layoutDoc[this.props.fieldKey + "-rawScript"])); } @computed get compileParams() { return Cast(this.dataDoc[this.props.fieldKey + "-params"], listSpec("string"), Cast(this.layoutDoc[this.props.fieldKey + "-params"], listSpec("string"), [])); } set rawScript(value) { this.dataDoc[this.props.fieldKey + "-rawScript"] = value; } + set compileParams(value) { this.dataDoc[this.props.fieldKey + "-params"] = value; } @action @@ -41,21 +53,126 @@ export class ScriptingBox extends ViewBoxAnnotatableComponent<FieldViewProps, Sc componentWillUnmount() { this._overlayDisposer?.(); } @action + onFinish = () => { + const result = CompileScript(this.rawScript, {}); + this.rootDoc.layoutKey = "layout"; + this.rootDoc.height = 50; + this.rootDoc.width = 100; + this.props.Document.documentText = this.rawScript; + } + + @action + onError = (error: any) => { + for (const entry of error) { + this._errorMessage = this._errorMessage + " " + entry.messageText; + } + } + + @action onCompile = () => { - const params = this.compileParams.reduce((o: ScriptParam, p: string) => { o[p] = "any"; return o; }, {} as ScriptParam); + // const params = this.compileParams.reduce((o: ScriptParam, p: string) => { o[p] = "any"; return o; }, {} as ScriptParam); + // const result = CompileScript(this.rawScript, { + // editable: true + // transformer: DocumentIconContainer.getTransformer(), + // params, + // typecheck: false + // }); + // this._errorMessage = isCompileError(result) ? result.errors.map(e => e.messageText).join("\n") : ""; + // return this.dataDoc[this.props.fieldKey] = result.compiled ? new ScriptField(result) : undefined; + + const params = this.compileParams.reduce((o: ScriptParam, p: string) => { + const param = p.split(":"); + + o[param[0].trim()] = param[1].trim(); + return o; + }, + {} as ScriptParam); + + console.log(this.compileParams); + const result = CompileScript(this.rawScript, { editable: true, transformer: DocumentIconContainer.getTransformer(), params, - typecheck: false + typecheck: true }); - this._errorMessage = isCompileError(result) ? result.errors.map(e => e.messageText).join("\n") : ""; - return this.dataDoc[this.props.fieldKey] = result.compiled ? new ScriptField(result) : undefined; + this._errorMessage = ""; + if (result.compiled) { + this._errorMessage = ""; + this.props.Document.data = new ScriptField(result); + } + else { + this.onError(result.errors); + } + this.props.Document.documentText = this.rawScript; } + @action onRun = () => { - this.onCompile()?.script.run({}, err => this._errorMessage = err.map((e: any) => e.messageText).join("\n")); + const params = this.compileParams.reduce((o: ScriptParam, p: string) => { + const param = p.split(":"); + o[param[0].trim()] = param[1].trim(); + return o; + }, + {} as ScriptParam); + + const result = CompileScript(this.rawScript, { + editable: true, + transformer: DocumentIconContainer.getTransformer(), + params, + typecheck: true + }); + this._errorMessage = ""; + if (result.compiled) { + // this automatically saves + result.run({ self: this.rootDoc, this: this.layoutDoc }, (err: any) => { + this._errorMessage = ""; + this.onError(err); + }); + this.props.Document.data = new ScriptField(result); + } + else { + this.onError(result.errors); + } + this.props.Document.documentText = this.rawScript; + //this.onCompile()?.script.run({}, err => this._errorMessage = err.map((e: any) => e.messageText).join("\n")); + } + + @action + onApply = () => { + const params = this.compileParams.reduce((o: ScriptParam, p: string) => { + const param = p.split(":"); + + o[param[0].trim()] = param[1].trim(); + return o; + }, + {} as ScriptParam); + + console.log(this.compileParams); + + const result = CompileScript(this.rawScript, { + editable: true, + transformer: DocumentIconContainer.getTransformer(), + params, + typecheck: true + }); + this._errorMessage = ""; + if (result.compiled) { + this._errorMessage = ""; + this.props.Document.data = new ScriptField(result); + + this._applied = true; + } + else { + this.onError(result.errors); + } + this.props.Document.documentText = this.rawScript; + } + + @action + onEdit = () => { + this._applied = false; } onFocus = () => { @@ -63,36 +180,293 @@ export class ScriptingBox extends ViewBoxAnnotatableComponent<FieldViewProps, Sc this._overlayDisposer = OverlayView.Instance.addElement(<DocumentIconContainer />, { x: 0, y: 0 }); } + @action + onDrop = (e: Event, de: DragManager.DropEvent, index: any) => { + console.log("drop"); + const firstParam = this.compileParams[index].split(":"); + const droppedDocs = de.complete.docDragData?.droppedDocuments; + if (droppedDocs?.length) { + const dropped = droppedDocs[0]; + this.props.Document[index] = dropped; + // you can't just bind a variable to a specific Doc. The Doc would have to be added to 'capturedVariables' field of the compile options, but I think it makes more sense to just be declaring this variable to be a Doc + } + } + + @action + onDelete = (num: number) => { + this.compileParams.splice(num, 1); + } + render() { + + // var Dropdown = require('react-simple-dropdown'); + // var DropdownTrigger = Dropdown.DropdownTrigger; + // var DropdownContent = Dropdown.DropdownContent; + const params = <EditableView - contents={this.compileParams.join(" ")} + contents={""} display={"block"} maxHeight={72} height={35} - fontSize={28} + fontSize={22} GetValue={() => ""} - SetValue={value => { this.compileParams = new List<string>(value.split(" ").filter(s => s !== " ")); return true; }} + SetValue={value => { + if (value !== "" && value !== " ") { + const parameter = value.split(":"); + if (parameter[1] !== undefined) { + if (parameter[1].trim() === "Doc" || parameter[1].trim() === "string" || parameter[1].split("|")) { + if (!!!this._paramsNames.includes(parameter[0].trim())) { + this._errorMessage = ""; + this._paramNum++; + const par = this.compileParams; + this.compileParams = new List<string>(value.split(";").filter(s => s !== " ")); + this.compileParams.push.apply(this.compileParams, par); + this._paramsNames.push(parameter[0].trim()); + this._paramsTypes.push(parameter[1].trim()); + this._paramsValues.push("j"); + return true; + } else { + this._errorMessage = "this name has already been used"; + return false; + } + } else { + this._errorMessage = "this type is not supported"; + return false; + } + } else { + this._errorMessage = "must set type of parameter"; + return false; + } + } + return false; + }} />; + + const listParams = this.compileParams.map((parameter, i) => + <div className="scriptingBox-pborder" + background-color="white" + + onKeyPress={e => { + if (e.key === "Enter") { + this._overlayDisposer?.(); + } + } + } + > + <EditableView + contents={parameter} + display={"block"} + maxHeight={72} + height={35} + fontSize={12} + GetValue={() => parameter} + onDrop={(e: Event, de: DragManager.DropEvent) => this.onDrop(e, de, i)} + SetValue={value => { + if (value !== "" && value !== " ") { + this.compileParams[i] = value; + parameter = value; + return true; + } else { + this.onDelete(i); + return true; + } + }} + /> + </div> + ); + + const settingParams = this._paramsNames.map((parameter: string, i: number) => + <div className="scriptingBox-pborder" + background-color="white" + + onKeyPress={e => { + if (e.key === "Enter") { + this._overlayDisposer?.(); + } + } + } + > + + {this._paramsTypes[i] === "Doc" ? <div> + <div className="scriptingBox-wrapper"> + + <div className="scriptingBox-paramNames"> + {parameter + ":" + this._paramsTypes[i] + " = "} + </div> + + <div className="scriptingBox-paramInputs" + onFocus={this.onFocus}> + <EditableView + contents={this.props.Document[parameter] ?? "undefined"} + display={"block"} + maxHeight={72} + height={35} + fontSize={14} + GetValue={() => StrCast(this.props.Document[parameter]) ?? "undefined"} + onDrop={(e: Event, de: DragManager.DropEvent) => this.onDrop(e, de, parameter)} + SetValue={value => { + runInAction(() => { + const script = CompileScript( + value, { + addReturn: true, typecheck: false, + transformer: DocumentIconContainer.getTransformer(), + params: { makeInterface: "any" } + }); + if (!script.compiled) { + return false; + } else { + const results = script.run(); + if (results.success) { + + this.props.Document[parameter] = results.result; + return true; + } else { + return false; + } + } + + }); + return true; + }} + /> + </div> + </div> + </div> : null} + + {this._paramsTypes[i] === "string" ? <div> + <div className="scriptingBox-wrapper"> + + <div className="scriptingBox-paramNames"> + {parameter + ":" + this._paramsValues[i] + " = "} + </div> + + <div className="scriptingBox-paramInputs" + onFocus={this.onFocus}> + <EditableView + contents={this.props.Document[parameter] ?? "undefined"} + display={"block"} + maxHeight={72} + height={35} + fontSize={12} + GetValue={() => StrCast(this.props.Document[parameter]) ?? "undefined"} + SetValue={value => { + runInAction(() => { + this.props.Document[parameter] = value; + return true; + }); + return true; + }} + /> + </div> + </div> + </div> : null} + + {/* {this._paramsTypes[i].split("|")[1] ? <div> + <div className="scriptingBox-wrapper"> + + <div className="scriptingBox-paramNames"> + {parameter + ":" + this._paramsValues[i] + " = "} + </div> + + <div className="scriptingBox-paramInputs" + onFocus={this.onFocus}> + <Dropdown> + <DropdownTrigger>Profile</DropdownTrigger> + <DropdownContent> + <div>{this._paramsTypes[0]}</div> + <div>{this._paramsTypes[1]}</div> + </DropdownContent> + </Dropdown> + </div> + </div> + </div> : null} */} + + </div> + ); + + const scriptingInputs = <div className="scriptingBox-inputDiv" style={{ height: "100%" }} + onPointerDown={e => this.props.isSelected(true) && e.stopPropagation()} > + <div className="scriptingBox-wrapper"> + + <textarea + placeholder="write your script here" + onChange={e => this.rawScript = e.target.value} + value={this.rawScript} + onFocus={this.onFocus} + onBlur={e => this._overlayDisposer?.()} + style={{ width: this.compileParams.length > 0 ? "70%" : "100%", resize: "none", height: "100%" }} + /> + + + {this.compileParams.length > 0 ? <div className="scriptingBox-plist" style={{ width: "30%" }}> + {listParams} + </div> : null} + </div> + <div className="scriptingBox-params">{params}</div> + + {this._errorMessage ? <div className="scriptingBox-errorMessage"> + {this._errorMessage} + </div> : null} + </div>; + + + const scriptingTools = <div className="scriptingBox-toolbar"> + <button className="scriptingBox-button" style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onCompile(); e.stopPropagation(); }}>Compile</button> + <button className="scriptingBox-button" style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onApply(); e.stopPropagation(); }}>Apply</button> + {this.rootDoc.layoutKey === "layout_onClick" ? <button className="scriptingBox-button" + style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onFinish(); e.stopPropagation(); }}>Finish</button> : null} + </div>; + + + const paramsInputs = <div className="scriptingBox-inputDiv" style={{ height: "100%" }} + onPointerDown={e => this.props.isSelected(true) && e.stopPropagation()} > + + {this.compileParams.length > 0 ? <div className="scriptingBox-plist"> + {settingParams} + </div> : null} + + </div>; + + const paramsTools = <div className="scriptingBox-toolbar"> + <button className="scriptingBox-button" style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onEdit(); e.stopPropagation(); }}>Edit</button> + <button className="scriptingBox-button" style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onRun(); e.stopPropagation(); }}>Run</button> + {this.rootDoc.layoutKey === "layout_onClick" ? <button className="scriptingBox-button" + style={{ width: this.rootDoc.layoutKey === "layout_onClick" ? "33%" : "50%" }} + onPointerDown={e => { this.onFinish(); e.stopPropagation(); }}>Finish</button> : null} + </div>; + + + return ( <div className="scriptingBox-outerDiv" + onWheel={e => this.props.isSelected(true) && e.stopPropagation()}> - <div className="scriptingBox-inputDiv" - onPointerDown={e => this.props.isSelected(true) && e.stopPropagation()} > - <textarea className="scriptingBox-textarea" - placeholder="write your script here" - onChange={e => this.rawScript = e.target.value} - value={this.rawScript} - onFocus={this.onFocus} - onBlur={e => this._overlayDisposer?.()} /> - <div className="scriptingBox-errorMessage" style={{ background: this._errorMessage ? "red" : "" }}>{this._errorMessage}</div> - <div className="scriptingBox-params" >{params}</div> - </div> + + {!!!this._applied ? <div style={{ height: "100%" }}> + {scriptingInputs} + </div> : null} + + {this._applied ? <div style={{ height: "100%" }}> + {paramsInputs} + </div> : null} + {this.rootDoc.layout === "layout" ? <div></div> : (null)} - <div className="scriptingBox-toolbar"> - <button className="scriptingBox-button" onPointerDown={e => { this.onCompile(); e.stopPropagation(); }}>Compile</button> - <button className="scriptingBox-button" onPointerDown={e => { this.onRun(); e.stopPropagation(); }}>Run</button> - </div> + + {!!!this._applied ? <div> + {scriptingTools} + </div> : null} + + {this._applied ? <div> + {paramsTools} + </div> : null} + </div> ); } + } diff --git a/src/server/database.ts b/src/server/database.ts index a5f23c4b1..b017f1e3c 100644 --- a/src/server/database.ts +++ b/src/server/database.ts @@ -8,6 +8,7 @@ import { IDatabase, DocumentsCollection } from './IDatabase'; import { MemoryDatabase } from './MemoryDatabase'; import * as mongoose from 'mongoose'; import { Upload } from './SharedMediaTypes'; +import { timeout } from 'async'; export namespace Database { |