From ecca49608a65c0ca2471c29594144052b1968015 Mon Sep 17 00:00:00 2001 From: Karolina Rakoczy Date: Thu, 11 Feb 2021 15:31:36 +0100 Subject: [PATCH] merge all changes --- package-lock.json | 195 ---------------------------------------------- 1 file changed, 195 deletions(-) diff --git a/package-lock.json b/package-lock.json index f457c95da..32b6981df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2324,15 +2324,9 @@ } }, "node_modules/@editorjs/editorjs": { -<<<<<<< HEAD - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.19.0.tgz", - "integrity": "sha512-8PUVaBZx69IrG8dNrE+FZbHSiRTR8ql8L/cmEi1mOdEdTqnOLq5Wv9dgemK00mBWEgNoavMAjtGQpItGknAa8A==", -======= "version": "2.19.1", "resolved": "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.19.1.tgz", "integrity": "sha512-5lN7r5B2NCE8VJdsS3poX3Qg9rNwzpxZ+6Jjif3hAVZTYpQwg5wXEpAHFNbuavS0T5Ji+0ID31DQFotVI4PosA==", ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "dependencies": { "codex-notifier": "^1.1.2", "codex-tooltip": "^1.0.1" @@ -3465,8 +3459,6 @@ "node": ">=6" } }, -<<<<<<< HEAD -======= "node_modules/@sentry/browser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.1.0.tgz", @@ -3607,7 +3599,6 @@ "node": ">= 8" } }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/@sindresorhus/fnv1a": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@sindresorhus/fnv1a/-/fnv1a-1.2.0.tgz", @@ -4537,14 +4528,6 @@ "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", "dev": true }, -<<<<<<< HEAD - "node_modules/@types/faker": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@types/faker/-/faker-5.1.6.tgz", - "integrity": "sha512-D+gfFWR/YCvlrYL8lgNZO1jKgIUW+cfhxsgMOqUMYwCI+tl0htD7vCCXp/oJsIxJpxuI7zqmo3gpVQBkFCM4iA==" - }, -======= ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/@types/fuzzaldrin": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/@types/fuzzaldrin/-/fuzzaldrin-2.1.2.tgz", @@ -6788,8 +6771,6 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, -<<<<<<< HEAD -======= "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -6799,7 +6780,6 @@ "node": ">= 4.0.0" } }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -8286,15 +8266,12 @@ "file-uri-to-path": "1.0.0" } }, -<<<<<<< HEAD -======= "node_modules/blob-util": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==", "dev": true }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/bluebird": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz", @@ -9346,15 +9323,9 @@ "integrity": "sha512-DCp6xe/LGueJ1N5sXEwcBc3r3PyVkEEDNWCVigfvywAkeXcZMk9K41a31tkEFBW0Ptlwji6/JlAb49E3Yrxbtg==" }, "node_modules/codex-tooltip": { -<<<<<<< HEAD - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/codex-tooltip/-/codex-tooltip-1.0.1.tgz", - "integrity": "sha512-1xLb1NZbxguNtf02xBRhDphq/EXvMMeEbY0ievjQTHqf8UjXsD41evGk9rqcbjpl+JOjNgtwnp1OaU/X/h6fhQ==" -======= "version": "1.0.2", "resolved": "https://registry.npmjs.org/codex-tooltip/-/codex-tooltip-1.0.2.tgz", "integrity": "sha512-oC+Bu5X/zyhbPydgMSLWKoM/+vkJMqaLWu3Dt/jZgXS3MWK23INwC5DMBrVXZSufAFk0i0SUni38k9rLMyZn/w==" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad }, "node_modules/collapse-white-space": { "version": "1.0.6", @@ -10105,51 +10076,6 @@ "dev": true }, "node_modules/cypress": { -<<<<<<< HEAD - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.9.0.tgz", - "integrity": "sha512-qGxT5E0j21FPryzhb0OBjCdhoR/n1jXtumpFFSBPYWsaZZhNaBvc3XlBUDEZKkkXPsqUFYiyhWdHN/zo0t5FcA==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@cypress/listr-verbose-renderer": "0.4.1", - "@cypress/request": "2.88.5", - "@cypress/xvfb": "1.2.4", - "@types/sinonjs__fake-timers": "6.0.1", - "@types/sizzle": "2.3.2", - "arch": "2.1.2", - "bluebird": "3.7.2", - "cachedir": "2.3.0", - "chalk": "2.4.2", - "check-more-types": "2.24.0", - "cli-table3": "0.5.1", - "commander": "4.1.1", - "common-tags": "1.8.0", - "debug": "4.1.1", - "eventemitter2": "6.4.2", - "execa": "1.0.0", - "executable": "4.1.1", - "extract-zip": "1.7.0", - "fs-extra": "8.1.0", - "getos": "3.2.1", - "is-ci": "2.0.0", - "is-installed-globally": "0.3.2", - "lazy-ass": "1.6.0", - "listr": "0.14.3", - "lodash": "4.17.15", - "log-symbols": "3.0.0", - "minimist": "1.2.5", - "moment": "2.26.0", - "ospath": "1.2.2", - "pretty-bytes": "5.3.0", - "ramda": "0.26.1", - "request-progress": "3.0.0", - "supports-color": "7.1.0", - "tmp": "0.1.0", - "untildify": "4.0.0", - "url": "0.11.0", - "yauzl": "2.10.0" -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/cypress/-/cypress-6.4.0.tgz", "integrity": "sha512-SrsPsZ4IBterudkoFYBvkQmXOVxclh1/+ytbzpV8AH/D2FA+s2Qy5ISsaRzOFsbQa4KZWoi3AKwREmF1HucYkg==", @@ -10195,15 +10121,11 @@ "untildify": "^4.0.0", "url": "^0.11.0", "yauzl": "^2.10.0" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad }, "bin": { "cypress": "bin/cypress" }, "engines": { -<<<<<<< HEAD - "node": ">=8.0.0" -======= "node": ">=10.0.0" } }, @@ -10229,7 +10151,6 @@ }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad } }, "node_modules/cypress/node_modules/bluebird": { @@ -10238,12 +10159,6 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, -<<<<<<< HEAD - "node_modules/cypress/node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", -======= "node_modules/cypress/node_modules/chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -10299,26 +10214,11 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "dev": true, "engines": { "node": ">= 6" } }, -<<<<<<< HEAD - "node_modules/cypress/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" -======= "node_modules/cypress/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -10390,7 +10290,6 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad } }, "node_modules/cypress/node_modules/has-flag": { @@ -10402,30 +10301,6 @@ "node": ">=8" } }, -<<<<<<< HEAD - "node_modules/cypress/node_modules/lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "node_modules/cypress/node_modules/log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cypress/node_modules/moment": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", - "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==", -======= "node_modules/cypress/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -10473,14 +10348,11 @@ "version": "2.29.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "dev": true, "engines": { "node": "*" } }, -<<<<<<< HEAD -======= "node_modules/cypress/node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -10517,31 +10389,12 @@ "node": ">=8" } }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/cypress/node_modules/ramda": { "version": "0.26.1", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==", "dev": true }, -<<<<<<< HEAD - "node_modules/cypress/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/cypress/node_modules/supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", -======= "node_modules/cypress/node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -10593,7 +10446,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "dev": true, "dependencies": { "has-flag": "^4.0.0" @@ -10603,17 +10455,6 @@ } }, "node_modules/cypress/node_modules/tmp": { -<<<<<<< HEAD - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", - "dev": true, - "dependencies": { - "rimraf": "^2.6.3" - }, - "engines": { - "node": ">=6" -======= "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", @@ -10647,7 +10488,6 @@ }, "engines": { "node": ">= 8" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad } }, "node_modules/dashdash": { @@ -10689,15 +10529,12 @@ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" }, -<<<<<<< HEAD -======= "node_modules/dayjs": { "version": "1.10.4", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz", "integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==", "dev": true }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -13657,14 +13494,11 @@ "node >=0.6.0" ] }, -<<<<<<< HEAD -======= "node_modules/faker": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/faker/-/faker-5.2.0.tgz", "integrity": "sha512-UlrF1NNRIdzEPtBcy5l8JTlnXQZdz+4pQc3v2TAVocW39nnczCNQ0g0CBKgPGISJPzA2DqJVN1kdr+FCRFdN5g==" }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/fast-array-diff": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/fast-array-diff/-/fast-array-diff-0.2.0.tgz", @@ -15970,15 +15804,9 @@ } }, "node_modules/hoist-non-react-statics": { -<<<<<<< HEAD - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", - "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", -======= "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "dependencies": { "react-is": "^16.7.0" } @@ -22199,14 +22027,6 @@ } }, "node_modules/pretty-bytes": { -<<<<<<< HEAD - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", - "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==", - "dev": true, - "engines": { - "node": ">=6" -======= "version": "5.5.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz", "integrity": "sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==", @@ -22216,7 +22036,6 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad } }, "node_modules/pretty-error": { @@ -22416,15 +22235,12 @@ "node": ">= 0.10" } }, -<<<<<<< HEAD -======= "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", "dev": true }, ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -23096,17 +22912,6 @@ "mkdirp": "^0.5.1" } }, -<<<<<<< HEAD - "node_modules/react-intl/node_modules/hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "dependencies": { - "react-is": "^16.7.0" - } - }, -======= ->>>>>>> 7bb3efa65dfa659880f2c8bebd7a3c2a3cf68fad "node_modules/react-intl/node_modules/shallow-equal": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",