From 97b98149388d5577578ac7acdde01ddfcac2f14a Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 13 Jan 2021 15:31:18 -0500 Subject: [PATCH 001/141] Github Action (#1640) --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++ .github/workflows/release.yml | 24 ++++++++++++++++++++++++ .travis.yml | 33 --------------------------------- 3 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..3d6da6d84 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: ci +on: + push: + branches: + - master + pull_request: + branches: + - '**' +jobs: + build: + runs-on: ubuntu-18.04 + timeout-minutes: 30 + steps: + - uses: actions/checkout@v2 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: '10.14' + - name: Cache Node.js modules + uses: actions/cache@v2 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + - run: npm ci + - run: ./scripts/before_script.sh + env: + CI: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..bac1d52ec --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +name: release +on: + release: + types: [published] +jobs: + publish-npm: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://registry.npmjs.org/ + - name: Cache Node.js modules + uses: actions/cache@v2 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + - run: npm ci + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1c3983c2c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: node_js -node_js: -- '10.14' - -branches: - only: - - master - - /^greenkeeper/.*$/ - - /^v?[0-9]+.[0-9]+.[0-9]+(-.*)?$/ - -cache: - directories: - - "$HOME/.npm" - -before_install: - - npm install -g greenkeeper-lockfile@1 -before_script: - - ./scripts/before_script.sh - - greenkeeper-lockfile-update -after_script: - - greenkeeper-lockfile-upload -deploy: - provider: npm - skip_cleanup: true - on: - tags: true - all_branches: true - condition: "$TRAVIS_JOB_NUMBER = $TRAVIS_BUILD_NUMBER.1" - repo: parse-community/parse-dashboard - email: - secure: gVteu82NuKHKLBBySJJMwDgmli5j8MPiECz78uGhxxw6VCEhgG9LtHHHvJeXNcTYUgM0B4GKpk7f2QuqLnjkLJJJhmmb+uQlknhWXOsE43dNNZTjeNm8G8BLeMJofy07yx/J2kKQTbGbf2eHobt9f//FchzatwzfnUhqXFIQYRYnnod7vfB6xMQuRaiO2YDAqaoxunhdrjmoRHUDeD6F9L53CD+wqZfKMarB60rT+BFS2SEnyC+hvzqaBsTc5YMf3wdZ4A2U/NTYYANtvPybMIyi/M1GvCggsw0LcWJX7u9o87e1ctBQS8+OTsJd1evxE6SCyrXsOX1zVx8hiBvUqErTKwxc3cg6/hxnod7DrA0/hn9J/BTJXx4Kn0p9Lt+jv2NICzV0FsAMRrM+yhlt4UBKxP5Q4macYu1oiXIzfRrNpNJk55RTBBC47LbDNefdteglFw0tXHQUIr9iPAY80/2RvCVXx2tUyVmpfAU5+uo4QyMAlPkwt0/3L7ZwgS3uvTdH+d1KWscYt7phnqjBgnuMqE+1gIgESPZOkYF5nzmQ8GOdLVI02Pj/Dnoyq+RhrQ+rcZ/sZC5AJnbifEb5ul0AfxKDOmYKchFaRptzaZa9I2oQTK0nttBMBjgjRriFOKFHyV55qHGLO/UndDSzlWRNdRatGdbg10DvO24Vew4= - api_key: - secure: J9A9+tie/HmsVaDxiI3XEPGCK8SaR30JaMJldOEPwNJv3k+A5QifcgSPnVV3w+jdF1rMmYxdZLF8K9BDKLuPTl1Wh1V/y6S5qznnSv6IoCW2Zfud9m15zY7OCu8f8/Z0D4Lsb90pkgUGzChvy3XzH5JstkHaFlUyNI2WQWBRyRE9YoQ3IKUAsPL73O85gPD0qQAiX0smyk9zAM7anLCBptVXqJAwKHg10NwWExjWjVcmLOf+Ehu6DviV+QRvCMzoLWx+Q2w2cu3YkmJXq+FLMxgtRat6/PAM3zX9JSlLoQWPOK6LFO3VkOxgpk9V9F9B1pmsKAZ49GR8ltnjQcn3oSWJwShXP5Rl4xTOdZ64M6LBwtqnENqw8zF0f1QQyvRpPhXmZH0//84ikZEnWeENZoyqoqClQVJf2pCL1nlTzJDgVKL4bRx+ZGBaUMKxVbgdhY3GyJ2rOkZvB7VlUD/GzcnwokDvJ0OL2V68M+nw+BSe796U5GKZOLm7oNEOwzI0+Rosfl19jWRRIYfyLD0s6tHNi0liXXPJouNwWZIvBuHrMkYhCxP/Cdsze3j3HLgz5o9KEMlD4PhkyhArb/XF3yZBOlWdcK4zr6QBNf9+V7h6cHMmvOrMY0NjLm6x6rv3jMqEOEBpKUCR71NOEnbLDJ76OPVUDUbLlrJqAHBH3FU= From 8b729541d380366c16c3f80ebe011a60646efc78 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 13 Jan 2021 22:36:57 +0200 Subject: [PATCH 002/141] [Snyk] Upgrade parse from 2.17.0 to 2.18.0 (#1629) * fix: upgrade parse from 2.17.0 to 2.18.0 Snyk has created this PR to upgrade parse from 2.17.0 to 2.18.0. See this package in npm: https://www.npmjs.com/package/parse See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr * bump parse to 2.19.0 Co-authored-by: Diamond Lewis --- package-lock.json | 301 ++++++++++++++++++++++++++++++++++++++++------ package.json | 12 +- 2 files changed, 268 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab162e0e0..735f39cae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4798,9 +4798,9 @@ "dev": true }, "copy-to-clipboard": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz", - "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz", + "integrity": "sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==", "requires": { "toggle-selection": "^1.0.6" } @@ -10226,9 +10226,9 @@ "dev": true }, "node-sass": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", - "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz", + "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -10245,7 +10245,7 @@ "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", - "sass-graph": "2.2.5", + "sass-graph": "^2.2.4", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" }, @@ -10950,31 +10950,23 @@ } }, "parse": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/parse/-/parse-2.17.0.tgz", - "integrity": "sha512-1hWoMNW39LH5YV3xCds9LyD8SsKD6FUwlD1Kn8ZlXNosg6WgF+s3ZSQUzT5AJ/9YPUoC/y1PoCO79FumrBYftA==", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/parse/-/parse-2.19.0.tgz", + "integrity": "sha512-twxq/Kzyd0c9exxK0jMEPISwDpFzukmexSa+VAFL4a6K+lqGeJ9TuysYhfR9Bkcd0mHGcMFM5gn4uycu1xykvA==", "requires": { - "@babel/runtime": "7.11.2", - "@babel/runtime-corejs3": "7.11.2", + "@babel/runtime": "7.12.5", + "@babel/runtime-corejs3": "7.12.5", "crypto-js": "4.0.0", "react-native-crypto-js": "1.0.0", "uuid": "3.4.0", - "ws": "7.3.1", + "ws": "7.4.0", "xmlhttprequest": "1.8.0" }, "dependencies": { - "@babel/runtime": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", - "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, "@babel/runtime-corejs3": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz", - "integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz", + "integrity": "sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -10986,9 +10978,9 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==" + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", + "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" } } }, @@ -11028,14 +11020,14 @@ "requires": { "@apollographql/graphql-playground-html": "1.6.26", "@graphql-tools/links": "^6.2.4", - "@graphql-tools/stitch": "6.2.3", + "@graphql-tools/stitch": "6.2.4", "@graphql-tools/utils": "6.2.3", "@node-rs/bcrypt": "0.4.1", "@parse/fs-files-adapter": "1.0.1", - "@parse/push-adapter": "3.3.0", - "@parse/s3-files-adapter": "1.5.0", + "@parse/push-adapter": "3.4.0", + "@parse/s3-files-adapter": "1.6.0", "@parse/simple-mailgun-adapter": "1.1.0", - "apollo-server-express": "2.17.0", + "apollo-server-express": "2.18.1", "bcryptjs": "2.4.3", "body-parser": "1.19.0", "commander": "5.1.0", @@ -11049,7 +11041,7 @@ "graphql-upload": "11.0.0", "intersect": "1.0.1", "jsonwebtoken": "8.5.1", - "jwks-rsa": "1.10.0", + "jwks-rsa": "1.10.1", "ldapjs": "2.2.0", "lodash": "4.17.20", "lru-cache": "5.1.1", @@ -12049,9 +12041,9 @@ } }, "react-ace": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-8.1.0.tgz", - "integrity": "sha512-n3rm9gRNZjLGlXJQ587RASOQCPn6WlcV2gjRYwvG3gyVpBf4pY6lh/uI9tDkx2zYdEKJUfnGbTmzEGL5yyDWuw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-8.0.0.tgz", + "integrity": "sha512-EvU14vXbZpAenb1ZVKdn8yTQs/shZ9RghFulHtt67bBXT6sjrNHcfOEXHYtSEmwMb6pQVVNNuulzzd8o+Uouig==", "requires": { "ace-builds": "^1.4.6", "diff-match-patch": "^1.0.4", @@ -12990,15 +12982,246 @@ } }, "sass-graph": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", - "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.6.tgz", + "integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==", "dev": true, "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", - "yargs": "^13.3.2" + "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=", + "dev": true + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^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==", + "dev": true + }, + "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=", + "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": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "^1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "^1.0.0" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^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=", + "dev": true + }, + "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" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "^0.2.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "dev": true + }, + "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" + } + }, + "y18n": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==", + "dev": true + }, + "yargs": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz", + "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==", + "dev": true, + "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-security.0" + } + }, + "yargs-parser": { + "version": "5.0.0-security.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz", + "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==", + "dev": true, + "requires": { + "camelcase": "^3.0.0", + "object.assign": "^4.1.0" + } + } } }, "sass-loader": { diff --git a/package.json b/package.json index 0827ab7d2..9b1fa3f5d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "commander": "6.2.0", "connect-flash": "0.1.1", "cookie-session": "2.0.0-beta.3", - "copy-to-clipboard": "^3.2.0", + "copy-to-clipboard": "3.2.0", "create-react-class": "15.7.0", "csurf": "1.11.0", "express": "4.17.1", @@ -54,19 +54,19 @@ "js-beautify": "1.11.0", "json-file-plus": "3.2.0", "package-json": "6.5.0", - "parse": "2.17.0", + "parse": "2.19.0", "passport": "0.4.1", "passport-local": "1.0.0", "prismjs": "1.22.0", "prop-types": "15.7.2", "query-string": "6.13.7", "react": "16.14.0", - "react-ace": "^8.0.0", + "react-ace": "8.0.0", "react-dnd": "10.0.2", "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "^1.19.1", + "react-json-view": "1.19.1", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", @@ -93,8 +93,8 @@ "http-server": "0.12.0", "jest": "24.8.0", "marked": "0.8.2", - "node-sass": "^4.13.1", - "null-loader": "^3.0.0", + "node-sass": "4.13.1", + "null-loader": "3.0.0", "parse-server": "github:parseplatform/parse-server#master", "path-to-regexp": "3.2.0", "puppeteer": "3.0.0", From e6c2f9195f45689d9b7ee67bdf3840cbf8dc3d06 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 13 Jan 2021 22:55:20 +0200 Subject: [PATCH 003/141] fix: upgrade commander from 6.2.0 to 6.2.1 (#1636) Snyk has created this PR to upgrade commander from 6.2.0 to 6.2.1. See this package in npm: https://www.npmjs.com/package/commander See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: Diamond Lewis --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 735f39cae..0071fb10a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4643,9 +4643,9 @@ } }, "commander": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz", - "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, "commondir": { "version": "1.0.1", diff --git a/package.json b/package.json index 9b1fa3f5d..02cb48fc4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", - "commander": "6.2.0", + "commander": "6.2.1", "connect-flash": "0.1.1", "cookie-session": "2.0.0-beta.3", "copy-to-clipboard": "3.2.0", From 1d2e0d373bd57036842afd7857d2f8ad53971c73 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 13 Jan 2021 23:56:39 +0200 Subject: [PATCH 004/141] fix: upgrade semver from 7.3.2 to 7.3.4 (#1634) Snyk has created this PR to upgrade semver from 7.3.2 to 7.3.4. See this package in npm: https://www.npmjs.com/package/semver See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: Diamond Lewis --- package-lock.json | 30 +++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0071fb10a..dcb5b4e0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11135,6 +11135,12 @@ } } }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, "uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", @@ -13310,9 +13316,27 @@ "optional": true }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } }, "send": { "version": "0.17.1", diff --git a/package.json b/package.json index 02cb48fc4..85c6a1a63 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "react-router": "5.1.2", "react-router-dom": "5.1.2", "regenerator-runtime": "0.13.5", - "semver": "7.3.2" + "semver": "7.3.4" }, "devDependencies": { "@babel/core": "7.8.7", From b8e3f711abade779b0586d8cd79818b870791f11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jan 2021 17:08:14 -0500 Subject: [PATCH 005/141] chore(deps): bump ini from 1.3.5 to 1.3.8 (#1641) Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 438 ++++++++++++++++++++++++++++++---------------- 1 file changed, 287 insertions(+), 151 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcb5b4e0c..eab33fcc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,34 +5,33 @@ "requires": true, "dependencies": { "@apollo/client": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.2.4.tgz", - "integrity": "sha512-lfsxKINoc11+g4NQFyKFuxszc/GlecHrxkJYvx/oWkdpscSU5bm/c+BwI/yvk1/E3yfbR7Afi9XIYrt212xrtA==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.6.tgz", + "integrity": "sha512-XSm/STyNS8aHdDigLLACKNMHwI0qaQmEHWHtTP+jHe/E1wZRnn66VZMMgwKLy2V4uHISHfmiZ4KpUKDPeJAKqg==", "dev": true, "requires": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", "@wry/context": "^0.5.2", - "@wry/equality": "^0.2.0", + "@wry/equality": "^0.3.0", "fast-json-stable-stringify": "^2.0.0", "graphql-tag": "^2.11.0", "hoist-non-react-statics": "^3.3.2", - "optimism": "^0.13.0", + "optimism": "^0.13.1", "prop-types": "^15.7.2", "symbol-observable": "^2.0.0", - "terser": "^5.2.0", - "ts-invariant": "^0.4.4", + "ts-invariant": "^0.6.0", "tslib": "^1.10.0", "zen-observable": "^0.8.14" }, "dependencies": { "@wry/equality": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.2.0.tgz", - "integrity": "sha512-Y4d+WH6hs+KZJUC8YKLYGarjGekBrhslDbf/R20oV+AakHPINSitHfDRQz3EGcEWc1luXYNUvMhawWtZVWNGvQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.1.tgz", + "integrity": "sha512-8/Ftr3jUZ4EXhACfSwPIfNsE8V6WKesdjp+Dxi78Bej6qlasAxiz0/F8j0miACRj9CL4vC5Y5FsfwwEYAuhWbg==", "dev": true, "requires": { - "tslib": "^1.9.3" + "tslib": "^1.14.1" } }, "symbol-observable": { @@ -41,6 +40,17 @@ "integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==", "dev": true }, + "ts-invariant": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.0.tgz", + "integrity": "sha512-caoafsfgb8QxdrKzFfjKt627m4i8KTtfAiji0DYJfWI4A/S9ORNNpzYuD9br64kyKFgxn9UNaLLbSupam84mCA==", + "dev": true, + "requires": { + "@types/ungap__global-this": "^0.3.1", + "@ungap/global-this": "^0.4.2", + "tslib": "^1.9.3" + } + }, "zen-observable": { "version": "0.8.15", "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", @@ -1295,12 +1305,12 @@ } }, "@graphql-tools/links": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@graphql-tools/links/-/links-6.2.4.tgz", - "integrity": "sha512-dQH3oWVTkCwzGmfIi1OjyKAjPw1jOexP1f3hv8UajgU7Um/DCjVkvXQHeMGlihXg4bH/wogFheCJ0SwF4oFFUA==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/links/-/links-6.2.5.tgz", + "integrity": "sha512-XeGDioW7F+HK6HHD/zCeF0HRC9s12NfOXAKv1HC0J7D50F4qqMvhdS/OkjzLoBqsgh/Gm8icRc36B5s0rOA9ig==", "dev": true, "requires": { - "@graphql-tools/utils": "^6.2.4", + "@graphql-tools/utils": "^7.0.0", "apollo-link": "1.2.14", "apollo-upload-client": "14.1.2", "cross-fetch": "3.0.6", @@ -1310,14 +1320,22 @@ }, "dependencies": { "@graphql-tools/utils": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.4.tgz", - "integrity": "sha512-ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.4.tgz", + "integrity": "sha512-EDSb98dTWX8FngvayWejip1DutOl0wGtNbXC7a3CZf5fiJS7bGHQ/8cSlMhe9XaHwpLJCbAk/Ijnp/dYbXk33w==", "dev": true, "requires": { "@ardatan/aggregate-error": "0.0.6", - "camel-case": "4.1.1", - "tslib": "~2.0.1" + "camel-case": "4.1.2", + "tslib": "~2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "cross-fetch": { @@ -1426,6 +1444,24 @@ "tslib": "~2.0.1" }, "dependencies": { + "camel-case": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz", + "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", + "dev": true, + "requires": { + "pascal-case": "^3.1.1", + "tslib": "^1.10.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "tslib": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", @@ -1682,9 +1718,9 @@ }, "dependencies": { "tslib": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", - "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", "dev": true, "optional": true } @@ -1733,6 +1769,60 @@ "lodash.once": "^4.0.0", "ms": "^2.0.0", "xtend": "^4.0.1" + }, + "dependencies": { + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", + "dev": true + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", + "dev": true + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", + "dev": true + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", + "dev": true + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", + "dev": true + } } } } @@ -2396,6 +2486,12 @@ "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true }, + "@types/ungap__global-this": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@types/ungap__global-this/-/ungap__global-this-0.3.1.tgz", + "integrity": "sha512-+/DsiV4CxXl6ZWefwHZDXSe1Slitz21tom38qPCaG0DYCS1NnDPIQDTKcmQ/tvK/edJUKkmuIDBJbmKDiB0r/g==", + "dev": true + }, "@types/ws": { "version": "7.2.7", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.7.tgz", @@ -2431,9 +2527,9 @@ } }, "@types/zen-observable": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.1.tgz", - "integrity": "sha512-wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz", + "integrity": "sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==", "dev": true }, "@typescript-eslint/experimental-utils": { @@ -2491,6 +2587,12 @@ } } }, + "@ungap/global-this": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.3.tgz", + "integrity": "sha512-MuHEpDBurNVeD6mV9xBcAN2wfTwuaFQhHuhWkJuXmyVJ5P5sBCw+nnFpdfb0tAvgWkfefWCsAoAsh7MTUr3LPg==", + "dev": true + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -2667,12 +2769,12 @@ } }, "@wry/context": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.2.tgz", - "integrity": "sha512-B/JLuRZ/vbEKHRUiGj6xiMojST1kHhu4WcreLfNN7q9DqQFrb97cWgf/kiYsPSUCAMVN0HzfFc8XjJdzgZzfjw==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.3.tgz", + "integrity": "sha512-n0uKHiWpf2ArHhmcHcUsKA+Dj0gtye/h56VmsDcoMRuK/ZPFeHKi8ck5L/ftqtF12ZbQR9l8xMPV7y+xybaRDA==", "dev": true, "requires": { - "tslib": "^1.9.3" + "tslib": "^1.14.1" } }, "@wry/equality": { @@ -2707,9 +2809,9 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "abstract-logging": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz", - "integrity": "sha512-/oA9z7JszpIioo6J6dB79LVUgJ3eD3cxkAmdCkvWWS+Y9tPtALs1rLqOekLUXUbYqM2fB9TTK0ibAyZJJOP/CA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz", + "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==", "dev": true }, "accepts": { @@ -3040,6 +3142,23 @@ "fs-capacitor": "^2.0.4", "http-errors": "^1.7.3", "object-path": "^0.11.4" + }, + "dependencies": { + "busboy": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz", + "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==", + "dev": true, + "requires": { + "dicer": "0.3.0" + } + }, + "object-path": { + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz", + "integrity": "sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==", + "dev": true + } } }, "http-errors": { @@ -3191,17 +3310,6 @@ "@apollo/client": "^3.1.5", "@babel/runtime": "^7.11.2", "extract-files": "^9.0.0" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.0.tgz", - "integrity": "sha512-lS4QLXQ2Vbw2ubfQjeQcn+BZgZ5+ROHW9f+DWjEp5Y+NHYmkRGKqHSJ1tuhbUauKu2nhZNTBIvsIQ8dXfY5Gjw==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.4" - } - } } }, "apollo-utilities": { @@ -3401,9 +3509,9 @@ }, "dependencies": { "tslib": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", - "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", "dev": true } } @@ -4250,13 +4358,21 @@ "dev": true }, "camel-case": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz", - "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", "dev": true, "requires": { - "pascal-case": "^3.1.1", - "tslib": "^1.10.0" + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "camelcase": { @@ -5311,9 +5427,9 @@ "dev": true }, "denque": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", - "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz", + "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==", "dev": true }, "depd": { @@ -7223,6 +7339,14 @@ "zen-observable": "^0.7.1" }, "dependencies": { + "codemirror-graphql": { + "version": "github:timsuchanek/codemirror-graphql#801ec32683c38d6dc0f8f7bc19014a111edc9ebd", + "from": "github:timsuchanek/codemirror-graphql#details-fix", + "requires": { + "graphql-language-service-interface": "^1.0.18", + "graphql-language-service-parser": "^1.0.18" + } + }, "graphql": { "version": "0.11.7", "resolved": "https://registry.npmjs.org/graphql/-/graphql-0.11.7.tgz", @@ -7733,18 +7857,18 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -7868,9 +7992,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "inquirer": { "version": "7.3.3", @@ -9028,9 +9152,9 @@ }, "dependencies": { "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "semver": { @@ -9394,9 +9518,9 @@ }, "dependencies": { "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -9432,12 +9556,20 @@ } }, "lower-case": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", - "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", "dev": true, "requires": { - "tslib": "^1.10.0" + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "lowercase-keys": { @@ -10043,13 +10175,21 @@ "dev": true }, "no-case": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", - "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", "dev": true, "requires": { - "lower-case": "^2.0.1", - "tslib": "^1.10.0" + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "node-fetch": { @@ -10467,9 +10607,9 @@ } }, "object-hash": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz", - "integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz", + "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", "dev": true }, "object-inspect": { @@ -10694,9 +10834,9 @@ "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==" }, "optimism": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.13.0.tgz", - "integrity": "sha512-6JAh3dH+YUE4QUdsgUw8nUQyrNeBKfAEKOHMlLkQ168KhIYFIxzPsHakWrRXDnTO+x61RJrS3/2uEt6W0xlocA==", + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.13.2.tgz", + "integrity": "sha512-kJkpDUEs/Rp8HsAYYlDzyvQHlT6YZa95P+2GGNR8p/VvsIkt6NilAk7oeTvMRKCq7BeclB7+bmdIexog2859GQ==", "dev": true, "requires": { "@wry/context": "^0.5.2" @@ -10849,9 +10989,9 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -10868,9 +11008,9 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -11020,14 +11160,14 @@ "requires": { "@apollographql/graphql-playground-html": "1.6.26", "@graphql-tools/links": "^6.2.4", - "@graphql-tools/stitch": "6.2.4", + "@graphql-tools/stitch": "6.2.3", "@graphql-tools/utils": "6.2.3", "@node-rs/bcrypt": "0.4.1", "@parse/fs-files-adapter": "1.0.1", - "@parse/push-adapter": "3.4.0", - "@parse/s3-files-adapter": "1.6.0", + "@parse/push-adapter": "3.3.0", + "@parse/s3-files-adapter": "1.5.0", "@parse/simple-mailgun-adapter": "1.1.0", - "apollo-server-express": "2.18.1", + "apollo-server-express": "2.17.0", "bcryptjs": "2.4.3", "body-parser": "1.19.0", "commander": "5.1.0", @@ -11041,7 +11181,7 @@ "graphql-upload": "11.0.0", "intersect": "1.0.1", "jsonwebtoken": "8.5.1", - "jwks-rsa": "1.10.1", + "jwks-rsa": "1.10.0", "ldapjs": "2.2.0", "lodash": "4.17.20", "lru-cache": "5.1.1", @@ -11173,13 +11313,21 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, "pascal-case": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz", - "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", "dev": true, "requires": { - "no-case": "^3.0.3", - "tslib": "^1.10.0" + "no-case": "^3.0.4", + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "pascalcase": { @@ -11351,9 +11499,9 @@ "dev": true }, "pg-pool": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz", - "integrity": "sha512-BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz", + "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==", "dev": true }, "pg-promise": { @@ -11369,9 +11517,9 @@ } }, "pg-protocol": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.3.0.tgz", - "integrity": "sha512-64/bYByMrhWULUaCd+6/72c9PMWhiVFs3EVxl9Ct6a3v/U8+rKgqP2w+kKg/BIGgMJyB+Bk/eNivT32Al+Jghw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz", + "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==", "dev": true }, "pg-types": { @@ -11388,12 +11536,12 @@ } }, "pgpass": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz", - "integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz", + "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==", "dev": true, "requires": { - "split": "^1.0.0" + "split2": "^3.1.1" } }, "picomatch": { @@ -11767,18 +11915,18 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -13778,15 +13926,6 @@ "integrity": "sha512-ZNCrOso+oNv5P01HCO4wuxV9Og5rS6ms7gGAqugfBPjx1QwfNXJI3T02ldfaap1O0dlT1sB0Rk+mhDqxt3Z27w==", "dev": true }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dev": true, - "requires": { - "through": "2" - } - }, "split-on-first": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", @@ -13801,6 +13940,28 @@ "extend-shallow": "^3.0.0" } }, + "split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "dev": true, + "requires": { + "readable-stream": "^3.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -14343,31 +14504,6 @@ } } }, - "terser": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.5.tgz", - "integrity": "sha512-Qw3CZAMmmfU824AoGKalx+riwocSI5Cs0PoGp9RdSLfmxkmJgyBxqLBP/isDNtFyhHnitikvRMZzyVgeq+U+Tg==", - "dev": true, - "requires": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, "terser-webpack-plugin": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", From 5a3140708a7a3b1ce887cbb92faad43e9ed79392 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 19 Jan 2021 08:27:55 +0200 Subject: [PATCH 006/141] feat: upgrade react-ace from 8.0.0 to 9.2.1 (#1642) Snyk has created this PR to upgrade react-ace from 8.0.0 to 9.2.1. See this package in npm: https://www.npmjs.com/package/react-ace See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index eab33fcc5..fbc9a81a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12195,9 +12195,9 @@ } }, "react-ace": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-8.0.0.tgz", - "integrity": "sha512-EvU14vXbZpAenb1ZVKdn8yTQs/shZ9RghFulHtt67bBXT6sjrNHcfOEXHYtSEmwMb6pQVVNNuulzzd8o+Uouig==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.2.1.tgz", + "integrity": "sha512-2arIeMER/W6/h+QGHs0YJ0pEJo5AmBOUs/R72Poa6eXSOSTpJPp/WkwD/KE7BgNy9vZ7YjlbqA+2ZcoVf6AjsQ==", "requires": { "ace-builds": "^1.4.6", "diff-match-patch": "^1.0.4", diff --git a/package.json b/package.json index 85c6a1a63..38fdb8b08 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "prop-types": "15.7.2", "query-string": "6.13.7", "react": "16.14.0", - "react-ace": "8.0.0", + "react-ace": "9.2.1", "react-dnd": "10.0.2", "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", From c3e5f3e5657f6d57812a4fdfcbeb6e797c693a4c Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Mon, 25 Jan 2021 12:54:06 -0800 Subject: [PATCH 007/141] fix: upgrade query-string from 6.13.7 to 6.13.8 (#1647) Snyk has created this PR to upgrade query-string from 6.13.7 to 6.13.8. See this package in npm: https://www.npmjs.com/package/query-string See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbc9a81a3..871fa1760 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12105,9 +12105,9 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { - "version": "6.13.7", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.7.tgz", - "integrity": "sha512-CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA==", + "version": "6.13.8", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.8.tgz", + "integrity": "sha512-jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg==", "requires": { "decode-uri-component": "^0.2.0", "split-on-first": "^1.0.0", diff --git a/package.json b/package.json index 38fdb8b08..c4ea12ef3 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "passport-local": "1.0.0", "prismjs": "1.22.0", "prop-types": "15.7.2", - "query-string": "6.13.7", + "query-string": "6.13.8", "react": "16.14.0", "react-ace": "9.2.1", "react-dnd": "10.0.2", From ed81576f6e26933cc83f883b03d9a110e6535c6c Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Mon, 25 Jan 2021 12:54:33 -0800 Subject: [PATCH 008/141] fix: upgrade prismjs from 1.22.0 to 1.23.0 (#1646) Snyk has created this PR to upgrade prismjs from 1.22.0 to 1.23.0. See this package in npm: https://www.npmjs.com/package/prismjs See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 871fa1760..26b301c98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11799,9 +11799,9 @@ } }, "prismjs": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", - "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz", + "integrity": "sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==", "requires": { "clipboard": "^2.0.0" } diff --git a/package.json b/package.json index c4ea12ef3..a2562f977 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "parse": "2.19.0", "passport": "0.4.1", "passport-local": "1.0.0", - "prismjs": "1.22.0", + "prismjs": "1.23.0", "prop-types": "15.7.2", "query-string": "6.13.8", "react": "16.14.0", From 3b52e614655ebfdb62404ef61d2f4ed15e50a91d Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Sun, 7 Feb 2021 19:47:27 -0800 Subject: [PATCH 009/141] fix: upgrade react-json-view from 1.19.1 to 1.20.0 (#1651) Snyk has created this PR to upgrade react-json-view from 1.19.1 to 1.20.0. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26b301c98..8279eca19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12320,9 +12320,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.19.1.tgz", - "integrity": "sha512-u5e0XDLIs9Rj43vWkKvwL8G3JzvXSl6etuS5G42a8klMohZuYFQzSN6ri+/GiBptDqlrXPTdExJVU7x9rrlXhg==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.0.tgz", + "integrity": "sha512-H5S+sZMZ57bUY+ub9OZ+yrJ0fsyRblIPKn0LCdaBIB67FvxGZ9W0I1lJgBEUDmH094qpqxAIl6pLn6J58ZMkdA==", "requires": { "flux": "^3.1.3", "react-base16-styling": "^0.6.0", diff --git a/package.json b/package.json index a2562f977..a7fe163da 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.19.1", + "react-json-view": "1.20.0", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From 0d1595b424f110ac01036c14b981cb281ea10b31 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Tue, 9 Feb 2021 17:09:01 -0600 Subject: [PATCH 010/141] fix: upgrade react-json-view from 1.20.0 to 1.20.2 (#1652) Snyk has created this PR to upgrade react-json-view from 1.20.0 to 1.20.2. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 89 ++++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 77 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8279eca19..34e167449 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6533,11 +6533,40 @@ } }, "fbemitter": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz", - "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz", + "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==", "requires": { - "fbjs": "^0.8.4" + "fbjs": "^3.0.0" + }, + "dependencies": { + "cross-fetch": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", + "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "requires": { + "node-fetch": "2.6.1" + } + }, + "fbjs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz", + "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==", + "requires": { + "cross-fetch": "^3.0.4", + "fbjs-css-vars": "^1.0.0", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + } } }, "fbjs": { @@ -6561,6 +6590,11 @@ } } }, + "fbjs-css-vars": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + }, "fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", @@ -6740,12 +6774,41 @@ } }, "flux": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/flux/-/flux-3.1.3.tgz", - "integrity": "sha1-0jvtUVp5oi2TOrU6tK2hnQWy8Io=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flux/-/flux-4.0.1.tgz", + "integrity": "sha512-emk4RCvJ8RzNP2lNpphKnG7r18q8elDYNAPx7xn+bDeOIo9FFfxEfIQ2y6YbQNmnsGD3nH1noxtLE64Puz1bRQ==", "requires": { - "fbemitter": "^2.0.0", - "fbjs": "^0.8.0" + "fbemitter": "^3.0.0", + "fbjs": "^3.0.0" + }, + "dependencies": { + "cross-fetch": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", + "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "requires": { + "node-fetch": "2.6.1" + } + }, + "fbjs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz", + "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==", + "requires": { + "cross-fetch": "^3.0.4", + "fbjs-css-vars": "^1.0.0", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + } } }, "fn.name": { @@ -12320,11 +12383,11 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.0.tgz", - "integrity": "sha512-H5S+sZMZ57bUY+ub9OZ+yrJ0fsyRblIPKn0LCdaBIB67FvxGZ9W0I1lJgBEUDmH094qpqxAIl6pLn6J58ZMkdA==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.2.tgz", + "integrity": "sha512-DOGrMqhDHrvBwzwiIU/LKpZ7CFrOHrjoQ+e+d1aOJHn82t++PKuB4atiNR1Ko8UBEoGrMv44RagRSyYWTsEHKg==", "requires": { - "flux": "^3.1.3", + "flux": "^4.0.1", "react-base16-styling": "^0.6.0", "react-lifecycles-compat": "^3.0.4", "react-textarea-autosize": "^6.1.0" diff --git a/package.json b/package.json index a7fe163da..4358dde25 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.20.0", + "react-json-view": "1.20.2", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From 1c06a993f0b278f44f72aa52b761e8afc2242e89 Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Tue, 16 Feb 2021 20:03:09 -0800 Subject: [PATCH 011/141] fix: upgrade react-json-view from 1.20.2 to 1.20.4 (#1655) Snyk has created this PR to upgrade react-json-view from 1.20.2 to 1.20.4. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34e167449..0932f162f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12383,9 +12383,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.2.tgz", - "integrity": "sha512-DOGrMqhDHrvBwzwiIU/LKpZ7CFrOHrjoQ+e+d1aOJHn82t++PKuB4atiNR1Ko8UBEoGrMv44RagRSyYWTsEHKg==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.4.tgz", + "integrity": "sha512-QBhb1STnWif+wY8Bsl+ISyDnKTocN/37gSauq8MNHjvu7UOLmdTAgynnC5/rrPh1sAdakg7oIhxU0l660xQg+Q==", "requires": { "flux": "^4.0.1", "react-base16-styling": "^0.6.0", diff --git a/package.json b/package.json index 4358dde25..9b483b572 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.20.2", + "react-json-view": "1.20.4", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From a3697c9d41fbed514fbac14727561345f16aa958 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Mon, 22 Feb 2021 22:42:50 +0000 Subject: [PATCH 012/141] fix: upgrade react-ace from 9.2.1 to 9.3.0 (#1659) Snyk has created this PR to upgrade react-ace from 9.2.1 to 9.3.0. See this package in npm: https://www.npmjs.com/package/react-ace See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0932f162f..ec5d4c92f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12258,9 +12258,9 @@ } }, "react-ace": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.2.1.tgz", - "integrity": "sha512-2arIeMER/W6/h+QGHs0YJ0pEJo5AmBOUs/R72Poa6eXSOSTpJPp/WkwD/KE7BgNy9vZ7YjlbqA+2ZcoVf6AjsQ==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.3.0.tgz", + "integrity": "sha512-RWPDwVobLvyD0wDoHHQqEnn9pNQBhMnmo6LmRACkaXxAg3UQZpse6x9JFLC5EXyWby+P3uolIlQPct4NFEBPNg==", "requires": { "ace-builds": "^1.4.6", "diff-match-patch": "^1.0.4", diff --git a/package.json b/package.json index 9b483b572..91382f6ad 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "prop-types": "15.7.2", "query-string": "6.13.8", "react": "16.14.0", - "react-ace": "9.2.1", + "react-ace": "9.3.0", "react-dnd": "10.0.2", "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", From 088f8f022b26ef7e72144944ecb8e876c43a4684 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Thu, 25 Feb 2021 00:54:44 +0000 Subject: [PATCH 013/141] fix: upgrade react-json-view from 1.20.4 to 1.20.5 (#1660) Snyk has created this PR to upgrade react-json-view from 1.20.4 to 1.20.5. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec5d4c92f..a875842d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12383,9 +12383,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.4.tgz", - "integrity": "sha512-QBhb1STnWif+wY8Bsl+ISyDnKTocN/37gSauq8MNHjvu7UOLmdTAgynnC5/rrPh1sAdakg7oIhxU0l660xQg+Q==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.5.tgz", + "integrity": "sha512-3C3H8iwEn6DGj8hjt2XwGtltYGL6lpqFJBLs438JtQ7FXduvIDmacbYUUgbemNkLx/et9xYxwdnOi7zH/wiHag==", "requires": { "flux": "^4.0.1", "react-base16-styling": "^0.6.0", diff --git a/package.json b/package.json index 91382f6ad..faaff422d 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.20.4", + "react-json-view": "1.20.5", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From acecdebb4a74f561185bb19822dbfb8035f654fa Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Thu, 25 Feb 2021 00:55:02 +0000 Subject: [PATCH 014/141] fix: upgrade @babel/runtime from 7.12.5 to 7.12.13 (#1661) Snyk has created this PR to upgrade @babel/runtime from 7.12.5 to 7.12.13. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 14 +++++++++++--- package.json | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a875842d2..1c7797247 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1156,9 +1156,9 @@ } }, "@babel/runtime": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", - "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz", + "integrity": "sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11166,6 +11166,14 @@ "xmlhttprequest": "1.8.0" }, "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, "@babel/runtime-corejs3": { "version": "7.12.5", "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz", diff --git a/package.json b/package.json index faaff422d..a69f25127 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.12.5", + "@babel/runtime": "7.12.13", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From 281edbe32d78e68110a67d91d878ff5c8552d874 Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Fri, 26 Feb 2021 14:25:21 -0800 Subject: [PATCH 015/141] fix: upgrade react-json-view from 1.20.5 to 1.21.0 (#1662) Snyk has created this PR to upgrade react-json-view from 1.20.5 to 1.21.0. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c7797247..0a14c0f6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12391,9 +12391,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.20.5.tgz", - "integrity": "sha512-3C3H8iwEn6DGj8hjt2XwGtltYGL6lpqFJBLs438JtQ7FXduvIDmacbYUUgbemNkLx/et9xYxwdnOi7zH/wiHag==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.0.tgz", + "integrity": "sha512-qdN4XepZhjjgIDVsLE2d78u7gcqcq4lQV5puoDGo+js+SBMahkVXc+xI/GhLC0/SwYHwiiQXg8LQXfvBTryQlQ==", "requires": { "flux": "^4.0.1", "react-base16-styling": "^0.6.0", diff --git a/package.json b/package.json index a69f25127..fa12d574f 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.20.5", + "react-json-view": "1.21.0", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From 1f72884b0d7c225de30191ae9889f619edea9ecf Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Mon, 1 Mar 2021 07:03:45 +0000 Subject: [PATCH 016/141] fix: upgrade react-json-view from 1.21.0 to 1.21.1 (#1663) Snyk has created this PR to upgrade react-json-view from 1.21.0 to 1.21.1. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a14c0f6c..dfc6bd106 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12391,9 +12391,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.0.tgz", - "integrity": "sha512-qdN4XepZhjjgIDVsLE2d78u7gcqcq4lQV5puoDGo+js+SBMahkVXc+xI/GhLC0/SwYHwiiQXg8LQXfvBTryQlQ==", + "version": "1.21.1", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.1.tgz", + "integrity": "sha512-AonvGea4nWlsnNXCbnSdUHsetyNS8rUMhbFHS9eFaDB1oeaxgHcVsqo5LhGRMvWybfDdjVUo0xzDoMQP7jbrXw==", "requires": { "flux": "^4.0.1", "react-base16-styling": "^0.6.0", diff --git a/package.json b/package.json index fa12d574f..eed7e3fb4 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.21.0", + "react-json-view": "1.21.1", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From c374e0cef2b7abda81cf3e07aaca2ac220674925 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Wed, 3 Mar 2021 22:21:19 +0000 Subject: [PATCH 017/141] fix: upgrade query-string from 6.13.8 to 6.14.0 (#1664) Snyk has created this PR to upgrade query-string from 6.13.8 to 6.14.0. See this package in npm: https://www.npmjs.com/package/query-string See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 12 +++++++++--- package.json | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfc6bd106..4111b54e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6700,6 +6700,11 @@ } } }, + "filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=" + }, "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -12176,11 +12181,12 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { - "version": "6.13.8", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.8.tgz", - "integrity": "sha512-jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz", + "integrity": "sha512-In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ==", "requires": { "decode-uri-component": "^0.2.0", + "filter-obj": "^1.1.0", "split-on-first": "^1.0.0", "strict-uri-encode": "^2.0.0" }, diff --git a/package.json b/package.json index eed7e3fb4..302c848b9 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "passport-local": "1.0.0", "prismjs": "1.23.0", "prop-types": "15.7.2", - "query-string": "6.13.8", + "query-string": "6.14.0", "react": "16.14.0", "react-ace": "9.3.0", "react-dnd": "10.0.2", From 421a4bf0a63245fb29b64111ff7c4ec3d716ce62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Mar 2021 22:04:14 -0800 Subject: [PATCH 018/141] chore(deps): bump elliptic from 6.5.3 to 6.5.4 (#1666) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 618 +++++++++++++++++++++------------------------- 1 file changed, 288 insertions(+), 330 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4111b54e1..0db458a9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@apollo/client": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.6.tgz", - "integrity": "sha512-XSm/STyNS8aHdDigLLACKNMHwI0qaQmEHWHtTP+jHe/E1wZRnn66VZMMgwKLy2V4uHISHfmiZ4KpUKDPeJAKqg==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.11.tgz", + "integrity": "sha512-54+D5FB6RJlQ+g37f432gaexnyvDsG5X6L9VO5kqN54HJlbF8hCf/8CXtAQEHCWodAwZhy6kOLp2RM96829q3A==", "dev": true, "requires": { "@graphql-typed-document-node/core": "^3.0.0", @@ -15,9 +15,9 @@ "@wry/context": "^0.5.2", "@wry/equality": "^0.3.0", "fast-json-stable-stringify": "^2.0.0", - "graphql-tag": "^2.11.0", + "graphql-tag": "^2.12.0", "hoist-non-react-statics": "^3.3.2", - "optimism": "^0.13.1", + "optimism": "^0.14.0", "prop-types": "^15.7.2", "symbol-observable": "^2.0.0", "ts-invariant": "^0.6.0", @@ -26,9 +26,9 @@ }, "dependencies": { "@wry/equality": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.1.tgz", - "integrity": "sha512-8/Ftr3jUZ4EXhACfSwPIfNsE8V6WKesdjp+Dxi78Bej6qlasAxiz0/F8j0miACRj9CL4vC5Y5FsfwwEYAuhWbg==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.4.tgz", + "integrity": "sha512-1gQQhCPenzxw/1HzLlvSIs/59eBHJf9ZDIussjjZhqNSqQuPKQIzN6SWt4kemvlBPDi7RqMuUa03pId7MAE93g==", "dev": true, "requires": { "tslib": "^1.14.1" @@ -41,9 +41,9 @@ "dev": true }, "ts-invariant": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.0.tgz", - "integrity": "sha512-caoafsfgb8QxdrKzFfjKt627m4i8KTtfAiji0DYJfWI4A/S9ORNNpzYuD9br64kyKFgxn9UNaLLbSupam84mCA==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.1.tgz", + "integrity": "sha512-QQgN33g8E8yrdDuH29HASveLtbzMnRRgWh0i/JNTW4+zcLsdIOnfsgEDi/NKx4UckQyuMFt9Ujm6TWLWQ58Kvg==", "dev": true, "requires": { "@types/ungap__global-this": "^0.3.1", @@ -81,20 +81,20 @@ }, "dependencies": { "@types/node": { - "version": "10.17.39", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.39.tgz", - "integrity": "sha512-dJLCxrpQmgyxYGcl0Ae9MTsQgI22qHHcGFj/8VKu7McJA5zQpnuGjoksnxbo1JxSjW/Nahnl13W8MYZf01CZHA==", + "version": "10.17.55", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.55.tgz", + "integrity": "sha512-koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg==", "dev": true } } }, "@apollographql/apollo-tools": { - "version": "0.4.8", - "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz", - "integrity": "sha512-W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA==", + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.9.tgz", + "integrity": "sha512-M50pk8oo3CGTu4waGOklIX3YtTZoPfWG9K/G9WB8NpyQGA1OwYTiBFv94XqUtKElTDoFwoMXpMQd3Wy5dINvxA==", "dev": true, "requires": { - "apollo-env": "^0.6.5" + "apollo-env": "^0.6.6" } }, "@apollographql/graphql-playground-html": { @@ -106,6 +106,48 @@ "xss": "^1.0.6" } }, + "@apollographql/graphql-upload-8-fork": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz", + "integrity": "sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g==", + "dev": true, + "requires": { + "@types/express": "*", + "@types/fs-capacitor": "*", + "@types/koa": "*", + "busboy": "^0.3.1", + "fs-capacitor": "^2.0.4", + "http-errors": "^1.7.3", + "object-path": "^0.11.4" + }, + "dependencies": { + "http-errors": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz", + "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==", + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true + } + } + }, "@ardatan/aggregate-error": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz", @@ -1320,9 +1362,9 @@ }, "dependencies": { "@graphql-tools/utils": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.4.tgz", - "integrity": "sha512-EDSb98dTWX8FngvayWejip1DutOl0wGtNbXC7a3CZf5fiJS7bGHQ/8cSlMhe9XaHwpLJCbAk/Ijnp/dYbXk33w==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.5.0.tgz", + "integrity": "sha512-8f//RSqHmKRdg9A3GHlZdxzlVfF/938ZD9edXLW7EriSABg1BXu3veru9W02VqORypArb2S/Tyeyvsk2gForqA==", "dev": true, "requires": { "@ardatan/aggregate-error": "0.0.6", @@ -1769,60 +1811,6 @@ "lodash.once": "^4.0.0", "ms": "^2.0.0", "xtend": "^4.0.1" - }, - "dependencies": { - "jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, - "requires": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=", - "dev": true - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=", - "dev": true - }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=", - "dev": true - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", - "dev": true - } } } } @@ -1839,18 +1827,18 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "punycode": { @@ -2203,9 +2191,9 @@ } }, "@types/connect": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", - "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "version": "3.4.34", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz", + "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==", "dev": true, "requires": { "@types/node": "*" @@ -2218,9 +2206,9 @@ "dev": true }, "@types/cookies": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz", - "integrity": "sha512-oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==", + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.6.tgz", + "integrity": "sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w==", "dev": true, "requires": { "@types/connect": "*", @@ -2230,13 +2218,10 @@ } }, "@types/cors": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz", - "integrity": "sha512-fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w==", - "dev": true, - "requires": { - "@types/express": "*" - } + "version": "2.8.10", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", + "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==", + "dev": true }, "@types/express": { "version": "4.17.7", @@ -2261,9 +2246,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz", - "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==", + "version": "4.17.18", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz", + "integrity": "sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==", "dev": true, "requires": { "@types/node": "*", @@ -2289,26 +2274,6 @@ "@types/node": "*" } }, - "@types/graphql-upload": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.4.tgz", - "integrity": "sha512-0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q==", - "dev": true, - "requires": { - "@types/express": "*", - "@types/fs-capacitor": "*", - "@types/koa": "*", - "graphql": "^15.3.0" - }, - "dependencies": { - "graphql": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.3.0.tgz", - "integrity": "sha512-GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==", - "dev": true - } - } - }, "@types/hoist-non-react-statics": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", @@ -2368,9 +2333,9 @@ "dev": true }, "@types/koa": { - "version": "2.11.5", - "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.5.tgz", - "integrity": "sha512-egP+ceD3+v9PnFW+DLTFO8mt6wa5sDqfGOBIwOAZ61Wzsq4bGZc5kMpJgcCwq7ARGIBfHBY+KkK/1RsMftV/qQ==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.13.1.tgz", + "integrity": "sha512-Qbno7FWom9nNqu0yHZ6A0+RWt4mrYBhw3wpBAQ3+IuzGcLlfeYkzZrnMq5wsxulN2np8M4KKeUpTodsOsSad5Q==", "dev": true, "requires": { "@types/accepts": "*", @@ -2404,9 +2369,9 @@ "integrity": "sha512-ve2IoUJClE+4S/sG2zoLGEHP6DCvqgyz7UkHZdiICdQaAYRaCXsRWfJlbL8B0KvUyo9lgzD+oR0YSy4YikFyFQ==" }, "@types/mime": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, "@types/mime-types": { @@ -2432,9 +2397,9 @@ }, "dependencies": { "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "requires": { "asynckit": "^0.4.0", @@ -2450,9 +2415,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "@types/qs": { - "version": "6.9.5", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz", - "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==", + "version": "6.9.6", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz", + "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==", "dev": true }, "@types/range-parser": { @@ -2471,13 +2436,13 @@ } }, "@types/serve-static": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", - "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "version": "1.13.9", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz", + "integrity": "sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==", "dev": true, "requires": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" + "@types/mime": "^1", + "@types/node": "*" } }, "@types/stack-utils": { @@ -2493,9 +2458,9 @@ "dev": true }, "@types/ws": { - "version": "7.2.7", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.7.tgz", - "integrity": "sha512-UUFC/xxqFLP17hTva8/lVT0SybLUrfSD9c+iapKb0fEiC8uoDbA+xuZ3pAN603eW+bY8ebSMLm9jXdIPnD0ZgA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz", + "integrity": "sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==", "dev": true, "requires": { "@types/node": "*" @@ -2588,9 +2553,9 @@ } }, "@ungap/global-this": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.3.tgz", - "integrity": "sha512-MuHEpDBurNVeD6mV9xBcAN2wfTwuaFQhHuhWkJuXmyVJ5P5sBCw+nnFpdfb0tAvgWkfefWCsAoAsh7MTUr3LPg==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.4.tgz", + "integrity": "sha512-mHkm6FvepJECMNthFuIgpAEFmPOk71UyXuIxYfjytvFTnSDBIz7jmViO+LfHI/AjrazWije0PnSP3+/NlwzqtA==", "dev": true }, "@webassemblyjs/ast": { @@ -2769,9 +2734,9 @@ } }, "@wry/context": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.3.tgz", - "integrity": "sha512-n0uKHiWpf2ArHhmcHcUsKA+Dj0gtye/h56VmsDcoMRuK/ZPFeHKi8ck5L/ftqtF12ZbQR9l8xMPV7y+xybaRDA==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.4.tgz", + "integrity": "sha512-/pktJKHUXDr4D6TJqWgudOPJW2Z+Nb+bqk40jufA3uTkLbnCRKdJPiYDIa/c7mfcPH8Hr6O8zjCERpg5Sq04Zg==", "dev": true, "requires": { "tslib": "^1.14.1" @@ -2785,6 +2750,15 @@ "tslib": "^1.9.3" } }, + "@wry/trie": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.2.2.tgz", + "integrity": "sha512-OxqBB39x6MfHaa2HpMiRMfhuUnQTddD32Ko020eBeJXq87ivX6xnSSnzKHVbA21p7iqBASz8n/07b6W5wW1BVQ==", + "dev": true, + "requires": { + "tslib": "^1.14.1" + } + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -2955,23 +2929,23 @@ } }, "apollo-cache-control": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.3.tgz", - "integrity": "sha512-21GCeC9AIIa22uD0Vtqn/N0D5kOB4rY/Pa9aQhxVeLN+4f8Eu4nmteXhFypUD0LL1/58dmm8lS5embsfoIGjEA==", + "version": "0.11.6", + "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz", + "integrity": "sha512-YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw==", "dev": true, "requires": { - "apollo-server-env": "^2.4.5", - "apollo-server-plugin-base": "^0.10.1" + "apollo-server-env": "^3.0.0", + "apollo-server-plugin-base": "^0.10.4" } }, "apollo-datasource": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz", - "integrity": "sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz", + "integrity": "sha512-PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA==", "dev": true, "requires": { - "apollo-server-caching": "^0.5.2", - "apollo-server-env": "^2.4.5" + "apollo-server-caching": "^0.5.3", + "apollo-server-env": "^3.0.0" } }, "apollo-engine-reporting-protobuf": { @@ -2984,9 +2958,9 @@ } }, "apollo-env": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz", - "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.6.tgz", + "integrity": "sha512-hXI9PjJtzmD34XviBU+4sPMOxnifYrHVmxpjykqI/dUD2G3yTiuRaiQqwRwB2RCdwC1Ug/jBfoQ/NHDTnnjndQ==", "dev": true, "requires": { "@types/node-fetch": "2.5.7", @@ -3004,12 +2978,12 @@ } }, "apollo-graphql": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz", - "integrity": "sha512-BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.1.tgz", + "integrity": "sha512-ZRXAV+k+hboCVS+FW86FW/QgnDR7gm/xMUwJPGXEbV53OLGuQQdIT0NCYK7AzzVkCfsbb7NJ3mmEclkZY9uuxQ==", "dev": true, "requires": { - "apollo-env": "^0.6.5", + "apollo-env": "^0.6.6", "lodash.sortby": "^4.7.0" } }, @@ -3053,152 +3027,106 @@ } }, "apollo-reporting-protobuf": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.0.tgz", - "integrity": "sha512-AFLQIuO0QhkoCF+41Be/B/YU0C33BZ0opfyXorIjM3MNNiEDSyjZqmUozlB3LqgfhT9mn2IR5RSsA+1b4VovDQ==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz", + "integrity": "sha512-WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw==", "dev": true, "requires": { "@apollo/protobufjs": "^1.0.3" } }, "apollo-server-caching": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz", - "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz", + "integrity": "sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==", "dev": true, "requires": { - "lru-cache": "^5.0.0" + "lru-cache": "^6.0.0" }, "dependencies": { "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } } }, "apollo-server-core": { - "version": "2.18.2", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.18.2.tgz", - "integrity": "sha512-phz57BFBukMa3Ta7ZVW7pj1pdUne9KYLbcBdEcITr+I0+nbhy+YM8gcgpOnjrokWYiEZgIe52XeM3m4BMLw5dg==", + "version": "2.21.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.1.tgz", + "integrity": "sha512-aI+soLaqKMkWxH6l9xvPP1fCuZgD053SK09D79LQfMbJAHHvs3MI90UpydiY/W61K5l8ELl0YsKdqkQg8262nw==", "dev": true, "requires": { "@apollographql/apollo-tools": "^0.4.3", - "@apollographql/graphql-playground-html": "1.6.26", - "@types/graphql-upload": "^8.0.0", + "@apollographql/graphql-playground-html": "1.6.27", + "@apollographql/graphql-upload-8-fork": "^8.1.3", "@types/ws": "^7.0.0", - "apollo-cache-control": "^0.11.3", - "apollo-datasource": "^0.7.2", + "apollo-cache-control": "^0.11.6", + "apollo-datasource": "^0.7.3", "apollo-graphql": "^0.6.0", - "apollo-reporting-protobuf": "^0.6.0", - "apollo-server-caching": "^0.5.2", - "apollo-server-env": "^2.4.5", + "apollo-reporting-protobuf": "^0.6.2", + "apollo-server-caching": "^0.5.3", + "apollo-server-env": "^3.0.0", "apollo-server-errors": "^2.4.2", - "apollo-server-plugin-base": "^0.10.1", - "apollo-server-types": "^0.6.0", - "apollo-tracing": "^0.11.4", + "apollo-server-plugin-base": "^0.10.4", + "apollo-server-types": "^0.6.3", + "apollo-tracing": "^0.12.2", "async-retry": "^1.2.1", "fast-json-stable-stringify": "^2.0.0", - "graphql-extensions": "^0.12.5", - "graphql-tag": "^2.9.2", - "graphql-tools": "^4.0.0", - "graphql-upload": "^8.0.2", + "graphql-extensions": "^0.12.8", + "graphql-tag": "^2.11.0", + "graphql-tools": "^4.0.8", "loglevel": "^1.6.7", - "lru-cache": "^5.0.0", + "lru-cache": "^6.0.0", "sha.js": "^2.4.11", "subscriptions-transport-ws": "^0.9.11", "uuid": "^8.0.0", "ws": "^6.0.0" }, "dependencies": { - "apollo-server-types": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz", - "integrity": "sha512-usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA==", - "dev": true, - "requires": { - "apollo-reporting-protobuf": "^0.6.0", - "apollo-server-caching": "^0.5.2", - "apollo-server-env": "^2.4.5" - } - }, - "graphql-upload": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/graphql-upload/-/graphql-upload-8.1.0.tgz", - "integrity": "sha512-U2OiDI5VxYmzRKw0Z2dmfk0zkqMRaecH9Smh1U277gVgVe9Qn+18xqf4skwr4YJszGIh7iQDZ57+5ygOK9sM/Q==", + "@apollographql/graphql-playground-html": { + "version": "1.6.27", + "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz", + "integrity": "sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw==", "dev": true, "requires": { - "busboy": "^0.3.1", - "fs-capacitor": "^2.0.4", - "http-errors": "^1.7.3", - "object-path": "^0.11.4" - }, - "dependencies": { - "busboy": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz", - "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==", - "dev": true, - "requires": { - "dicer": "0.3.0" - } - }, - "object-path": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz", - "integrity": "sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==", - "dev": true - } + "xss": "^1.0.8" } }, - "http-errors": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz", - "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==", + "apollo-server-types": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", + "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", "dev": true, "requires": { - "depd": "~1.1.2", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "apollo-reporting-protobuf": "^0.6.2", + "apollo-server-caching": "^0.5.3", + "apollo-server-env": "^3.0.0" } }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "^4.0.0" } }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true - }, "uuid": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", - "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true }, "ws": { @@ -3211,17 +3139,17 @@ } }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } } }, "apollo-server-env": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz", - "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.0.0.tgz", + "integrity": "sha512-tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog==", "dev": true, "requires": { "node-fetch": "^2.1.2", @@ -3259,23 +3187,23 @@ } }, "apollo-server-plugin-base": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.1.tgz", - "integrity": "sha512-XChCBDNyfByWqVXptsjPwrwrCj5cxMmNbchZZi8KXjtJ0hN2C/9BMNlInJd6bVGXvUbkRJYUakfKCfO5dZmwIg==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz", + "integrity": "sha512-HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg==", "dev": true, "requires": { - "apollo-server-types": "^0.6.0" + "apollo-server-types": "^0.6.3" }, "dependencies": { "apollo-server-types": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz", - "integrity": "sha512-usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", + "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", "dev": true, "requires": { - "apollo-reporting-protobuf": "^0.6.0", - "apollo-server-caching": "^0.5.2", - "apollo-server-env": "^2.4.5" + "apollo-reporting-protobuf": "^0.6.2", + "apollo-server-caching": "^0.5.3", + "apollo-server-env": "^3.0.0" } } } @@ -3289,16 +3217,28 @@ "apollo-engine-reporting-protobuf": "^0.5.2", "apollo-server-caching": "^0.5.2", "apollo-server-env": "^2.4.5" + }, + "dependencies": { + "apollo-server-env": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz", + "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==", + "dev": true, + "requires": { + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + } } }, "apollo-tracing": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.4.tgz", - "integrity": "sha512-zBu/SwQlXfbdpcKLzWARGVjrEkIZUW3W9Mb4CCIzv07HbBQ8IQpmf9w7HIJJefC7rBiBJYg6JBGyuro3N2lxCA==", + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz", + "integrity": "sha512-SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w==", "dev": true, "requires": { - "apollo-server-env": "^2.4.5", - "apollo-server-plugin-base": "^0.10.1" + "apollo-server-env": "^3.0.0", + "apollo-server-plugin-base": "^0.10.4" } }, "apollo-upload-client": { @@ -4724,9 +4664,9 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", - "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", + "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", "dev": true, "requires": { "color-name": "^1.0.0", @@ -5655,24 +5595,30 @@ "dev": true }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" }, "dependencies": { "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true } } @@ -7277,25 +7223,25 @@ } }, "graphql-extensions": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.5.tgz", - "integrity": "sha512-mGyGaktGpK3TVBtM0ZoyPX6Xk0mN9GYX9DRyFzDU4k4A2w93nLX7Ebcp+9/O5nHRmgrc0WziYYSmoWq2WNIoUQ==", + "version": "0.12.8", + "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz", + "integrity": "sha512-xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg==", "dev": true, "requires": { "@apollographql/apollo-tools": "^0.4.3", - "apollo-server-env": "^2.4.5", - "apollo-server-types": "^0.6.0" + "apollo-server-env": "^3.0.0", + "apollo-server-types": "^0.6.3" }, "dependencies": { "apollo-server-types": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz", - "integrity": "sha512-usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", + "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", "dev": true, "requires": { - "apollo-reporting-protobuf": "^0.6.0", - "apollo-server-caching": "^0.5.2", - "apollo-server-env": "^2.4.5" + "apollo-reporting-protobuf": "^0.6.2", + "apollo-server-caching": "^0.5.3", + "apollo-server-env": "^3.0.0" } } } @@ -7514,19 +7460,22 @@ } }, "graphql-subscriptions": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz", - "integrity": "sha512-6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz", + "integrity": "sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==", "dev": true, "requires": { - "iterall": "^1.2.1" + "iterall": "^1.3.0" } }, "graphql-tag": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz", - "integrity": "sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==", - "dev": true + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.1.tgz", + "integrity": "sha512-LPewEE1vzGkHnCO8zdOGogKsHHBdtpGyihow1UuMwp6RnZa0lAS7NcbvltLOuo4pi5diQCPASAXZkQq44ffixA==", + "dev": true, + "requires": { + "tslib": "^1.14.1" + } }, "graphql-tools": { "version": "4.0.8", @@ -9287,18 +9236,26 @@ }, "dependencies": { "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -9594,9 +9551,9 @@ } }, "loglevel": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", - "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", + "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", "dev": true }, "long": { @@ -9655,9 +9612,9 @@ } }, "lru-memoizer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.2.tgz", - "integrity": "sha512-N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz", + "integrity": "sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==", "dev": true, "requires": { "lodash.clonedeep": "^4.5.0", @@ -10902,12 +10859,13 @@ "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==" }, "optimism": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.13.2.tgz", - "integrity": "sha512-kJkpDUEs/Rp8HsAYYlDzyvQHlT6YZa95P+2GGNR8p/VvsIkt6NilAk7oeTvMRKCq7BeclB7+bmdIexog2859GQ==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.14.0.tgz", + "integrity": "sha512-ygbNt8n4DOCVpkwiLF+IrKKeNHOjtr9aXLWGP9HNJGoblSGsnVbJLstcH6/nE9Xy5ZQtlkSioFQNnthmENW6FQ==", "dev": true, "requires": { - "@wry/context": "^0.5.2" + "@wry/context": "^0.5.2", + "@wry/trie": "^0.2.1" } }, "optimist": { @@ -12642,9 +12600,9 @@ } }, "redis-commands": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz", - "integrity": "sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==", "dev": true }, "redis-errors": { From 35cf0a70e8d47ee8a34cd3774f12751c6136a665 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Fri, 12 Mar 2021 00:40:59 +0000 Subject: [PATCH 019/141] fix: upgrade @babel/runtime from 7.12.13 to 7.12.18 (#1667) Snyk has created this PR to upgrade @babel/runtime from 7.12.13 to 7.12.18. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr Co-authored-by: snyk-bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0db458a9f..f913cf963 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz", - "integrity": "sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==", + "version": "7.12.18", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz", + "integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 302c848b9..3a4002737 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.12.13", + "@babel/runtime": "7.12.18", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From ef5d66da16a7b0de6c6c85779a78132959d3d47b Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 17 Mar 2021 01:34:41 +0200 Subject: [PATCH 020/141] fix: upgrade @babel/runtime from 7.12.18 to 7.13.6 (#1669) Snyk has created this PR to upgrade @babel/runtime from 7.12.18 to 7.13.6. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f913cf963..986ff3600 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.12.18", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz", - "integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==", + "version": "7.13.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.6.tgz", + "integrity": "sha512-Y/DEVhSQ91u27rxq7D0EH/sewS6+x06p/MgO1VppbDHMzYXLZrAR5cFjCom78e9RUw1BQAq6qJg6fXc/ep7glA==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 3a4002737..58bd30e2b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.12.18", + "@babel/runtime": "7.13.6", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From 376e2670a34aeb3840a7e1a04634f7c4c993e440 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Thu, 18 Mar 2021 00:28:40 +0200 Subject: [PATCH 021/141] fix: upgrade @babel/runtime from 7.13.6 to 7.13.7 (#1670) Snyk has created this PR to upgrade @babel/runtime from 7.13.6 to 7.13.7. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 986ff3600..d9c81a816 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.13.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.6.tgz", - "integrity": "sha512-Y/DEVhSQ91u27rxq7D0EH/sewS6+x06p/MgO1VppbDHMzYXLZrAR5cFjCom78e9RUw1BQAq6qJg6fXc/ep7glA==", + "version": "7.13.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.7.tgz", + "integrity": "sha512-h+ilqoX998mRVM5FtB5ijRuHUDVt5l3yfoOi2uh18Z/O3hvyaHQ39NpxVkCIG5yFs+mLq/ewFp8Bss6zmWv6ZA==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 58bd30e2b..a7518d157 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.13.6", + "@babel/runtime": "7.13.7", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From 0c64cfc848afb71ac17b1e98ae95842755f302de Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 23 Mar 2021 01:12:57 +0200 Subject: [PATCH 022/141] fix: upgrade query-string from 6.14.0 to 6.14.1 (#1672) Snyk has created this PR to upgrade query-string from 6.14.0 to 6.14.1. See this package in npm: https://www.npmjs.com/package/query-string See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9c81a816..7549a196e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12139,9 +12139,9 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz", - "integrity": "sha512-In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", + "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==", "requires": { "decode-uri-component": "^0.2.0", "filter-obj": "^1.1.0", diff --git a/package.json b/package.json index a7518d157..77f6473af 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "passport-local": "1.0.0", "prismjs": "1.23.0", "prop-types": "15.7.2", - "query-string": "6.14.0", + "query-string": "6.14.1", "react": "16.14.0", "react-ace": "9.3.0", "react-dnd": "10.0.2", From 5a6af60ed73254c539d3b9184d8b4d5c47138ca2 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 23 Mar 2021 01:26:47 +0200 Subject: [PATCH 023/141] fix: upgrade @babel/runtime from 7.13.7 to 7.13.8 (#1673) Snyk has created this PR to upgrade @babel/runtime from 7.13.7 to 7.13.8. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7549a196e..fa63de938 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.13.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.7.tgz", - "integrity": "sha512-h+ilqoX998mRVM5FtB5ijRuHUDVt5l3yfoOi2uh18Z/O3hvyaHQ39NpxVkCIG5yFs+mLq/ewFp8Bss6zmWv6ZA==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz", + "integrity": "sha512-CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 77f6473af..84b89f81c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.13.7", + "@babel/runtime": "7.13.8", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From eb64b11920588afe83588cd769103b990df3e4c7 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 24 Mar 2021 04:45:58 +0200 Subject: [PATCH 024/141] fix: upgrade @babel/runtime from 7.13.8 to 7.13.9 (#1674) Snyk has created this PR to upgrade @babel/runtime from 7.13.8 to 7.13.9. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa63de938..db4859781 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz", - "integrity": "sha512-CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg==", + "version": "7.13.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz", + "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 84b89f81c..8bb6941ff 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.13.8", + "@babel/runtime": "7.13.9", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From ebe0b21b7cf4eae5338aa2773bc8b3bd50479d63 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 30 Mar 2021 10:01:48 +0300 Subject: [PATCH 025/141] fix: upgrade @babel/runtime from 7.13.9 to 7.13.10 (#1676) Snyk has created this PR to upgrade @babel/runtime from 7.13.9 to 7.13.10. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index db4859781..6de15c3f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@babel/runtime": { - "version": "7.13.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz", - "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==", + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz", + "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 8bb6941ff..ecb0d9eba 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.13.9", + "@babel/runtime": "7.13.10", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From efd24f80d85e4bb47830a89a1a0b097e9d01814b Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Tue, 30 Mar 2021 10:02:18 +0300 Subject: [PATCH 026/141] fix: upgrade react-json-view from 1.21.1 to 1.21.3 (#1675) Snyk has created this PR to upgrade react-json-view from 1.21.1 to 1.21.3. See this package in npm: https://www.npmjs.com/package/react-json-view See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 56 +++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6de15c3f0..73fa6716a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6487,9 +6487,9 @@ }, "dependencies": { "cross-fetch": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", - "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz", + "integrity": "sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==", "requires": { "node-fetch": "2.6.1" } @@ -6734,9 +6734,9 @@ }, "dependencies": { "cross-fetch": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", - "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz", + "integrity": "sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==", "requires": { "node-fetch": "2.6.1" } @@ -12355,14 +12355,14 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-json-view": { - "version": "1.21.1", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.1.tgz", - "integrity": "sha512-AonvGea4nWlsnNXCbnSdUHsetyNS8rUMhbFHS9eFaDB1oeaxgHcVsqo5LhGRMvWybfDdjVUo0xzDoMQP7jbrXw==", + "version": "1.21.3", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz", + "integrity": "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==", "requires": { "flux": "^4.0.1", "react-base16-styling": "^0.6.0", "react-lifecycles-compat": "^3.0.4", - "react-textarea-autosize": "^6.1.0" + "react-textarea-autosize": "^8.3.2" } }, "react-lifecycles-compat": { @@ -12472,11 +12472,13 @@ } }, "react-textarea-autosize": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz", - "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz", + "integrity": "sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==", "requires": { - "prop-types": "^15.6.0" + "@babel/runtime": "^7.10.2", + "use-composed-ref": "^1.0.0", + "use-latest": "^1.0.0" } }, "react-transition-group": { @@ -14818,6 +14820,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-essentials": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-2.0.12.tgz", + "integrity": "sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==" + }, "ts-invariant": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz", @@ -15137,6 +15144,27 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, + "use-composed-ref": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.1.0.tgz", + "integrity": "sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==", + "requires": { + "ts-essentials": "^2.0.3" + } + }, + "use-isomorphic-layout-effect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz", + "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==" + }, + "use-latest": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz", + "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==", + "requires": { + "use-isomorphic-layout-effect": "^1.0.0" + } + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", diff --git a/package.json b/package.json index ecb0d9eba..100d43008 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", "react-helmet": "6.0.0", - "react-json-view": "1.21.1", + "react-json-view": "1.21.3", "react-redux": "5.1.2", "react-router": "5.1.2", "react-router-dom": "5.1.2", From 924b5b7345727a29cfe88e6677eea7924b049ea6 Mon Sep 17 00:00:00 2001 From: Prerna Mehra Date: Sat, 17 Apr 2021 04:41:40 +0530 Subject: [PATCH 027/141] Fix date filters (#1682) * Date pickups not working on filters * catching onClick event,stop propagating to parent --- src/components/BrowserFilter/BrowserFilter.react.js | 2 +- src/components/BrowserFilter/FilterRow.react.js | 8 +++++--- src/components/DateTimeEntry/DateTimeEntry.react.js | 2 +- src/components/DateTimePicker/DateTimePicker.react.js | 2 +- src/components/Popover/Popover.react.js | 6 +++++- src/lib/hasAncestor.js | 4 +++- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/components/BrowserFilter/BrowserFilter.react.js b/src/components/BrowserFilter/BrowserFilter.react.js index af000adb6..945c0f05c 100644 --- a/src/components/BrowserFilter/BrowserFilter.react.js +++ b/src/components/BrowserFilter/BrowserFilter.react.js @@ -110,7 +110,7 @@ export default class BrowserFilter extends React.Component { filters={this.state.filters} onChange={filters => this.setState({ filters: filters })} renderRow={props => ( - 0} /> + 0} parentContentId={POPOVER_CONTENT_ID} /> )} />
diff --git a/src/components/BrowserFilter/FilterRow.react.js b/src/components/BrowserFilter/FilterRow.react.js index 4c8c2c12d..f7c2eb05e 100644 --- a/src/components/BrowserFilter/FilterRow.react.js +++ b/src/components/BrowserFilter/FilterRow.react.js @@ -27,7 +27,7 @@ let setFocus = (input) => { } } -function compareValue(info, value, onChangeCompareTo, active) { +function compareValue(info, value, onChangeCompareTo, active, parentContentId) { switch (info.type) { case null: return null; @@ -70,7 +70,8 @@ function compareValue(info, value, onChangeCompareTo, active) { className={styles.date} value={Parse._decode('date', value)} onChange={(value) => onChangeCompareTo(Parse._encode(value))} - ref={setFocus} /> + ref={setFocus} + parentContentId={parentContentId} /> ); } } @@ -87,6 +88,7 @@ let FilterRow = ({ onChangeCompareTo, onDeleteRow, active, + parentContentId, }) => (
Constraints[c].name)} onChange={(c) => onChangeConstraint(constraintLookup[c])} /> - {compareValue(compareInfo, compareTo, onChangeCompareTo, active)} + {compareValue(compareInfo, compareTo, onChangeCompareTo, active, parentContentId)}
); diff --git a/src/components/DateTimeEntry/DateTimeEntry.react.js b/src/components/DateTimeEntry/DateTimeEntry.react.js index 176155cc4..d1eb69c09 100644 --- a/src/components/DateTimeEntry/DateTimeEntry.react.js +++ b/src/components/DateTimeEntry/DateTimeEntry.react.js @@ -87,7 +87,7 @@ export default class DateTimeEntry extends React.Component { let popover = null; if (this.state.open) { popover = ( - + +
e.stopPropagation()} > { let timeRef = this.props.value || hoursFrom(new Date(), 1); let newDate = this.props.local ? new Date( diff --git a/src/components/Popover/Popover.react.js b/src/components/Popover/Popover.react.js index 4c5900035..3a23f9173 100644 --- a/src/components/Popover/Popover.react.js +++ b/src/components/Popover/Popover.react.js @@ -57,6 +57,10 @@ export default class Popover extends React.Component { this._popoverLayer.className = styles.transition; } + if (this.props.parentContentId) { + this._popoverLayer.dataset.parentContentId = this.props.parentContentId; + } + document.body.addEventListener('click', this._checkExternalClick); } @@ -78,7 +82,7 @@ export default class Popover extends React.Component { : this._popoverLayer; const isChromeDropdown = e.target.parentNode.classList.contains('chromeDropdown'); if ( - !hasAncestor(e.target, popoverWrapper) && + !hasAncestor(e.target, popoverWrapper, contentId) && this.props.onExternalClick && !isChromeDropdown ) { diff --git a/src/lib/hasAncestor.js b/src/lib/hasAncestor.js index 04a3b5550..b846eb9a6 100644 --- a/src/lib/hasAncestor.js +++ b/src/lib/hasAncestor.js @@ -5,11 +5,13 @@ * This source code is licensed under the license found in the LICENSE file in * the root directory of this source tree. */ -export default function hasAncestor(node, ancestor) { +export default function hasAncestor(node, ancestor, contentId) { let cur = node.parentNode; while (cur && cur.nodeType === 1) { if (cur === ancestor) { return true; + } else if (contentId && cur.dataset.parentContentId === contentId) { + return true; } cur = cur.parentNode; } From ab2a489574d57d22f3463123cac62de902e90899 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Mon, 19 Apr 2021 08:23:07 +0300 Subject: [PATCH 028/141] fix: upgrade react-ace from 9.3.0 to 9.4.0 (#1683) Snyk has created this PR to upgrade react-ace from 9.3.0 to 9.4.0. See this package in npm: https://www.npmjs.com/package/react-ace See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73fa6716a..ca565ffdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12230,11 +12230,11 @@ } }, "react-ace": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.3.0.tgz", - "integrity": "sha512-RWPDwVobLvyD0wDoHHQqEnn9pNQBhMnmo6LmRACkaXxAg3UQZpse6x9JFLC5EXyWby+P3uolIlQPct4NFEBPNg==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.4.0.tgz", + "integrity": "sha512-fpY3AGViE1OglXThgn3wZWcPoAxr0bqRYqeG3jY3m1L7OIHo0GfZ3bJI0grhrADDy2i9jQoip9xZfpOFupQCsw==", "requires": { - "ace-builds": "^1.4.6", + "ace-builds": "^1.4.12", "diff-match-patch": "^1.0.4", "lodash.get": "^4.4.2", "lodash.isequal": "^4.5.0", diff --git a/package.json b/package.json index 100d43008..f3683583b 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "prop-types": "15.7.2", "query-string": "6.14.1", "react": "16.14.0", - "react-ace": "9.3.0", + "react-ace": "9.4.0", "react-dnd": "10.0.2", "react-dnd-html5-backend": "10.0.2", "react-dom": "16.14.0", From 8188e6288e6dd89f4773bef447751fec8ce1c170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Apr 2021 10:49:52 -0700 Subject: [PATCH 029/141] chore(deps): bump ssri from 6.0.1 to 6.0.2 (#1684) Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 351 +++++++++++++++++++++++++++------------------- 1 file changed, 204 insertions(+), 147 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca565ffdd..ffd8841ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,33 +5,41 @@ "requires": true, "dependencies": { "@apollo/client": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.11.tgz", - "integrity": "sha512-54+D5FB6RJlQ+g37f432gaexnyvDsG5X6L9VO5kqN54HJlbF8hCf/8CXtAQEHCWodAwZhy6kOLp2RM96829q3A==", + "version": "3.3.15", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.15.tgz", + "integrity": "sha512-/WQmNvLEZMA0mA3u+FkEPTXKzxZD/KhyO7WlbKcy3zKGrXKza83tAbNMzsitQE7DTcSc3DLEcIu1Z5Rc7PFq0Q==", "dev": true, "requires": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", - "@wry/context": "^0.5.2", - "@wry/equality": "^0.3.0", + "@wry/context": "^0.6.0", + "@wry/equality": "^0.4.0", "fast-json-stable-stringify": "^2.0.0", "graphql-tag": "^2.12.0", "hoist-non-react-statics": "^3.3.2", - "optimism": "^0.14.0", + "optimism": "^0.15.0", "prop-types": "^15.7.2", "symbol-observable": "^2.0.0", - "ts-invariant": "^0.6.0", + "ts-invariant": "^0.7.0", "tslib": "^1.10.0", "zen-observable": "^0.8.14" }, "dependencies": { "@wry/equality": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.4.tgz", - "integrity": "sha512-1gQQhCPenzxw/1HzLlvSIs/59eBHJf9ZDIussjjZhqNSqQuPKQIzN6SWt4kemvlBPDi7RqMuUa03pId7MAE93g==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.4.0.tgz", + "integrity": "sha512-DxN/uawWfhRbgYE55zVCPOoe+jvsQ4m7PT1Wlxjyb/LCCLuU1UsucV2BbCxFAX8bjcSueFBbB5Qfj1Zfe8e7Fw==", "dev": true, "requires": { - "tslib": "^1.14.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "symbol-observable": { @@ -41,14 +49,20 @@ "dev": true }, "ts-invariant": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.1.tgz", - "integrity": "sha512-QQgN33g8E8yrdDuH29HASveLtbzMnRRgWh0i/JNTW4+zcLsdIOnfsgEDi/NKx4UckQyuMFt9Ujm6TWLWQ58Kvg==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.7.3.tgz", + "integrity": "sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==", "dev": true, "requires": { - "@types/ungap__global-this": "^0.3.1", - "@ungap/global-this": "^0.4.2", - "tslib": "^1.9.3" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "zen-observable": { @@ -81,9 +95,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.55.tgz", - "integrity": "sha512-koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg==", + "version": "10.17.58", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.58.tgz", + "integrity": "sha512-Dn5RBxLohjdHFj17dVVw3rtrZAeXeWg+LQfvxDIW/fdPkSiuQk7h3frKMYtsQhtIW42wkErDcy9UMVxhGW4O7w==", "dev": true } } @@ -1362,20 +1376,20 @@ }, "dependencies": { "@graphql-tools/utils": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.5.0.tgz", - "integrity": "sha512-8f//RSqHmKRdg9A3GHlZdxzlVfF/938ZD9edXLW7EriSABg1BXu3veru9W02VqORypArb2S/Tyeyvsk2gForqA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.3.tgz", + "integrity": "sha512-zF8Ll1v7DOFfCsZVYGkJqvi3Zpwfga8NutOZkToXrumMlTPaMhEDFkiuwoIK4lV2PMVUke5ZCmpn9pc5pqy4Tw==", "dev": true, "requires": { "@ardatan/aggregate-error": "0.0.6", "camel-case": "4.1.2", - "tslib": "~2.1.0" + "tslib": "~2.2.0" }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -1739,6 +1753,12 @@ "@types/yargs": "^13.0.0" } }, + "@josephg/resolvable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.0.tgz", + "integrity": "sha512-OfTtjoqB2doov5aTJxkyAMK8dXoo7CjCUQSYUEtiY34jbWduOGV7+168tmCT8COMsUEd5DMSFg/0iAOPCBTNAQ==", + "dev": true + }, "@node-rs/bcrypt": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-0.4.1.tgz", @@ -1760,9 +1780,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true, "optional": true } @@ -2246,9 +2266,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.18", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz", - "integrity": "sha512-m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz", + "integrity": "sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==", "dev": true, "requires": { "@types/node": "*", @@ -2451,16 +2471,10 @@ "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true }, - "@types/ungap__global-this": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@types/ungap__global-this/-/ungap__global-this-0.3.1.tgz", - "integrity": "sha512-+/DsiV4CxXl6ZWefwHZDXSe1Slitz21tom38qPCaG0DYCS1NnDPIQDTKcmQ/tvK/edJUKkmuIDBJbmKDiB0r/g==", - "dev": true - }, "@types/ws": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz", - "integrity": "sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.1.tgz", + "integrity": "sha512-ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q==", "dev": true, "requires": { "@types/node": "*" @@ -2552,12 +2566,6 @@ } } }, - "@ungap/global-this": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.4.tgz", - "integrity": "sha512-mHkm6FvepJECMNthFuIgpAEFmPOk71UyXuIxYfjytvFTnSDBIz7jmViO+LfHI/AjrazWije0PnSP3+/NlwzqtA==", - "dev": true - }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -2734,12 +2742,20 @@ } }, "@wry/context": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.4.tgz", - "integrity": "sha512-/pktJKHUXDr4D6TJqWgudOPJW2Z+Nb+bqk40jufA3uTkLbnCRKdJPiYDIa/c7mfcPH8Hr6O8zjCERpg5Sq04Zg==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz", + "integrity": "sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==", "dev": true, "requires": { - "tslib": "^1.14.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "@wry/equality": { @@ -2751,12 +2767,20 @@ } }, "@wry/trie": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.2.2.tgz", - "integrity": "sha512-OxqBB39x6MfHaa2HpMiRMfhuUnQTddD32Ko020eBeJXq87ivX6xnSSnzKHVbA21p7iqBASz8n/07b6W5wW1BVQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz", + "integrity": "sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==", "dev": true, "requires": { - "tslib": "^1.14.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "@xtuc/ieee754": { @@ -2929,22 +2953,22 @@ } }, "apollo-cache-control": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz", - "integrity": "sha512-YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.12.0.tgz", + "integrity": "sha512-kClF5rfAm159Nboul1LxA+l58Tjz0M8L1GUknEMpZt0UHhILLAn3BfcG3ToX4TbNoR9M57kKMUcbPWLdy3Up7w==", "dev": true, "requires": { "apollo-server-env": "^3.0.0", - "apollo-server-plugin-base": "^0.10.4" + "apollo-server-plugin-base": "^0.11.0" } }, "apollo-datasource": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.3.tgz", - "integrity": "sha512-PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.8.0.tgz", + "integrity": "sha512-gXgsGVLuejLc138z/2jUjPAzadDQxWbcLJyBgaQsg5BaXJNkv5uW/NjiSPk00cK51hyZrb0Xx8a+L+wPk2qIBA==", "dev": true, "requires": { - "apollo-server-caching": "^0.5.3", + "apollo-server-caching": "^0.6.0", "apollo-server-env": "^3.0.0" } }, @@ -3036,9 +3060,9 @@ } }, "apollo-server-caching": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz", - "integrity": "sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.6.0.tgz", + "integrity": "sha512-SfjKaccrhRzUQ8TAke9FrYppp4pZV3Rp8KCs+4Ox3kGtbco68acRPJkiYYtSVc4idR8XNAUOOVfAEZVNHdZQKQ==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -3062,28 +3086,29 @@ } }, "apollo-server-core": { - "version": "2.21.1", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.1.tgz", - "integrity": "sha512-aI+soLaqKMkWxH6l9xvPP1fCuZgD053SK09D79LQfMbJAHHvs3MI90UpydiY/W61K5l8ELl0YsKdqkQg8262nw==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.23.0.tgz", + "integrity": "sha512-3/a4LPgRADc8CdT/nRh7W0CAqQv3Q4DJvakWQgKqGSqDEb/0u4IBynYjlQKuPBi4wwKdeK2Hb1wiQLl+zu4StQ==", "dev": true, "requires": { "@apollographql/apollo-tools": "^0.4.3", "@apollographql/graphql-playground-html": "1.6.27", "@apollographql/graphql-upload-8-fork": "^8.1.3", + "@josephg/resolvable": "^1.0.0", "@types/ws": "^7.0.0", - "apollo-cache-control": "^0.11.6", - "apollo-datasource": "^0.7.3", + "apollo-cache-control": "^0.12.0", + "apollo-datasource": "^0.8.0", "apollo-graphql": "^0.6.0", "apollo-reporting-protobuf": "^0.6.2", - "apollo-server-caching": "^0.5.3", + "apollo-server-caching": "^0.6.0", "apollo-server-env": "^3.0.0", - "apollo-server-errors": "^2.4.2", - "apollo-server-plugin-base": "^0.10.4", - "apollo-server-types": "^0.6.3", - "apollo-tracing": "^0.12.2", + "apollo-server-errors": "^2.5.0", + "apollo-server-plugin-base": "^0.11.0", + "apollo-server-types": "^0.7.0", + "apollo-tracing": "^0.13.0", "async-retry": "^1.2.1", "fast-json-stable-stringify": "^2.0.0", - "graphql-extensions": "^0.12.8", + "graphql-extensions": "^0.13.0", "graphql-tag": "^2.11.0", "graphql-tools": "^4.0.8", "loglevel": "^1.6.7", @@ -3104,13 +3129,13 @@ } }, "apollo-server-types": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", - "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.7.0.tgz", + "integrity": "sha512-pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA==", "dev": true, "requires": { "apollo-reporting-protobuf": "^0.6.2", - "apollo-server-caching": "^0.5.3", + "apollo-server-caching": "^0.6.0", "apollo-server-env": "^3.0.0" } }, @@ -3157,9 +3182,9 @@ } }, "apollo-server-errors": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz", - "integrity": "sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz", + "integrity": "sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA==", "dev": true }, "apollo-server-express": { @@ -3187,22 +3212,22 @@ } }, "apollo-server-plugin-base": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz", - "integrity": "sha512-HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.11.0.tgz", + "integrity": "sha512-Du68x0XCyQ6EWlgoL9Z+1s8fJfXgY131QbKP7ao617StQPzwB0aGCwxBDfcMt1A75VXf4TkvV1rdUH5YeJFlhQ==", "dev": true, "requires": { - "apollo-server-types": "^0.6.3" + "apollo-server-types": "^0.7.0" }, "dependencies": { "apollo-server-types": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", - "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.7.0.tgz", + "integrity": "sha512-pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA==", "dev": true, "requires": { "apollo-reporting-protobuf": "^0.6.2", - "apollo-server-caching": "^0.5.3", + "apollo-server-caching": "^0.6.0", "apollo-server-env": "^3.0.0" } } @@ -3219,6 +3244,15 @@ "apollo-server-env": "^2.4.5" }, "dependencies": { + "apollo-server-caching": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz", + "integrity": "sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, "apollo-server-env": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz", @@ -3228,17 +3262,32 @@ "node-fetch": "^2.1.2", "util.promisify": "^1.0.0" } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "apollo-tracing": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.2.tgz", - "integrity": "sha512-SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.13.0.tgz", + "integrity": "sha512-28z4T+XfLQ6t696usU0nTFDxVN8BfF3o74d2p/zsT4eu1OuoyoDOEmVJqdInmVRpyTJK0tDEOjkIuDJJHZftog==", "dev": true, "requires": { "apollo-server-env": "^3.0.0", - "apollo-server-plugin-base": "^0.10.4" + "apollo-server-plugin-base": "^0.11.0" } }, "apollo-upload-client": { @@ -3449,9 +3498,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -4126,9 +4175,9 @@ } }, "bson": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz", - "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz", + "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==", "dev": true }, "buffer": { @@ -4308,9 +4357,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -6551,9 +6600,9 @@ } }, "fecha": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz", - "integrity": "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", + "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==", "dev": true }, "figgy-pudding": { @@ -7223,24 +7272,24 @@ } }, "graphql-extensions": { - "version": "0.12.8", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.8.tgz", - "integrity": "sha512-xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.13.0.tgz", + "integrity": "sha512-Bb7E97nvfX4gtrIdZ/i5YFlqOd6MGzrw8ED+t4wQVraYje6NQ+8P8MHMOV2WZLfbW8zsNTx8NdnnlbsdH5siag==", "dev": true, "requires": { "@apollographql/apollo-tools": "^0.4.3", "apollo-server-env": "^3.0.0", - "apollo-server-types": "^0.6.3" + "apollo-server-types": "^0.7.0" }, "dependencies": { "apollo-server-types": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.3.tgz", - "integrity": "sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.7.0.tgz", + "integrity": "sha512-pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA==", "dev": true, "requires": { "apollo-reporting-protobuf": "^0.6.2", - "apollo-server-caching": "^0.5.3", + "apollo-server-caching": "^0.6.0", "apollo-server-env": "^3.0.0" } } @@ -7469,12 +7518,20 @@ } }, "graphql-tag": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.1.tgz", - "integrity": "sha512-LPewEE1vzGkHnCO8zdOGogKsHHBdtpGyihow1UuMwp6RnZa0lAS7NcbvltLOuo4pi5diQCPASAXZkQq44ffixA==", + "version": "2.12.3", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.3.tgz", + "integrity": "sha512-5wJMjSvj30yzdciEuk9dPuUBUR56AqDi3xncoYQl1i42pGdSqOJrJsdb/rz5BDoy+qoGvQwABcBeF0xXY3TrKw==", "dev": true, "requires": { - "tslib": "^1.14.1" + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", + "dev": true + } } }, "graphql-tools": { @@ -9590,9 +9647,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -10210,9 +10267,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -10859,13 +10916,13 @@ "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==" }, "optimism": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.14.0.tgz", - "integrity": "sha512-ygbNt8n4DOCVpkwiLF+IrKKeNHOjtr9aXLWGP9HNJGoblSGsnVbJLstcH6/nE9Xy5ZQtlkSioFQNnthmENW6FQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.15.0.tgz", + "integrity": "sha512-KLKl3Kb7hH++s9ewRcBhmfpXgXF0xQ+JZ3xQFuPjnoT6ib2TDmYyVkKENmGxivsN2G3VRxpXuauCkB4GYOhtPw==", "dev": true, "requires": { - "@wry/context": "^0.5.2", - "@wry/trie": "^0.2.1" + "@wry/context": "^0.6.0", + "@wry/trie": "^0.3.0" } }, "optimist": { @@ -11357,9 +11414,9 @@ }, "dependencies": { "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==", "dev": true } } @@ -11515,9 +11572,9 @@ } }, "pg-connection-string": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz", - "integrity": "sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz", + "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==", "dev": true }, "pg-int8": { @@ -11533,9 +11590,9 @@ "dev": true }, "pg-pool": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz", - "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz", + "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==", "dev": true }, "pg-promise": { @@ -11551,9 +11608,9 @@ } }, "pg-protocol": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz", - "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz", + "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==", "dev": true }, "pg-types": { @@ -14022,9 +14079,9 @@ } }, "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", + "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", "dev": true, "requires": { "figgy-pudding": "^3.5.1" From f2e1f9530467537b7d955e1e3c8b408291fc4e79 Mon Sep 17 00:00:00 2001 From: Prerna Mehra Date: Wed, 21 Apr 2021 09:34:39 +0530 Subject: [PATCH 030/141] made expiresAt field readOnly (#1686) --- src/dashboard/Data/Browser/BrowserTable.react.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js index 26a6e56da..dc1b5bef3 100644 --- a/src/dashboard/Data/Browser/BrowserTable.react.js +++ b/src/dashboard/Data/Browser/BrowserTable.react.js @@ -200,6 +200,9 @@ export default class BrowserTable extends React.Component { readonly = true; } } + if(name === 'expiresAt' && this.props.className === '_Session'){ + readonly = true; + } let obj = this.props.current.row < 0 ? this.props.newObject : this.props.data[this.props.current.row]; let value = obj; if (!this.props.isUnique) { From 63cab5ba9c63fa3b62bb1a729c4e2747de2ca286 Mon Sep 17 00:00:00 2001 From: Prerna Mehra Date: Wed, 21 Apr 2021 09:35:46 +0530 Subject: [PATCH 031/141] showing error message on failed clone row task (#1687) --- src/dashboard/Data/Browser/Browser.react.js | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js index c8daab42f..cc0b596d1 100644 --- a/src/dashboard/Data/Browser/Browser.react.js +++ b/src/dashboard/Data/Browser/Browser.react.js @@ -821,15 +821,20 @@ class Browser extends DashboardView { for (const object of objects) { toClone.push(object.clone()); } - await Parse.Object.saveAll(toClone, { useMasterKey: true }); - this.setState({ - selection: {}, - data: [ - ...toClone, - ...this.state.data, - ], - showCloneSelectedRowsDialog: false, - }); + try { + await Parse.Object.saveAll(toClone, { useMasterKey: true }); + this.setState({ + selection: {}, + data: [...toClone, ...this.state.data], + showCloneSelectedRowsDialog: false + }); + } catch (error) { + this.setState({ + selection: {}, + showCloneSelectedRowsDialog: false + }); + this.showNote(error.message, true); + } } getClassRelationColumns(className) { From 9698c727ab8f1e98f081deebf6da6817fa4a617f Mon Sep 17 00:00:00 2001 From: Prerna Mehra Date: Wed, 21 Apr 2021 09:58:05 +0530 Subject: [PATCH 032/141] showing a message when no locale is setup (#1685) --- src/dashboard/Push/PushNew.react.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dashboard/Push/PushNew.react.js b/src/dashboard/Push/PushNew.react.js index 34ba482f2..f61d6fae4 100644 --- a/src/dashboard/Push/PushNew.react.js +++ b/src/dashboard/Push/PushNew.react.js @@ -597,7 +597,13 @@ class PushNew extends DashboardView { })}
{ !this.state.loadingLocale && this.state.availableLocales.length === 0 ? - null : + + Please follow this guide to setup the push locales feature + :
); } From 9d0504b337dc8418bc31468b6736670498944ce0 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Mon, 24 May 2021 10:18:53 +0300 Subject: [PATCH 051/141] fix: upgrade @babel/runtime from 7.13.17 to 7.14.0 (#1710) Snyk has created this PR to upgrade @babel/runtime from 7.13.17 to 7.14.0. See this package in npm: https://www.npmjs.com/package/@babel/runtime See this project in Snyk: https://app.snyk.io/org/acinader/project/953c8e1a-a9ef-4134-afbe-43474913abbb?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3dcfa1ca5..e9d8d2ad0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1212,9 +1212,9 @@ } }, "@babel/runtime": { - "version": "7.13.17", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz", - "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", + "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/package.json b/package.json index 6efa87c3e..10ca3996b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "LICENSE" ], "dependencies": { - "@babel/runtime": "7.13.17", + "@babel/runtime": "7.14.0", "bcryptjs": "2.3.0", "body-parser": "1.19.0", "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix", From 569db4bf9b2f42dada34f8afae6bb38d294406bc Mon Sep 17 00:00:00 2001 From: Christopher Brookes Date: Mon, 24 May 2021 09:21:38 +0200 Subject: [PATCH 052/141] feat(preventSort): allow preventSort from columnPreferences props (#1709) * feat(preventSort): allow preventSort from columnPreferences props * feat(preventSort): add doc section of prevent sorting --- README.md | 28 +++++++++++++++++++ .../DataBrowserHeaderBar.react.js | 13 ++++++--- .../DataBrowserHeaderBar.scss | 6 ++++ .../Data/Browser/BrowserTable.react.js | 7 +++-- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4ad256b97..a59a54c06 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Parse Dashboard is a standalone dashboard for managing your [Parse Server](https * [App Icon Configuration](#app-icon-configuration) * [App Background Color Configuration](#app-background-color-configuration) * [Other Configuration Options](#other-configuration-options) + * [Prevent columns sorting](#prevent-columns-sorting) * [Running as Express Middleware](#running-as-express-middleware) * [Deploying Parse Dashboard](#deploying-parse-dashboard) * [Preparing for Deployment](#preparing-for-deployment) @@ -241,6 +242,33 @@ You can set `appNameForURL` in the config file for each app to control the url o To change the app to production, simply set `production` to `true` in your config file. The default value is false if not specified. + ### Prevent columns sorting + +You can prevent some columns to be sortable by adding `preventSort` to columnPreference options in each app configuration + +```json + +"apps": [ + { + "appId": "local_app_id", + "columnPreference": { + "_User": [ + { + "name": "createdAt", + "visible": true, + "preventSort": true + }, + { + "name": "updatedAt", + "visible": true, + "preventSort": false + }, + ] + } + } +] +``` + # Running as Express Middleware Instead of starting Parse Dashboard with the CLI, you can also run it as an [express](https://github.com/expressjs/express) middleware. diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js index a773e13cf..04007d442 100644 --- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js +++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js @@ -27,7 +27,7 @@ export default class DataBrowserHeaderBar extends React.Component { ]; - headers.forEach(({ width, name, type, targetClass, order, visible }, i) => { + headers.forEach(({ width, name, type, targetClass, order, visible, preventSort }, i) => { if (!visible) return; let wrapStyle = { width }; if (i % 2) { @@ -36,15 +36,20 @@ export default class DataBrowserHeaderBar extends React.Component { wrapStyle.background = '#66637A'; } let onClick = null; - if (type === 'String' || type === 'Number' || type === 'Date' || type === 'Boolean') { + if (!preventSort && (type === 'String' || type === 'Number' || type === 'Date' || type === 'Boolean')) { onClick = () => updateOrdering((order === 'descending' ? '' : '-') + name); } + let className = styles.wrap; + if (preventSort) { + className += ` ${styles.preventSort} `; + } + elements.push(
diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss index eb38c70c2..01a1283b3 100644 --- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss +++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss @@ -72,3 +72,9 @@ } } } + +.preventSort { + :hover { + cursor: not-allowed; + } +} diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js index bfdc488da..f68853ac5 100644 --- a/src/dashboard/Data/Browser/BrowserTable.react.js +++ b/src/dashboard/Data/Browser/BrowserTable.react.js @@ -98,14 +98,15 @@ export default class BrowserTable extends React.Component { } } - let headers = this.props.order.map(({ name, width, visible }) => ( + let headers = this.props.order.map(({ name, width, visible, preventSort }) => ( { width: width, name: name, type: this.props.columns[name].type, targetClass: this.props.columns[name].targetClass, order: ordering.col === name ? ordering.direction : null, - visible + visible, + preventSort } )); let editor = null; @@ -140,7 +141,7 @@ export default class BrowserTable extends React.Component { setRelation={this.props.setRelation} setCopyableValue={this.props.setCopyableValue} setContextMenu={this.props.setContextMenu} - onEditSelectedRow={this.props.onEditSelectedRow} + onEditSelectedRow={this.props.onEditSelectedRow} />
); diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js index 4d5e970db..7d25d0d2d 100644 --- a/src/dashboard/Data/Browser/AddColumnDialog.react.js +++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js @@ -206,6 +206,11 @@ export default class AddColumnDialog extends React.Component { confirmText='Add column' cancelText={'Never mind, don\u2019t.'} onCancel={this.props.onCancel} + continueText={'Add column & continue'} + showContinue={true} + onContinue={() => { + this.props.onContinue(this.state); + }} onConfirm={() => { this.props.onConfirm(this.state); }}> @@ -246,4 +251,4 @@ export default class AddColumnDialog extends React.Component { ); } -} \ No newline at end of file +} diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js index 6c713556e..71b9d2698 100644 --- a/src/dashboard/Data/Browser/Browser.react.js +++ b/src/dashboard/Data/Browser/Browser.react.js @@ -79,6 +79,7 @@ class Browser extends DashboardView { isUnique: false, uniqueField: null, + keepAddingCols: false, markRequiredField: false, requiredColumnFields: [] }; @@ -117,6 +118,7 @@ class Browser extends DashboardView { this.showCreateClass = this.showCreateClass.bind(this); this.createClass = this.createClass.bind(this); this.addColumn = this.addColumn.bind(this); + this.addColumnAndContinue = this.addColumnAndContinue.bind(this); this.removeColumn = this.removeColumn.bind(this); this.showNote = this.showNote.bind(this); this.showEditRowDialog = this.showEditRowDialog.bind(this); @@ -274,6 +276,21 @@ class Browser extends DashboardView { }); } + newColumn(payload, required) { + return this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload) + .then(() => { + if (required) { + let requiredCols = [...this.state.requiredColumnFields, name]; + this.setState({ + requiredColumnFields: requiredCols + }); + } + }) + .catch((err) => { + this.showNote(err.message, true); + }); + } + addColumn({ type, name, target, required, defaultValue }) { let payload = { className: this.props.params.className, @@ -283,18 +300,23 @@ class Browser extends DashboardView { required, defaultValue }; - this.props.schema.dispatch(ActionTypes.ADD_COLUMN, payload).then(() => { - // if new required field column is added, then add field in requiredColumn - if (required) { - let requiredCols = [...this.state.requiredColumnFields, name]; - this.setState({ - requiredColumnFields: requiredCols - }); - } - }).catch((err) => { - this.showNote(err.message, true); - }).finally(() => { - this.setState({ showAddColumnDialog: false }); + this.newColumn(payload, required).finally(() => { + this.setState({ showAddColumnDialog: false, keepAddingCols: false }); + }); + } + + addColumnAndContinue({ type, name, target, required, defaultValue }) { + let payload = { + className: this.props.params.className, + columnType: type, + name: name, + targetClass: target, + required, + defaultValue + }; + this.newColumn(payload, required).finally(() => { + this.setState({ showAddColumnDialog: false, keepAddingCols: false }); + this.setState({ showAddColumnDialog: true, keepAddingCols: true }); }); } @@ -412,7 +434,7 @@ class Browser extends DashboardView { } this.state.counts[obj.className] += 1; } - + this.setState(state); }, error => { @@ -599,7 +621,7 @@ class Browser extends DashboardView { // Construct complex pagination query let equalityQuery = queryFromFilters(source, this.state.filters); let comp = this.state.data[this.state.data.length - 1].get(field); - + if (sortDir === '-') { query.lessThan(field, comp); equalityQuery.lessThan('objectId', this.state.data[this.state.data.length - 1].id); @@ -719,7 +741,7 @@ class Browser extends DashboardView { } else { obj.set(attr, value); } - + if (isNewObject) { // for dynamically changing required placeholder text for _User class new row object if (obj.className === '_User' && attr === 'authData' && value !== undefined) { @@ -739,7 +761,7 @@ class Browser extends DashboardView { if (obj.className === '_User' && obj.get('username') === undefined && obj.get('password') === undefined && obj.get('authData') === undefined) { this.setRequiredColumnFields(); } - + this.setState({ isNewObject: obj }); @@ -1209,6 +1231,8 @@ class Browser extends DashboardView { if (this.state.showCreateClassDialog) { extras = ( this.setState({ showCreateClassDialog: false })} onConfirm={this.createClass} /> @@ -1221,10 +1245,12 @@ class Browser extends DashboardView { }); extras = ( this.setState({ showAddColumnDialog: false })} onConfirm={this.addColumn} + onContinue={this.addColumnAndContinue} showNote={this.showNote} parseServerVersion={currentApp.serverInfo && currentApp.serverInfo.parseServerVersion} /> ); diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js index 6f54ae146..af2fd4624 100644 --- a/src/dashboard/Data/Browser/CreateClassDialog.react.js +++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js @@ -13,6 +13,7 @@ import Option from 'components/Dropdown/Option.react'; import React from 'react'; import { SpecialClasses } from 'lib/Constants'; import TextInput from 'components/TextInput/TextInput.react'; +import history from 'dashboard/history'; function validClassName(name) { return !!name.match(/^[a-zA-Z][_a-zA-Z0-9]*$/); @@ -68,7 +69,16 @@ export default class CreateClassDialog extends React.Component { disabled={!this.valid()} confirmText='Create class' cancelText={'Cancel'} + continueText={'Create class & add columns'} onCancel={this.props.onCancel} + showContinue={true} + onContinue={async () => { + let type = this.state.type; + let className = type === 'Custom' ? this.state.name : '_' + type; + await this.props.onConfirm(className); + history.push(`/apps/${this.props.currentAppSlug}/browser/${className}`); + this.props.onAddColumn(); + }} onConfirm={() => { let type = this.state.type; let className = type === 'Custom' ? this.state.name : '_' + type; From b7698be6be504bc421f3483eb9a5da4fef32461e Mon Sep 17 00:00:00 2001 From: fn-faisal Date: Mon, 26 Jul 2021 22:40:44 +0500 Subject: [PATCH 073/141] Arrays of Pointers dont render correctly #275 (#1727) * pointer array * fix for array Co-authored-by: Faisal Nadeem --- Parse-Dashboard/public/index.html | 40 +++++++++++++++++++ .../BrowserCell/BrowserCell.react.js | 34 ++++++++++++++-- src/components/BrowserCell/BrowserCell.scss | 18 ++++++++- src/dashboard/Data/Browser/Browser.scss | 2 +- 4 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 Parse-Dashboard/public/index.html diff --git a/Parse-Dashboard/public/index.html b/Parse-Dashboard/public/index.html new file mode 100644 index 000000000..bb91f96ef --- /dev/null +++ b/Parse-Dashboard/public/index.html @@ -0,0 +1,40 @@ + + + + + + + + +Parse Dashboard + +
+ + + + + + + + diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js index 315555793..a88af181b 100644 --- a/src/components/BrowserCell/BrowserCell.react.js +++ b/src/components/BrowserCell/BrowserCell.react.js @@ -250,7 +250,33 @@ export default class BrowserCell extends Component { value.id ); this.copyableValue = value.id; - } else if (type === 'Date') { + } + else if (type === 'Array') { + if ( value[0] && typeof value[0] === 'object' && value[0].__type === 'Pointer' ) { + const array = []; + value.map( (v, i) => { + if ( typeof v !== 'object' || v.__type !== 'Pointer' ) { + throw new Error('Invalid type found in pointer array'); + } + const object = new Parse.Object(v.className); + object.id = v.objectId; + array.push( + + + ); + }); + this.copyableValue = content =
    + { array.map( a =>
  • {a}
    • ) } +
+ if ( array.length > 1 ) { + classes.push(styles.hasMore); + } + } + else { + this.copyableValue = content = JSON.stringify(value); + } + } + else if (type === 'Date') { if (typeof value === 'object' && value.__type) { value = new Date(value.iso); } else if (typeof value === 'string') { @@ -259,7 +285,7 @@ export default class BrowserCell extends Component { this.copyableValue = content = dateStringUTC(value); } else if (type === 'Boolean') { this.copyableValue = content = value ? 'True' : 'False'; - } else if (type === 'Object' || type === 'Bytes' || type === 'Array') { + } else if (type === 'Object' || type === 'Bytes') { this.copyableValue = content = JSON.stringify(value); } else if (type === 'File') { const fileName = value.url() ? getFileName(value) : 'Uploading\u2026'; @@ -304,11 +330,11 @@ export default class BrowserCell extends Component { if (current) { classes.push(styles.current); } - + if (markRequiredField && isRequired && !value) { classes.push(styles.required); } - + return readonly ? ( Date: Tue, 27 Jul 2021 01:57:49 +0200 Subject: [PATCH 074/141] Delete index.html --- Parse-Dashboard/public/index.html | 40 ------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 Parse-Dashboard/public/index.html diff --git a/Parse-Dashboard/public/index.html b/Parse-Dashboard/public/index.html deleted file mode 100644 index bb91f96ef..000000000 --- a/Parse-Dashboard/public/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - -Parse Dashboard - -
- - - - - - - - From 69bf0414743150b9c1467cbb31ebe3e410241875 Mon Sep 17 00:00:00 2001 From: Manuel <5673677+mtrezza@users.noreply.github.com> Date: Tue, 3 Aug 2021 02:17:33 +0200 Subject: [PATCH 075/141] Browse as Parse.User (Continuation) (#1750) * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed quickfix for next PR * Removed quickfix for next PR * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: don't update Array, Object or Polygon field on EditRowDialog when no changes * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed quickfix for next PR * Removed quickfix for next PR * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: don't update Array, Object or Polygon field on EditRowDialog when no changes * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed quickfix for next PR * Removed quickfix for next PR * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Used object shorthand on useMasterKey * Clear user & pass from LoginDialog on handleClose * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: don't update Array, Object or Polygon field on EditRowDialog when no changes * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed quickfix for next PR * Removed quickfix for next PR * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * Test ACL with parse user login * Login dialog upgrades; Expand / Collapse TextArea fields on EditRowDialog; Fix for live reload data on EditRowDialog when data is updated on server * fix: don't update Array, Object or Polygon field on EditRowDialog when no changes * fix: eslint fixes * UX changes in main nav bar for browse as user; Toggle new type added - HIDE_LABELS; * fix: eslint fixes * Use master key state property on editRowDialog and ObjectPickerDialog; Enabled using useMasteKey property for save actions and other actions * Removed quickfix for next PR * Removed quickfix for next PR * Removed EditRowDialog fixes for next PR * Reposition Browse as User menu item * setCurrent to null on BrowserMenu open * fix rebase GeoPointEditor.react.js * fix rebase TextInput.react.js * Update Browser.react.js * Update EditRowDialog.react.js * Update EditRowDialog.react.js * Update EditRowDialog.react.js * Update ObjectPickerDialog.react.js * Update README.md * Update README.md * added missing dynamic useMasterKey Co-authored-by: Nino Crljenec --- README.md | 67 ++++++----- .../BrowserMenu/BrowserMenu.react.js | 10 +- src/components/BrowserMenu/BrowserMenu.scss | 24 +++- src/components/BrowserMenu/MenuItem.react.js | 8 +- src/components/Toggle/Toggle.react.js | 13 +- src/components/Toggle/Toggle.scss | 4 + src/dashboard/Data/Browser/Browser.react.js | 77 +++++++++--- .../Data/Browser/BrowserToolbar.react.js | 37 +++++- .../Data/Browser/EditRowDialog.react.js | 9 +- .../Data/Browser/LoginDialog.react.js | 112 ++++++++++++++++++ .../Data/Browser/ObjectPickerDialog.react.js | 9 +- 11 files changed, 307 insertions(+), 63 deletions(-) create mode 100644 src/dashboard/Data/Browser/LoginDialog.react.js diff --git a/README.md b/README.md index a59a54c06..72694d816 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Parse Dashboard +# Parse Dashboard [![Greenkeeper badge](https://badges.greenkeeper.io/parse-community/parse-dashboard.svg)](https://greenkeeper.io/) [![Build Status](https://img.shields.io/travis/parse-community/parse-dashboard/master.svg?style=flat)](https://travis-ci.org/parse-community/parse-dashboard) @@ -11,32 +11,34 @@ Parse Dashboard is a standalone dashboard for managing your [Parse Server](https://github.com/ParsePlatform/parse-server) apps. -* [Getting Started](#getting-started) -* [Local Installation](#local-installation) - * [Configuring Parse Dashboard](#configuring-parse-dashboard) - * [File](#file) - * [Environment variables](#environment-variables) - * [Multiple apps](#multiple-apps) - * [Single app](#single-app) - * [Managing Multiple Apps](#managing-multiple-apps) - * [GraphQL Playground](#graphql-playground) - * [App Icon Configuration](#app-icon-configuration) - * [App Background Color Configuration](#app-background-color-configuration) - * [Other Configuration Options](#other-configuration-options) - * [Prevent columns sorting](#prevent-columns-sorting) -* [Running as Express Middleware](#running-as-express-middleware) -* [Deploying Parse Dashboard](#deploying-parse-dashboard) - * [Preparing for Deployment](#preparing-for-deployment) - * [Security Considerations](#security-considerations) - * [Configuring Basic Authentication](#configuring-basic-authentication) - * [Separating App Access Based on User Identity](#separating-app-access-based-on-user-identity) - * [Use Read-Only masterKey](#use-read-only-masterKey) - * [Making an app read-only for all users](#making-an-app-read-only-for-all-users) - * [Makings users read-only](#makings-users-read-only) - * [Making user's apps readOnly](#making-users-apps-readonly) - * [Configuring Localized Push Notifications](#configuring-localized-push-notifications) - * [Run with Docker](#run-with-docker) -* [Contributing](#contributing) +- [Getting Started](#getting-started) +- [Local Installation](#local-installation) + - [Configuring Parse Dashboard](#configuring-parse-dashboard) + - [File](#file) + - [Environment variables](#environment-variables) + - [Multiple apps](#multiple-apps) + - [Single app](#single-app) + - [Managing Multiple Apps](#managing-multiple-apps) + - [GraphQL Playground](#graphql-playground) + - [App Icon Configuration](#app-icon-configuration) + - [App Background Color Configuration](#app-background-color-configuration) + - [Other Configuration Options](#other-configuration-options) + - [Prevent columns sorting](#prevent-columns-sorting) +- [Running as Express Middleware](#running-as-express-middleware) +- [Deploying Parse Dashboard](#deploying-parse-dashboard) + - [Preparing for Deployment](#preparing-for-deployment) + - [Security Considerations](#security-considerations) + - [Configuring Basic Authentication](#configuring-basic-authentication) + - [Separating App Access Based on User Identity](#separating-app-access-based-on-user-identity) + - [Use Read-Only masterKey](#use-read-only-masterkey) + - [Making an app read-only for all users](#making-an-app-read-only-for-all-users) + - [Makings users read-only](#makings-users-read-only) + - [Making user's apps readOnly](#making-users-apps-readonly) + - [Configuring Localized Push Notifications](#configuring-localized-push-notifications) + - [Run with Docker](#run-with-docker) +- [Features](#features) + - [Browse as User](#browse-as-user) +- [Contributing](#contributing) # Getting Started @@ -557,6 +559,17 @@ docker run -d -p 80:8080 -v host/path/to/config.json:/src/Parse-Dashboard/parse- If you are not familiar with Docker, ``--port 8080`` will be passed in as argument to the entrypoint to form the full command ``npm start -- --port 8080``. The application will start at port 8080 inside the container and port ``8080`` will be mounted to port ``80`` on your host machine. +# Features +*(The following is not a complete list of features but a work in progress to build a comprehensive feature list.)* + +## Browse as User + +▶️ *Core > Browser > Browse* + +This feature allows you to use the data browser as another user, respecting that user's data permissions. For example, you will only see records and fields the user has permission to see. + +> ⚠️ Logging in as another user will trigger the same Cloud Triggers as if the user logged in themselves using any other login method. Logging in as another user requires to enter that user's password. + # Contributing We really want Parse to be yours, to see it grow and thrive in the open source community. Please see the [Contributing to Parse Dashboard guide](CONTRIBUTING.md). diff --git a/src/components/BrowserMenu/BrowserMenu.react.js b/src/components/BrowserMenu/BrowserMenu.react.js index 516baff85..46479fff6 100644 --- a/src/components/BrowserMenu/BrowserMenu.react.js +++ b/src/components/BrowserMenu/BrowserMenu.react.js @@ -28,10 +28,14 @@ export default class BrowserMenu extends React.Component { let menu = null; if (this.state.open) { let position = Position.inDocument(this.node); + let titleStyle = [styles.title]; + if (this.props.active) { + titleStyle.push(styles.active); + } menu = ( this.setState({ open: false })}>
-
this.setState({ open: false })}> +
this.setState({ open: false })}> {this.props.title}
@@ -48,6 +52,9 @@ export default class BrowserMenu extends React.Component { ); } const classes = [styles.entry]; + if (this.props.active) { + classes.push(styles.active); + } if (this.props.disabled) { classes.push(styles.disabled); } @@ -55,6 +62,7 @@ export default class BrowserMenu extends React.Component { if (!this.props.disabled) { onClick = () => { this.setState({ open: true }); + this.props.setCurrent(null); }; } return ( diff --git a/src/components/BrowserMenu/BrowserMenu.scss b/src/components/BrowserMenu/BrowserMenu.scss index 189d8f1ef..4c357e980 100644 --- a/src/components/BrowserMenu/BrowserMenu.scss +++ b/src/components/BrowserMenu/BrowserMenu.scss @@ -12,8 +12,8 @@ } .entry { - height: 22px; - padding: 8px 8px 0 8px; + height: 30px; + padding: 8px; svg { fill: #66637A; @@ -33,6 +33,15 @@ fill: #66637A; } } + + &.active { + background: $orange; + border-radius: 5px; + + svg { + fill: white; + } + } } .title { @@ -43,21 +52,28 @@ svg { fill: white; } + + &.active { + background: $orange; + border-radius: 5px; + } } .entry, .title { @include NotoSansFont; + position: relative; + bottom: -4px; font-size: 14px; color: #ffffff; cursor: pointer; svg { - vertical-align: middle; + vertical-align: top; margin-right: 4px; } span { - vertical-align: middle; + vertical-align: top; height: 14px; line-height: 14px; } diff --git a/src/components/BrowserMenu/MenuItem.react.js b/src/components/BrowserMenu/MenuItem.react.js index b0fb1fbd2..27b1df6f9 100644 --- a/src/components/BrowserMenu/MenuItem.react.js +++ b/src/components/BrowserMenu/MenuItem.react.js @@ -8,11 +8,17 @@ import React from 'react'; import styles from 'components/BrowserMenu/BrowserMenu.scss'; -let MenuItem = ({ text, disabled, onClick }) => { +let MenuItem = ({ text, disabled, active, greenActive, onClick }) => { let classes = [styles.item]; if (disabled) { classes.push(styles.disabled); } + if (active) { + classes.push(styles.active); + } + if (greenActive) { + classes.push(styles.greenActive); + } return
{text}
; }; diff --git a/src/components/Toggle/Toggle.react.js b/src/components/Toggle/Toggle.react.js index 5cb9d07f6..590304f40 100644 --- a/src/components/Toggle/Toggle.react.js +++ b/src/components/Toggle/Toggle.react.js @@ -80,6 +80,10 @@ export default class Toggle extends React.Component { left = this.props.value === this.props.optionLeft; colored = this.props.colored; break; + case Toggle.Types.HIDE_LABELS: + colored = true; + left = !this.props.value; + break; default: labelLeft = 'No'; labelRight = 'Yes'; @@ -90,7 +94,10 @@ export default class Toggle extends React.Component { let switchClasses = [styles.switch]; if (colored) { - switchClasses.push(styles.colored) + switchClasses.push(styles.colored); + } + if (this.props.switchNoMargin) { + switchClasses.push(styles.switchNoMargin); } let toggleClasses = [styles.toggle, unselectable, input]; if (left) { @@ -101,9 +108,9 @@ export default class Toggle extends React.Component { } return (
- {labelLeft} + {labelLeft && {labelLeft}} - {labelRight} + {labelRight && {labelRight}}
); } diff --git a/src/components/Toggle/Toggle.scss b/src/components/Toggle/Toggle.scss index 02f2b8d60..43d70ce91 100644 --- a/src/components/Toggle/Toggle.scss +++ b/src/components/Toggle/Toggle.scss @@ -60,6 +60,10 @@ transition: background-position 0.15s ease-out; } +.switchNoMargin { + margin: 0; +} + .left { .label { &:first-of-type { diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js index 71b9d2698..e7a8faf11 100644 --- a/src/dashboard/Data/Browser/Browser.react.js +++ b/src/dashboard/Data/Browser/Browser.react.js @@ -81,7 +81,10 @@ class Browser extends DashboardView { uniqueField: null, keepAddingCols: false, markRequiredField: false, - requiredColumnFields: [] + requiredColumnFields: [], + + useMasterKey: true, + currentUser: Parse.User.current() }; this.prefetchData = this.prefetchData.bind(this); @@ -94,6 +97,9 @@ class Browser extends DashboardView { this.showDeleteRows = this.showDeleteRows.bind(this); this.showDropClass = this.showDropClass.bind(this); this.showExport = this.showExport.bind(this); + this.login = this.login.bind(this); + this.logout = this.logout.bind(this); + this.toggleMasterKeyUsage = this.toggleMasterKeyUsage.bind(this); this.showAttachRowsDialog = this.showAttachRowsDialog.bind(this); this.cancelAttachRows = this.cancelAttachRows.bind(this); this.confirmAttachRows = this.confirmAttachRows.bind(this); @@ -167,7 +173,8 @@ class Browser extends DashboardView { let relation = this.state.relation; if (isRelationRoute && !relation) { const parentObjectQuery = new Parse.Query(className); - const parent = await parentObjectQuery.get(entityId, { useMasterKey: true }); + const { useMasterKey } = this.state; + const parent = await parentObjectQuery.get(entityId, { useMasterKey }); relation = parent.relation(relationName); } await this.setState({ @@ -246,6 +253,25 @@ class Browser extends DashboardView { this.setState({ showExportDialog: true }); } + async login(username, password) { + if (Parse.User.current()) { + await Parse.User.logOut(); + } + + const currentUser = await Parse.User.logIn(username, password); + this.setState({ currentUser: currentUser, useMasterKey: false }, () => this.refresh()); + } + + async logout() { + await Parse.User.logOut(); + this.setState({ currentUser: null, useMasterKey: true }, () => this.refresh()); + } + + toggleMasterKeyUsage() { + const { useMasterKey } = this.state; + this.setState({ useMasterKey: !useMasterKey }, () => this.refresh()); + } + createClass(className) { this.props.schema.dispatch(ActionTypes.CREATE_CLASS, { className }).then(() => { this.state.counts[className] = 0; @@ -349,6 +375,7 @@ class Browser extends DashboardView { } saveNewRow(){ + const { useMasterKey } = this.state; const obj = this.state.newObject; if (!obj) { return; @@ -393,7 +420,7 @@ class Browser extends DashboardView { markRequiredField: false }); } - obj.save(null, { useMasterKey: true }).then( + obj.save(null, { useMasterKey }).then( objectSaved => { let msg = objectSaved.className + ' with id \'' + objectSaved.id + '\' created'; this.showNote(msg, false); @@ -405,7 +432,7 @@ class Browser extends DashboardView { const parentRelation = parent.relation(relation.key); parentRelation.add(obj); const targetClassName = relation.targetClassName; - parent.save(null, { useMasterKey: true }).then( + parent.save(null, { useMasterKey }).then( () => { this.setState({ newObject: null, @@ -497,6 +524,7 @@ class Browser extends DashboardView { } async fetchParseData(source, filters) { + const { useMasterKey } = this.state; const query = queryFromFilters(source, filters); const sortDir = this.state.ordering[0] === '-' ? '-' : '+'; const field = this.state.ordering.substr(sortDir === '-' ? 1 : 0) @@ -518,7 +546,7 @@ class Browser extends DashboardView { query.limit(MAX_ROWS_FETCHED); this.excludeFields(query, source); - let promise = query.find({ useMasterKey: true }); + let promise = query.find({ useMasterKey }); let isUnique = false; let uniqueField = null; filters.forEach(async (filter) => { @@ -547,7 +575,8 @@ class Browser extends DashboardView { async fetchParseDataCount(source, filters) { const query = queryFromFilters(source, filters); - const count = await query.count({ useMasterKey: true }); + const { useMasterKey } = this.state; + const count = await query.count({ useMasterKey }); return count; } @@ -650,7 +679,8 @@ class Browser extends DashboardView { query.limit(MAX_ROWS_FETCHED); this.excludeFields(query, source); - query.find({ useMasterKey: true }).then((nextPage) => { + const { useMasterKey } = this.state; + query.find({ useMasterKey }).then((nextPage) => { if (className === this.props.params.className) { this.setState((state) => ({ data: state.data.concat(nextPage) @@ -767,7 +797,9 @@ class Browser extends DashboardView { }); return; } - obj.save(null, { useMasterKey: true }).then((objectSaved) => { + + const { useMasterKey } = this.state; + obj.save(null, { useMasterKey }).then((objectSaved) => { let msg = objectSaved.className + ' with id \'' + objectSaved.id + '\' updated'; this.showNote(msg, false); const state = { data: this.state.data }; @@ -814,10 +846,11 @@ class Browser extends DashboardView { const toDeleteObjectIds = []; toDelete.forEach((obj) => { toDeleteObjectIds.push(obj.id); }); + const { useMasterKey } = this.state; let relation = this.state.relation; if (relation && toDelete.length) { relation.remove(toDelete); - relation.parent.save(null, { useMasterKey: true }).then(() => { + relation.parent.save(null, { useMasterKey }).then(() => { if (this.state.relation === relation) { for (let i = 0; i < indexes.length; i++) { this.state.data.splice(indexes[i] - i, 1); @@ -828,7 +861,7 @@ class Browser extends DashboardView { } }); } else if (toDelete.length) { - Parse.Object.destroyAll(toDelete, { useMasterKey: true }).then(() => { + Parse.Object.destroyAll(toDelete, { useMasterKey }).then(() => { let deletedNote; if (toDeleteObjectIds.length == 1) { @@ -921,11 +954,12 @@ class Browser extends DashboardView { if (!objectIds || !objectIds.length) { throw 'No objectId passed'; } + const { useMasterKey } = this.state; const relation = this.state.relation; const query = new Parse.Query(relation.targetClassName); const parent = relation.parent; query.containedIn('objectId', objectIds); - let objects = await query.find({ useMasterKey: true }); + let objects = await query.find({ useMasterKey }); const missedObjectsCount = objectIds.length - objects.length; if (missedObjectsCount) { const missedObjects = []; @@ -939,7 +973,7 @@ class Browser extends DashboardView { throw `${errorSummary} ${JSON.stringify(missedObjects)}`; } parent.relation(relation.key).add(objects); - await parent.save(null, { useMasterKey: true }); + await parent.save(null, { useMasterKey }); // remove duplication this.state.data.forEach(origin => objects = objects.filter(object => object.id !== origin.id)); this.setState({ @@ -965,13 +999,14 @@ class Browser extends DashboardView { } async confirmAttachSelectedRows(className, targetObjectId, relationName, objectIds, targetClassName) { + const { useMasterKey } = this.state; const parentQuery = new Parse.Query(className); - const parent = await parentQuery.get(targetObjectId, { useMasterKey: true }); + const parent = await parentQuery.get(targetObjectId, { useMasterKey }); const query = new Parse.Query(targetClassName || this.props.params.className); query.containedIn('objectId', objectIds); - const objects = await query.find({ useMasterKey: true }); + const objects = await query.find({ useMasterKey }); parent.relation(relationName).add(objects); - await parent.save(null, { useMasterKey: true }); + await parent.save(null, { useMasterKey }); this.setState({ selection: {}, }); @@ -990,6 +1025,7 @@ class Browser extends DashboardView { } async confirmCloneSelectedRows() { + const { useMasterKey } = this.state; const objectIds = []; for (const objectId in this.state.selection) { objectIds.push(objectId); @@ -997,13 +1033,13 @@ class Browser extends DashboardView { const className = this.props.params.className; const query = new Parse.Query(className); query.containedIn('objectId', objectIds); - const objects = await query.find({ useMasterKey: true }); + const objects = await query.find({ useMasterKey }); const toClone = []; for (const object of objects) { toClone.push(object.clone()); } try { - await Parse.Object.saveAll(toClone, { useMasterKey: true }); + await Parse.Object.saveAll(toClone, { useMasterKey }); this.setState({ selection: {}, data: [...toClone, ...this.state.data], @@ -1200,7 +1236,11 @@ class Browser extends DashboardView { onEditPermissions={this.onDialogToggle} onSaveNewRow={this.saveNewRow} onAbortAddRow={this.abortAddRow} - + currentUser={this.state.currentUser} + useMasterKey={this.state.useMasterKey} + login={this.login} + logout={this.logout} + toggleMasterKeyUsage={this.toggleMasterKeyUsage} markRequiredField={this.state.markRequiredField} requiredColumnFields={this.state.requiredColumnFields} columns={columns} @@ -1376,6 +1416,7 @@ class Browser extends DashboardView { updateRow={this.updateRow} confirmAttachSelectedRows={this.confirmAttachSelectedRows} schema={this.props.schema} + useMasterKey={this.state.useMasterKey} /> ) } diff --git a/src/dashboard/Data/Browser/BrowserToolbar.react.js b/src/dashboard/Data/Browser/BrowserToolbar.react.js index 017ac7573..1a738ea7f 100644 --- a/src/dashboard/Data/Browser/BrowserToolbar.react.js +++ b/src/dashboard/Data/Browser/BrowserToolbar.react.js @@ -15,8 +15,10 @@ import Separator from 'components/BrowserMenu/Separator.react'; import styles from 'dashboard/Data/Browser/Browser.scss'; import Toolbar from 'components/Toolbar/Toolbar.react'; import SecurityDialog from 'dashboard/Data/Browser/SecurityDialog.react'; -import ColumnsConfiguration from 'components/ColumnsConfiguration/ColumnsConfiguration.react' +import ColumnsConfiguration from 'components/ColumnsConfiguration/ColumnsConfiguration.react'; import SecureFieldsDialog from 'dashboard/Data/Browser/SecureFieldsDialog.react'; +import LoginDialog from 'dashboard/Data/Browser/LoginDialog.react'; +import Toggle from 'components/Toggle/Toggle.react'; let BrowserToolbar = ({ className, @@ -57,6 +59,12 @@ let BrowserToolbar = ({ enableColumnManipulation, enableClassManipulation, + + currentUser, + useMasterKey, + login, + logout, + toggleMasterKeyUsage, }) => { let selectionLength = Object.keys(selection).length; let details = []; @@ -84,7 +92,7 @@ let BrowserToolbar = ({ let menu = null; if (relation) { menu = ( - + + {enableColumnManipulation ? :