From d680f3e0c9ee65844afcb2b6c304bb68f3109fe8 Mon Sep 17 00:00:00 2001 From: mhatvan Date: Wed, 23 Jun 2021 15:57:42 -0600 Subject: Upgrade various dependencies to latest, remove unnecessary electron-hunspell --- package-lock.json | 116 +++++++++++++++------------------------ package.json | 9 ++- src/components/ui/ImageUpload.js | 36 ++++++------ 3 files changed, 67 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index 71afdb31d..54f72f971 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10985,12 +10985,9 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "attr-accept": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz", - "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==", - "requires": { - "core-js": "^2.5.0" - } + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz", + "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==" }, "auto-launch": { "version": "5.0.5", @@ -15750,14 +15747,6 @@ "resolved": "https://registry.npmjs.org/electron-find/-/electron-find-1.0.6.tgz", "integrity": "sha512-RenjzlCCzX7edLywLy+qRYvzds11sBv8+SrJu/3l3eVLt9d9uNqCPk+uFZ525uAhSUaUalgZWDlhQdxIgT1khg==" }, - "electron-hunspell": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.1.2.tgz", - "integrity": "sha512-Wrue7/aOlOEabhMm4GQSfvGADKHzCDkuYIEOINSEwMjHrvwTj7e1gI1kIO5wc+JdSL1uhFjwROfrqiLmnxqIKg==", - "requires": { - "hunspell-asm": "^4.0.2" - } - }, "electron-notarize": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz", @@ -16575,16 +16564,6 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, - "emscripten-wasm-loader": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-3.0.3.tgz", - "integrity": "sha512-fyq2maBt5LOou27LEBlL5H6G04BxgSamXkvmMsAuIT6rd8ioH4BxNQhuyl6jVPeODh6U8Wk1BoFZxzHpg3o8wA==", - "requires": { - "getroot": "^1.0.0", - "nanoid": "^2.0.3", - "unixify": "^1.0.0" - } - }, "enabled": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", @@ -18224,6 +18203,21 @@ "flat-cache": "^2.0.1" } }, + "file-selector": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.2.4.tgz", + "integrity": "sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==", + "requires": { + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -19672,14 +19666,6 @@ "assert-plus": "^1.0.0" } }, - "getroot": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/getroot/-/getroot-1.0.0.tgz", - "integrity": "sha512-W9Q31kOv921dQuZBeAbK4R/dAPbC0WkhZD3alLcdVwjSkEtS1aX8twrzG3I5yo0sQ88M/d4JOqVbRiCuI/XPNA==", - "requires": { - "tslib": "^1.7.1" - } - }, "git-raw-commits": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.10.tgz", @@ -22280,15 +22266,6 @@ "ms": "^2.0.0" } }, - "hunspell-asm": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-4.0.2.tgz", - "integrity": "sha512-u3ZuEYKGYnLZlIs+k5S+KdY+Q57mYD46fTwZJCiSXdES+fhxcLNF5mJ0nxjqrPAgE/8Kow6XLxRdRd/HDUPQZg==", - "requires": { - "emscripten-wasm-loader": "^3.0.3", - "nanoid": "^2.1.5" - } - }, "husky": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", @@ -28226,11 +28203,6 @@ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, - "nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==" - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -29199,6 +29171,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, "requires": { "remove-trailing-separator": "^1.0.1" } @@ -32038,9 +32011,9 @@ } }, "react-confetti": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/react-confetti/-/react-confetti-3.1.0.tgz", - "integrity": "sha512-T1DKt09C9rrf2BJ0OxFu8saPohFalOJfOgci11/ePz6DxbY+0cd/3CMimxj/ZITl7jQWnmC/bNWBgGheke3WZQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/react-confetti/-/react-confetti-6.0.1.tgz", + "integrity": "sha512-ZpOTBrqSNhWE4rRXCZ6E6U+wGd7iYHF5MGrqwikoiBpgBq9Akdu0DcLW+FdFnLjyZYC+VfAiV2KeFgYRMyMrkA==", "requires": { "tween-functions": "^1.2.0" } @@ -32057,12 +32030,13 @@ } }, "react-dropzone": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-7.0.1.tgz", - "integrity": "sha512-J4rbzhFZPVW7k7K9CVb0OcwSOJGLWa0y+0rvtB4rBLVkvq0agH/o3kPJ0DCkd6ZVzL2K1NFqIOvtQkwQKpmJBA==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-11.3.2.tgz", + "integrity": "sha512-Z0l/YHcrNK1r85o6RT77Z5XgTARmlZZGfEKBl3tqTXL9fZNQDuIdRx/J0QjvR60X+yYu26dnHeaG2pWU+1HHvw==", "requires": { - "attr-accept": "^1.1.3", - "prop-types": "^15.6.2" + "attr-accept": "^2.2.1", + "file-selector": "^0.2.2", + "prop-types": "^15.7.2" } }, "react-electron-web-view": { @@ -32203,9 +32177,9 @@ } }, "react-sortable-hoc": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-1.10.1.tgz", - "integrity": "sha512-eVyv5rrK6qY9bG60bboRY78In7OpdRRg+hxp4QMLIjC/UJaFSU7exTYd0764GtXvBqh+b+faYGzren5/ffRYKw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz", + "integrity": "sha512-JZUw7hBsAHXK7PTyErJyI7SopSBFRcFHDjWW5SWjcugY0i6iH7f+eJkY8cJmGMlZ1C9xz1J3Vjz0plFpavVeRg==", "requires": { "@babel/runtime": "^7.2.0", "invariant": "^2.2.4", @@ -32213,12 +32187,19 @@ } }, "react-tooltip": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.11.1.tgz", - "integrity": "sha512-YCMVlEC2KuHIzOQhPplTK5jmBBwoL+PYJJdJKXj7M/h7oevupd/QSVq6z5U7/ehIGXyHsAqvwpdxexDfyQ0o3A==", + "version": "4.2.21", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.21.tgz", + "integrity": "sha512-zSLprMymBDowknr0KVDiJ05IjZn9mQhhg4PRsqln0OZtURAJ1snt1xi5daZfagsh6vfsziZrc9pErPTDY1ACig==", "requires": { - "classnames": "^2.2.5", - "prop-types": "^15.6.0" + "prop-types": "^15.7.2", + "uuid": "^7.0.3" + }, + "dependencies": { + "uuid": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==" + } } }, "react-transition-group": { @@ -32827,7 +32808,8 @@ "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true }, "renderkid": { "version": "2.0.5", @@ -36129,14 +36111,6 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, - "unixify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz", - "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=", - "requires": { - "normalize-path": "^2.1.1" - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index b15806b7f..d17f409c0 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "electron-dl": "3.2.1", "electron-fetch": "1.7.3", "electron-find": "1.0.6", - "electron-hunspell": "1.1.2", "electron-react-titlebar": "0.8.2", "electron-updater": "4.3.9", "electron-util": "0.16.0", @@ -112,17 +111,17 @@ "prop-types": "^15.5.10", "react": "16.14.0", "react-addons-css-transition-group": "15.6.2", - "react-confetti": "3.1.0", + "react-confetti": "6.0.1", "react-dom": "^16.14.0", - "react-dropzone": "7.0.1", + "react-dropzone": "11.3.2", "react-electron-web-view": "^2.0.1", "react-intl": "2.7.2", "react-jss": "8.6.1", "react-loader": "2.4.7", "react-modal": "3.11.1", "react-router": "3.2.6", - "react-sortable-hoc": "1.10.1", - "react-tooltip": "3.11.1", + "react-sortable-hoc": "2.0.0", + "react-tooltip": "4.2.21", "route-parser": "^0.0.5", "semver": "7.3.5", "smoothscroll-polyfill": "0.4.4", diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index e0b608b96..e831eb47b 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -21,7 +21,7 @@ export default @observer class ImageUpload extends Component { state = { path: null, - } + }; dropzoneRef = null; @@ -40,11 +40,7 @@ export default @observer class ImageUpload extends Component { render() { const { - field, - className, - multiple, - textDelete, - textUpload, + field, className, multiple, textDelete, textUpload, } = this.props; const cssClasses = classnames({ @@ -54,15 +50,17 @@ export default @observer class ImageUpload extends Component { return (
- +
{(field.value && field.value !== 'delete') || this.state.path ? (
) : ( { this.dropzoneRef = node; }} + ref={(node) => { + this.dropzoneRef = node; + }} onDrop={this.onDrop.bind(this)} - className={cssClasses} multiple={multiple} accept="image/jpeg, image/png, image/svg+xml" > - -

- {textUpload} -

+ {({ getRootProps, getInputProps }) => ( +
+ +

{textUpload}

+ +
+ )} )}
-- cgit v1.2.3-70-g09d2