From f7bf204924aa06608f5c09e85686ff91907b02ed Mon Sep 17 00:00:00 2001 From: picklesrus Date: Tue, 2 Feb 2021 11:34:27 -0500 Subject: [PATCH 01/19] Draft: open mute modal from reply button if you're muted. --- src/components/modal/mute/modal.jsx | 3 ++- src/views/preview/comment/comment.jsx | 1 + src/views/preview/comment/compose-comment.jsx | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/modal/mute/modal.jsx b/src/components/modal/mute/modal.jsx index a7c68f443..ae53a5bcb 100644 --- a/src/components/modal/mute/modal.jsx +++ b/src/components/modal/mute/modal.jsx @@ -37,7 +37,7 @@ class MuteModal extends React.Component { this.numSteps = this.props.showWarning ? steps.BAN_WARNING : steps.MUTE_INFO; this.state = { - step: steps.COMMENT_ISSUE + step: this.props.startStep ? this.props.startStep : steps.COMMENT_ISSUE }; } handleNext () { @@ -240,6 +240,7 @@ MuteModal.propTypes = { }), onRequestClose: PropTypes.func, showWarning: PropTypes.bool, + startStep: PropTypes.number, timeMuted: PropTypes.string }; diff --git a/src/views/preview/comment/comment.jsx b/src/views/preview/comment/comment.jsx index 527d69c88..a571a1157 100644 --- a/src/views/preview/comment/comment.jsx +++ b/src/views/preview/comment/comment.jsx @@ -231,6 +231,7 @@ class Comment extends React.Component { {this.state.replying ? ( Date.now() && this.props.isReply, muteExpiresAtMs: muteExpiresAtMs, muteType: this.props.muteStatus.currentMessageType, showWarning: this.props.muteStatus.showWarning ? this.props.muteStatus.showWarning : false @@ -232,7 +232,7 @@ class ComposeComment extends React.Component { render () { return ( - {this.isMuted() ? ( + {(this.isMuted() && !this.props.isReply) ? (

@@ -344,6 +344,7 @@ class ComposeComment extends React.Component { muteModalMessages={this.getMuteMessageInfo()} shouldCloseOnOverlayClick={false} showWarning={this.state.showWarning} + startStep={this.props.isReply ? 1 : 0} timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)} onRequestClose={this.handleMuteClose} /> @@ -355,6 +356,7 @@ class ComposeComment extends React.Component { ComposeComment.propTypes = { commenteeId: PropTypes.number, + isReply: PropTypes.bool, muteStatus: PropTypes.shape({ offenses: PropTypes.array, muteExpiresAt: PropTypes.number, From cd057c280762528593712b4a1463a9407edd9b60 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 16:16:21 +0000 Subject: [PATCH 02/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210202035926 to 0.1.0-prerelease.20210202110057. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210202035926...0.1.0-prerelease.20210202110057) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c38a0488..a8fdc5840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1319,9 +1319,9 @@ "dev": true }, "@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==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -24178,9 +24178,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210202035926", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210202035926.tgz", - "integrity": "sha512-UetM3sZqM69uia8Mgh8lNmGkMTint0uaI4gK+VZezVlPvWiGJRSMG/ae8Hkj75y+1j6OYS8CqJUahD3HPa3PRw==", + "version": "0.1.0-prerelease.20210202110057", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210202110057.tgz", + "integrity": "sha512-7dy5VsccO4WWDL06t5QlwAxvy+ZwoasJfhDOLLcCzZAghmt4pg5Y3+TCDIB3lsjHgPNOuejzFyW3F+fD7OMf4w==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24237,7 +24237,7 @@ "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210114214521", - "scratch-vm": "0.2.0-prerelease.20210131100123", + "scratch-vm": "0.2.0-prerelease.20210202100335", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -24416,9 +24416,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.650", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.650.tgz", - "integrity": "sha512-j6pRuNylFBbroG6NB8Lw/Im9oDY74s2zWHBP5TmdYg73cBuL6cz//SMgolVa0gIJk/DSL+kO7baJ1DSXW1FUZg==", + "version": "1.3.652", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz", + "integrity": "sha512-85J5D0Ksxjq2MIHfgwOURRej72UMlexbaa7t+oKTJan3Pa/RBE8vJ4/JzwaQjLCElPvd0XeLWi7+xYTVrq96aA==", "dev": true }, "file-loader": { @@ -24961,9 +24961,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210131100123", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210131100123.tgz", - "integrity": "sha512-2ov+osjvJ7HDHKtYYFuBc6lnXYZOC3LjhYZpESOrbNA6Mhp550bjK0UGzH9XJtJQfcMBKXXR6cf6ymWNVvMBFQ==", + "version": "0.2.0-prerelease.20210202100335", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210202100335.tgz", + "integrity": "sha512-QXTrpUfGgvvnEuzmOiZBWyy6SxUuY+kTK9qsukc5cPtl9g2tAXDB5oRrsChimHKC+lfscd2pKhrf9eC+PTuVHg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 041bcbab9..8f4f7d2e0 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210202035926", + "scratch-gui": "0.1.0-prerelease.20210202110057", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From fd7bdc2c157953ac6e7634a92275c02718e9eac5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 16:20:04 +0000 Subject: [PATCH 03/19] Bump @formatjs/intl-locale from 2.4.13 to 2.4.14 Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.13 to 2.4.14. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.13...@formatjs/intl-locale@2.4.14) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c38a0488..8be63fd56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1441,17 +1441,26 @@ } }, "@formatjs/intl-locale": { - "version": "2.4.13", - "resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz", - "integrity": "sha512-hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ==", + "version": "2.4.14", + "resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.14.tgz", + "integrity": "sha512-BWjAx+1kiN2VvQvx2L41cv8gr40mBDA78PKhVKLq+cPeAp8lwMmnGWUYr1sUXNew31N1acb6fqNJUD5sBGB/wQ==", "dev": true, "requires": { - "@formatjs/ecma402-abstract": "1.5.1", + "@formatjs/ecma402-abstract": "1.5.2", "@formatjs/intl-getcanonicallocales": "1.5.3", "cldr-core": "38", "tslib": "^2.0.1" }, "dependencies": { + "@formatjs/ecma402-abstract": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.2.tgz", + "integrity": "sha512-rscxoLyIwH2x+l15Z4eD580ioO3CkFVoWDLgDtgiOnWzDzpL5EigDRg9V4mINb8W6bQRT1xnCxiRwvw3bgvqrA==", + "dev": true, + "requires": { + "tslib": "^2.0.1" + } + }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -4974,9 +4983,9 @@ "dev": true }, "cldr-core": { - "version": "38.0.0", - "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-38.0.0.tgz", - "integrity": "sha512-WkjA4zo5rLT/BWTZAxHJ0lJXwI33gCYucEz1+CpoI8Wu+rr5IrC57wyNXyrNNMdxfDE5RsWi/JCQ9qnG8sHTiw==", + "version": "38.1.0", + "resolved": "https://registry.npmjs.org/cldr-core/-/cldr-core-38.1.0.tgz", + "integrity": "sha512-Da9xKjDp4qGGIX0VDsBqTan09iR5nuYD2a/KkfEaUyqKhu6wFVNRiCpPDXeRbpVwPBY6PgemV8WiHatMhcpy4A==", "dev": true }, "clean-css": { From 9aacbcb3bf5190cb1d98e89ce792b4e754522f94 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 03:45:10 +0000 Subject: [PATCH 04/19] Bump scratch-l10n from 3.11.20210203031454 to 3.11.20210204031607 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210203031454 to 3.11.20210204031607. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210203031454...3.11.20210204031607) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 578669c1d..325677163 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24742,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210203031454", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210203031454.tgz", - "integrity": "sha512-JwI3YIZokOxv+kS9oS0gGxss1FjCMI6Mw7Rpi/n8sb8omulJ6T5mEEVHAl1Wu9GKtJgsPvJr9LPMeShBC/MMBg==", + "version": "3.11.20210204031607", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210204031607.tgz", + "integrity": "sha512-kztZ7D5c1f9c4vAJM29qGWlRgFS9tg+9v8R/1aUybnfkeo1zg820kKR9DzKt5ZGtxKoW58VBSvB/1sNyFh/Few==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 48a9d94a2a182a56c5487ea1fdce9824c12123eb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 11:33:30 +0000 Subject: [PATCH 05/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210202110057 to 0.1.0-prerelease.20210204101145. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210202110057...0.1.0-prerelease.20210204101145) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 42 +++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 325677163..d19e0e5fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24177,9 +24177,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210202033410", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210202033410.tgz", - "integrity": "sha512-kIr+BpasQkMq7Slv8U7QMlqumQNYHGUdlUc5T6JiK2825pvcyDYaVQBnOIEYqpS2jPYZ6CGPiSTeSUlfTSRiBQ==", + "version": "0.1.0-prerelease.20210204034503", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210204034503.tgz", + "integrity": "sha512-7vwwPee4KgKLaaNTxW6Nb+4CqtWeQZGY7nYNuu4wMyVz1yoYoTLmp3tTMGx30fgfBa1IWvaXCzHVBE58VbWSTA==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -24187,9 +24187,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210202110057", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210202110057.tgz", - "integrity": "sha512-7dy5VsccO4WWDL06t5QlwAxvy+ZwoasJfhDOLLcCzZAghmt4pg5Y3+TCDIB3lsjHgPNOuejzFyW3F+fD7OMf4w==", + "version": "0.1.0-prerelease.20210204101145", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210204101145.tgz", + "integrity": "sha512-KMNB1hEBWNHwyqWWBT/AyyTUYPTPNRiSQjLgXybFkycI66BS4/WZvM91UH2t9YxOEw4U02hJ5Fqm0gxIN8XQUw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24240,9 +24240,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210202033410", - "scratch-l10n": "3.11.20210202031504", - "scratch-paint": "0.2.0-prerelease.20210201044008", + "scratch-blocks": "0.1.0-prerelease.20210204034503", + "scratch-l10n": "3.11.20210204031607", + "scratch-paint": "0.2.0-prerelease.20210204061605", "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210114214521", @@ -24425,9 +24425,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.652", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz", - "integrity": "sha512-85J5D0Ksxjq2MIHfgwOURRej72UMlexbaa7t+oKTJan3Pa/RBE8vJ4/JzwaQjLCElPvd0XeLWi7+xYTVrq96aA==", + "version": "1.3.653", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.653.tgz", + "integrity": "sha512-LehOhcl74u9fkV9Un6WahJ+Xh+0FZLCCDnKYis1Olx1DX2ugRww5PJicE65OG8yznMj8EOQZRcz6FSV1xKxqsA==", "dev": true }, "file-loader": { @@ -24663,18 +24663,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210202031504", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210202031504.tgz", - "integrity": "sha512-AcJc1MZyX10jPCRnFia0nfz3jhgDiaAp7OMjGtzjuUAwEJ92EYDYZUuOgMS5IeOZzUJkOXx7vBKaUhL580BAVQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24754,9 +24742,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210201044008", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210201044008.tgz", - "integrity": "sha512-yLNGtINGaufv9Rmqj7ZfGi+SfmiaCa1g/IOdMvra8novlRtesc2ams6xiwxNxAAIz6B5JLa4LVRbU4B+VEFbKA==", + "version": "0.2.0-prerelease.20210204061605", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210204061605.tgz", + "integrity": "sha512-4NTy2wJloftNhQAuN7KK42qope8takZjfmkyxaOfYJ8v3F42kPqiTcjWn0xi9XNysi02JcUQUCWXctCHRxUOPA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 8f4f7d2e0..b97736b7b 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210202110057", + "scratch-gui": "0.1.0-prerelease.20210204101145", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 92667c097dc7651e47fdb45ede71d5cbaf8d2580 Mon Sep 17 00:00:00 2001 From: picklesrus Date: Thu, 4 Feb 2021 11:13:30 -0500 Subject: [PATCH 06/19] Add tests and expose steps enum so it can be referenced from outside MuteModal --- src/components/modal/mute/modal.jsx | 4 +- src/views/preview/comment/compose-comment.jsx | 2 +- test/unit/components/compose-comment.test.jsx | 41 +++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/components/modal/mute/modal.jsx b/src/components/modal/mute/modal.jsx index ae53a5bcb..dbeb1f304 100644 --- a/src/components/modal/mute/modal.jsx +++ b/src/components/modal/mute/modal.jsx @@ -240,8 +240,8 @@ MuteModal.propTypes = { }), onRequestClose: PropTypes.func, showWarning: PropTypes.bool, - startStep: PropTypes.number, + startStep: PropTypes.oneOf(Object.keys(steps)), timeMuted: PropTypes.string }; - +MuteModal.steps = steps; module.exports = injectIntl(MuteModal); diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx index 99cb6ffc2..300c6eff9 100644 --- a/src/views/preview/comment/compose-comment.jsx +++ b/src/views/preview/comment/compose-comment.jsx @@ -344,7 +344,7 @@ class ComposeComment extends React.Component { muteModalMessages={this.getMuteMessageInfo()} shouldCloseOnOverlayClick={false} showWarning={this.state.showWarning} - startStep={this.props.isReply ? 1 : 0} + startStep={this.props.isReply ? MuteModal.steps.MUTE_INFO : MuteModal.steps.COMMENT_ISSUE} timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)} onRequestClose={this.handleMuteClose} /> diff --git a/test/unit/components/compose-comment.test.jsx b/test/unit/components/compose-comment.test.jsx index bce8cb1fe..8b8f7caf0 100644 --- a/test/unit/components/compose-comment.test.jsx +++ b/test/unit/components/compose-comment.test.jsx @@ -101,6 +101,46 @@ describe('Compose Comment test', () => { global.Date.now = realDateNow; }); + test('Comment Status and compose box do not show on replies when muted, but mute modal does', () => { + const realDateNow = Date.now.bind(global.Date); + global.Date.now = () => 0; + const store = mockStore({ + session: { + session: { + user: {}, + permissions: { + mute_status: { + muteExpiresAt: 5, + offenses: [], + showWarning: true + } + } + } + } + }); + const component = mountWithIntl( + + , {context: {store}} + ); + expect(component.find('FlexRow.compose-comment').exists()).toEqual(false); + expect(component.find('MuteModal').exists()).toBe(true); + expect(component.find('MuteModal').props().startStep).toBe(1); + expect(component.find('CommentingStatus').exists()).toEqual(false); + global.Date.now = realDateNow; + }); + + test('Comment Status and compose box show on replies when not muted', () => { + const realDateNow = Date.now.bind(global.Date); + global.Date.now = () => 0; + const component = getComposeCommentWrapper({isReply:true}); + expect(component.find('FlexRow.compose-comment').exists()).toEqual(true); + expect(component.find('CommentingStatus').exists()).toEqual(false); + global.Date.now = realDateNow; + }); + test('Comment Status initialized properly when muted', () => { jest.useFakeTimers(); const realDateNow = Date.now.bind(global.Date); @@ -207,6 +247,7 @@ describe('Compose Comment test', () => { commentInstance.setState({muteOpen: true}); component.update(); expect(component.find('MuteModal').exists()).toEqual(true); + expect(component.find('MuteModal').props().startStep).toEqual(0); expect(component.find('MuteModal').props().showWarning).toBe(false); global.Date.now = realDateNow; }); From c26dad8312cd6902e826cfab82af26b9254121de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 03:37:19 +0000 Subject: [PATCH 07/19] Bump scratch-l10n from 3.11.20210204031607 to 3.11.20210205031546 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210204031607 to 3.11.20210205031546. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210204031607...3.11.20210205031546) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 66 ++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index d19e0e5fd..e33e1d0d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -258,9 +258,9 @@ } }, "@babel/generator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", - "integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz", + "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==", "dev": true, "requires": { "@babel/types": "^7.12.13", @@ -309,9 +309,9 @@ } }, "@babel/parser": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.13.tgz", - "integrity": "sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz", + "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==", "dev": true }, "@babel/template": { @@ -601,9 +601,9 @@ } }, "@babel/generator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", - "integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz", + "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==", "dev": true, "requires": { "@babel/types": "^7.12.13", @@ -652,9 +652,9 @@ } }, "@babel/parser": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.13.tgz", - "integrity": "sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz", + "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==", "dev": true }, "@babel/template": { @@ -840,9 +840,9 @@ } }, "@babel/generator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", - "integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz", + "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==", "dev": true, "requires": { "@babel/types": "^7.12.13", @@ -891,9 +891,9 @@ } }, "@babel/parser": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.13.tgz", - "integrity": "sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz", + "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==", "dev": true }, "@babel/template": { @@ -1087,9 +1087,9 @@ } }, "@babel/generator": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", - "integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz", + "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==", "dev": true, "requires": { "@babel/types": "^7.12.13", @@ -1138,9 +1138,9 @@ } }, "@babel/parser": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.13.tgz", - "integrity": "sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.15.tgz", + "integrity": "sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA==", "dev": true }, "@babel/template": { @@ -24663,6 +24663,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210204031607", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210204031607.tgz", + "integrity": "sha512-kztZ7D5c1f9c4vAJM29qGWlRgFS9tg+9v8R/1aUybnfkeo1zg820kKR9DzKt5ZGtxKoW58VBSvB/1sNyFh/Few==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24730,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210204031607", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210204031607.tgz", - "integrity": "sha512-kztZ7D5c1f9c4vAJM29qGWlRgFS9tg+9v8R/1aUybnfkeo1zg820kKR9DzKt5ZGtxKoW58VBSvB/1sNyFh/Few==", + "version": "3.11.20210205031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210205031546.tgz", + "integrity": "sha512-xxCTbUQklPoNCbBOToSs6VW+eeJd92YRZ9qkF1a+tUQGXorWnD1lhXmOlggAdf/hl1Tc/ZYdofuqR0/hbP5SKQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From f4c6f8b4e483315fccc5d439f0d1b35c275b62be Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 10:43:55 +0000 Subject: [PATCH 08/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210204101145 to 0.1.0-prerelease.20210205041308. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210204101145...0.1.0-prerelease.20210205041308) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 40 ++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index e33e1d0d4..2e21ca5e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4718,9 +4718,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001183", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz", - "integrity": "sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw==", + "version": "1.0.30001185", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz", + "integrity": "sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==", "dev": true }, "canvas-fit": { @@ -24177,9 +24177,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210204034503", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210204034503.tgz", - "integrity": "sha512-7vwwPee4KgKLaaNTxW6Nb+4CqtWeQZGY7nYNuu4wMyVz1yoYoTLmp3tTMGx30fgfBa1IWvaXCzHVBE58VbWSTA==", + "version": "0.1.0-prerelease.20210205033912", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210205033912.tgz", + "integrity": "sha512-zwj9fdReCIGN+4PkYDF7PH1WOMN4SAeA9S8lUyuxK0pLigOWRgLCKGnYr0P1gsMr0t10Hw8LjTrP3uTwpBCUwA==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -24187,9 +24187,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210204101145", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210204101145.tgz", - "integrity": "sha512-KMNB1hEBWNHwyqWWBT/AyyTUYPTPNRiSQjLgXybFkycI66BS4/WZvM91UH2t9YxOEw4U02hJ5Fqm0gxIN8XQUw==", + "version": "0.1.0-prerelease.20210205041308", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210205041308.tgz", + "integrity": "sha512-QxYG5HzTomSUxYxP6HOdtiirAXuS0U9XgUIK7CZcuxhcVw+ZzzI2oHP/18WwB7TgX+w0OHLW6nYYvUe5BH3vgg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24240,8 +24240,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210204034503", - "scratch-l10n": "3.11.20210204031607", + "scratch-blocks": "0.1.0-prerelease.20210205033912", + "scratch-l10n": "3.11.20210205031546", "scratch-paint": "0.2.0-prerelease.20210204061605", "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", @@ -24425,9 +24425,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.653", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.653.tgz", - "integrity": "sha512-LehOhcl74u9fkV9Un6WahJ+Xh+0FZLCCDnKYis1Olx1DX2ugRww5PJicE65OG8yznMj8EOQZRcz6FSV1xKxqsA==", + "version": "1.3.654", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.654.tgz", + "integrity": "sha512-Zy2gc/c8KYFg2GkNr7Ruzh5tPEZpFm7EyXqZTFasm1YRDJtpyBRGaOuM0H3t6SuIP53qX4kNmtO9t0WjhBjE9A==", "dev": true }, "file-loader": { @@ -24663,18 +24663,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210204031607", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210204031607.tgz", - "integrity": "sha512-kztZ7D5c1f9c4vAJM29qGWlRgFS9tg+9v8R/1aUybnfkeo1zg820kKR9DzKt5ZGtxKoW58VBSvB/1sNyFh/Few==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", diff --git a/package.json b/package.json index b97736b7b..295bdb454 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210204101145", + "scratch-gui": "0.1.0-prerelease.20210205041308", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 9a3fe8f22238bd622281100f57cc7ac378aa45e2 Mon Sep 17 00:00:00 2001 From: picklesrus Date: Fri, 5 Feb 2021 08:01:33 -0500 Subject: [PATCH 09/19] Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted. --- src/views/preview/comment/compose-comment.jsx | 10 +++++++- test/unit/components/compose-comment.test.jsx | 23 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx index 300c6eff9..ac38d39b7 100644 --- a/src/views/preview/comment/compose-comment.jsx +++ b/src/views/preview/comment/compose-comment.jsx @@ -187,6 +187,14 @@ class ComposeComment extends React.Component { return creationTimeMinutesAgo < 2 && numOffenses === 1; } + getMuteModalStartStep () { + // Decides which step of the mute modal to start on. If this was a reply button click, + // we show them the step that tells them how much time is left on their mute, otherwise + // they start at the beginning of the progression. + return this.props.isReply && this.state.status !== ComposeStatus.REJECTED_MUTE ? + MuteModal.steps.MUTE_INFO : MuteModal.steps.COMMENT_ISSUE; + } + getMuteMessageInfo () { // return the ids for the messages that are shown for this mute type // If mute modals have more than one unique "step" we could pass an array of steps @@ -344,7 +352,7 @@ class ComposeComment extends React.Component { muteModalMessages={this.getMuteMessageInfo()} shouldCloseOnOverlayClick={false} showWarning={this.state.showWarning} - startStep={this.props.isReply ? MuteModal.steps.MUTE_INFO : MuteModal.steps.COMMENT_ISSUE} + startStep={this.getMuteModalStartStep()} timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)} onRequestClose={this.handleMuteClose} /> diff --git a/test/unit/components/compose-comment.test.jsx b/test/unit/components/compose-comment.test.jsx index 8b8f7caf0..0da7374d7 100644 --- a/test/unit/components/compose-comment.test.jsx +++ b/test/unit/components/compose-comment.test.jsx @@ -135,7 +135,7 @@ describe('Compose Comment test', () => { test('Comment Status and compose box show on replies when not muted', () => { const realDateNow = Date.now.bind(global.Date); global.Date.now = () => 0; - const component = getComposeCommentWrapper({isReply:true}); + const component = getComposeCommentWrapper({isReply: true}); expect(component.find('FlexRow.compose-comment').exists()).toEqual(true); expect(component.find('CommentingStatus').exists()).toEqual(false); global.Date.now = realDateNow; @@ -362,6 +362,27 @@ describe('Compose Comment test', () => { global.Date.now = realDateNow; }); + test('getMuteModalStartStep: not a reply ', () => { + const commentInstance = getComposeCommentWrapper({}).instance(); + expect(commentInstance.getMuteModalStartStep()).toBe(0); + }); + + test('getMuteModalStartStep: A reply that got them muted ', () => { + const commentInstance = getComposeCommentWrapper({isReply: true}).instance(); + commentInstance.setState({ + status: 'REJECTED_MUTE' + }); + expect(commentInstance.getMuteModalStartStep()).toBe(0); + }); + + test('getMuteModalStartStep: A reply click when already muted ', () => { + const commentInstance = getComposeCommentWrapper({isReply: true}).instance(); + commentInstance.setState({ + status: 'EDITING' + }); + expect(commentInstance.getMuteModalStartStep()).toBe(1); + }); + test('isMuted: expiration is in the future ', () => { const realDateNow = Date.now.bind(global.Date); global.Date.now = () => 0; // Set "now" to 0 for easier testing. From de5a8026c189c16cc8bd013e9e9a51376b775331 Mon Sep 17 00:00:00 2001 From: picklesrus Date: Fri, 5 Feb 2021 08:16:00 -0500 Subject: [PATCH 10/19] Show the blue box on replies that got the user muted. --- src/views/preview/comment/compose-comment.jsx | 2 +- test/unit/components/compose-comment.test.jsx | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx index ac38d39b7..46be968fe 100644 --- a/src/views/preview/comment/compose-comment.jsx +++ b/src/views/preview/comment/compose-comment.jsx @@ -240,7 +240,7 @@ class ComposeComment extends React.Component { render () { return ( - {(this.isMuted() && !this.props.isReply) ? ( + {(this.isMuted() && !(this.props.isReply && this.state.status !== ComposeStatus.REJECTED_MUTE)) ? (

diff --git a/test/unit/components/compose-comment.test.jsx b/test/unit/components/compose-comment.test.jsx index 0da7374d7..c57cffb75 100644 --- a/test/unit/components/compose-comment.test.jsx +++ b/test/unit/components/compose-comment.test.jsx @@ -173,6 +173,27 @@ describe('Compose Comment test', () => { global.Date.now = realDateNow; }); + test('Comment Status shows when user just submitted a reply comment that got them muted', () => { + const realDateNow = Date.now.bind(global.Date); + global.Date.now = () => 0; + const component = getComposeCommentWrapper({isReply: true}); + const commentInstance = component.instance(); + commentInstance.setState({ + status: 'REJECTED_MUTE', + muteExpiresAtMs: 100 + }); + component.update(); + expect(component.find('FlexRow.compose-comment').exists()).toEqual(true); + expect(component.find('MuteModal').exists()).toEqual(false); + expect(component.find('CommentingStatus').exists()).toEqual(true); + // Compose box exists but is disabled + expect(component.find('InplaceInput.compose-input').exists()).toEqual(true); + expect(component.find('InplaceInput.compose-input').props().disabled).toBe(true); + expect(component.find('Button.compose-post').props().disabled).toBe(true); + expect(component.find('Button.compose-cancel').props().disabled).toBe(true); + global.Date.now = realDateNow; + }); + test('Comment Status shows when user just submitted a comment that got them muted', () => { const realDateNow = Date.now.bind(global.Date); global.Date.now = () => 0; From 7ce2604f01e287587868bb2827ad521f428a146a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 6 Feb 2021 03:21:41 +0000 Subject: [PATCH 11/19] Bump scratch-l10n from 3.11.20210205031546 to 3.11.20210206031558 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210205031546 to 3.11.20210206031558. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210205031546...3.11.20210206031558) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e21ca5e2..9986a77f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,9 +95,9 @@ } }, "fsevents": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", - "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -24663,6 +24663,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210205031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210205031546.tgz", + "integrity": "sha512-xxCTbUQklPoNCbBOToSs6VW+eeJd92YRZ9qkF1a+tUQGXorWnD1lhXmOlggAdf/hl1Tc/ZYdofuqR0/hbP5SKQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24730,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210205031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210205031546.tgz", - "integrity": "sha512-xxCTbUQklPoNCbBOToSs6VW+eeJd92YRZ9qkF1a+tUQGXorWnD1lhXmOlggAdf/hl1Tc/ZYdofuqR0/hbP5SKQ==", + "version": "3.11.20210206031558", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210206031558.tgz", + "integrity": "sha512-3QuPTonfy5C4Jn2eskpmTcazfbKxem2gPZj9vpfnEgswrwNtT0Ch390nlLfX27PyNwRQuDh+op8uL1LF/sknHg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From bf0e511016ddfb1c599907e7c6d9935264121444 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 7 Feb 2021 03:24:30 +0000 Subject: [PATCH 12/19] Bump scratch-l10n from 3.11.20210206031558 to 3.11.20210207031837 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210206031558 to 3.11.20210207031837. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210206031558...3.11.20210207031837) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9986a77f2..4ee8ef3fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24742,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210206031558", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210206031558.tgz", - "integrity": "sha512-3QuPTonfy5C4Jn2eskpmTcazfbKxem2gPZj9vpfnEgswrwNtT0Ch390nlLfX27PyNwRQuDh+op8uL1LF/sknHg==", + "version": "3.11.20210207031837", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210207031837.tgz", + "integrity": "sha512-MjLwZSixDn7hUxcOtEsY6MflZJkGKLudLn81j0ROmZFYzBtttNgoXZlqI3mzyiay80mVElyimwbHHk5E1ExHsg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From ef0058388a8752c299093dc7992a1a71bd35bc31 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 03:47:12 +0000 Subject: [PATCH 13/19] Bump scratch-l10n from 3.11.20210207031837 to 3.11.20210208031546 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210207031837 to 3.11.20210208031546. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210207031837...3.11.20210208031546) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ee8ef3fd..e7e2c1d34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24742,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210207031837", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210207031837.tgz", - "integrity": "sha512-MjLwZSixDn7hUxcOtEsY6MflZJkGKLudLn81j0ROmZFYzBtttNgoXZlqI3mzyiay80mVElyimwbHHk5E1ExHsg==", + "version": "3.11.20210208031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210208031546.tgz", + "integrity": "sha512-edTHTU9b0MStS901iywPD3w9dfpgtAPD+5EXz21JblsJTSpiK4a4NkdEtnp7oCiRoLrphsrBqNuLjjLKC33TFA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From af2c38024fe6881f82fea8b7238340dcb214183a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:54:55 +0000 Subject: [PATCH 14/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210205041308 to 0.1.0-prerelease.20210208043947. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210205041308...0.1.0-prerelease.20210208043947) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 42 +++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7e2c1d34..d19c86dca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24177,9 +24177,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210205033912", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210205033912.tgz", - "integrity": "sha512-zwj9fdReCIGN+4PkYDF7PH1WOMN4SAeA9S8lUyuxK0pLigOWRgLCKGnYr0P1gsMr0t10Hw8LjTrP3uTwpBCUwA==", + "version": "0.1.0-prerelease.20210208034746", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210208034746.tgz", + "integrity": "sha512-t487fkADA6CQ0tXBRxwY1HMymK81w3XGGLuvprOimWSEm8MIwGCNeXdkAHWQQhzgssCDf7+LLo9j18klMR5bTA==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -24187,9 +24187,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210205041308", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210205041308.tgz", - "integrity": "sha512-QxYG5HzTomSUxYxP6HOdtiirAXuS0U9XgUIK7CZcuxhcVw+ZzzI2oHP/18WwB7TgX+w0OHLW6nYYvUe5BH3vgg==", + "version": "0.1.0-prerelease.20210208043947", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210208043947.tgz", + "integrity": "sha512-0a94w/DUTiPRnWu7Jk0l2d+0oh1EkQd+p79VQ6VAnCKpNYYgTORt5+cDNOG5voZmdfgZaq7R4UnhaUZby5XLyg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24240,9 +24240,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210205033912", - "scratch-l10n": "3.11.20210205031546", - "scratch-paint": "0.2.0-prerelease.20210204061605", + "scratch-blocks": "0.1.0-prerelease.20210208034746", + "scratch-l10n": "3.11.20210208031546", + "scratch-paint": "0.2.0-prerelease.20210207032901", "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210114214521", @@ -24425,9 +24425,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.654", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.654.tgz", - "integrity": "sha512-Zy2gc/c8KYFg2GkNr7Ruzh5tPEZpFm7EyXqZTFasm1YRDJtpyBRGaOuM0H3t6SuIP53qX4kNmtO9t0WjhBjE9A==", + "version": "1.3.657", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz", + "integrity": "sha512-/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw==", "dev": true }, "file-loader": { @@ -24663,18 +24663,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210205031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210205031546.tgz", - "integrity": "sha512-xxCTbUQklPoNCbBOToSs6VW+eeJd92YRZ9qkF1a+tUQGXorWnD1lhXmOlggAdf/hl1Tc/ZYdofuqR0/hbP5SKQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24754,9 +24742,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210204061605", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210204061605.tgz", - "integrity": "sha512-4NTy2wJloftNhQAuN7KK42qope8takZjfmkyxaOfYJ8v3F42kPqiTcjWn0xi9XNysi02JcUQUCWXctCHRxUOPA==", + "version": "0.2.0-prerelease.20210207032901", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210207032901.tgz", + "integrity": "sha512-cEBOp+1iiNg/eodqJqd31BvYC1CSg2gWlFw24133HF3cvGWhIJGtc/7ErGaGN/uaAmJU8OHivLJRqSLRaT5fkQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 295bdb454..f4196de34 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210205041308", + "scratch-gui": "0.1.0-prerelease.20210208043947", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 7c382a73faa4f39b9adbc397424f1b2fd1986bac Mon Sep 17 00:00:00 2001 From: picklesrus Date: Mon, 8 Feb 2021 07:38:39 -0500 Subject: [PATCH 15/19] Fix double reply button click bug by "cancelling" the reply when you click it and are already muted. --- src/views/preview/comment/compose-comment.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx index 46be968fe..4bacc88d0 100644 --- a/src/views/preview/comment/compose-comment.jsx +++ b/src/views/preview/comment/compose-comment.jsx @@ -147,6 +147,13 @@ class ComposeComment extends React.Component { this.setState({ muteOpen: false }); + + // Cancel (i.e. complete) the reply action if the user clicked on the reply button while + // alreay muted. This "closes" the reply. If they just got muted, we want to leave it open + // so the blue CommentingStatus box shows. + if (this.props.isReply && this.state.status !== ComposeStatus.REJECTED_MUTE) { + this.handleCancel(); + } } handleMuteOpen () { From 2f82ef04da5441b38b26d67c6d37737aff7f2b27 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 03:23:05 +0000 Subject: [PATCH 16/19] Bump scratch-l10n from 3.11.20210208031546 to 3.11.20210209031515 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210208031546 to 3.11.20210209031515. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210208031546...3.11.20210209031515) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d19c86dca..9a73a5f68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24663,6 +24663,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210208031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210208031546.tgz", + "integrity": "sha512-edTHTU9b0MStS901iywPD3w9dfpgtAPD+5EXz21JblsJTSpiK4a4NkdEtnp7oCiRoLrphsrBqNuLjjLKC33TFA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24730,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210208031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210208031546.tgz", - "integrity": "sha512-edTHTU9b0MStS901iywPD3w9dfpgtAPD+5EXz21JblsJTSpiK4a4NkdEtnp7oCiRoLrphsrBqNuLjjLKC33TFA==", + "version": "3.11.20210209031515", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210209031515.tgz", + "integrity": "sha512-0f+8hi3YVHxy7xZr1B3bRvpHoHWfGeKLkSNM0mlip8BB9HFmBVykkjiJuKXuQCHOqEWn1a/G4qrG7W47R3VJ1A==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 6c19ed7f9ba0c32ae1282e4ecf7e6affb40c1eb0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 10:40:50 +0000 Subject: [PATCH 17/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210208043947 to 0.1.0-prerelease.20210209053420. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210208043947...0.1.0-prerelease.20210209053420) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a73a5f68..109377b38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24187,9 +24187,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210208043947", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210208043947.tgz", - "integrity": "sha512-0a94w/DUTiPRnWu7Jk0l2d+0oh1EkQd+p79VQ6VAnCKpNYYgTORt5+cDNOG5voZmdfgZaq7R4UnhaUZby5XLyg==", + "version": "0.1.0-prerelease.20210209053420", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210209053420.tgz", + "integrity": "sha512-Ic3x0Zemts55mHGzy60xs5AqSKd6RHp99/C+itw9S3FUEY3KUy3Waunwf4hylyo7gCcXHhyC0itLmnZ/6Cu90Q==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24241,8 +24241,8 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210208034746", - "scratch-l10n": "3.11.20210208031546", - "scratch-paint": "0.2.0-prerelease.20210207032901", + "scratch-l10n": "3.11.20210209031515", + "scratch-paint": "0.2.0-prerelease.20210209044554", "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210114214521", @@ -24425,9 +24425,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.657", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.657.tgz", - "integrity": "sha512-/9ROOyvEflEbaZFUeGofD+Tqs/WynbSTbNgNF+/TJJxH1ePD/e6VjZlDJpW3FFFd3nj5l3Hd8ki2vRwy+gyRFw==", + "version": "1.3.659", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.659.tgz", + "integrity": "sha512-VPc1LcvuQYGjam6k7JcB6uJFTMo2YNlJ6rSbwbxApZQdow7X81kh/vDB6LB5B8DNmvkbKnpZkLmpKmnvoKA+Gw==", "dev": true }, "file-loader": { @@ -24663,18 +24663,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210208031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210208031546.tgz", - "integrity": "sha512-edTHTU9b0MStS901iywPD3w9dfpgtAPD+5EXz21JblsJTSpiK4a4NkdEtnp7oCiRoLrphsrBqNuLjjLKC33TFA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24754,9 +24742,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210207032901", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210207032901.tgz", - "integrity": "sha512-cEBOp+1iiNg/eodqJqd31BvYC1CSg2gWlFw24133HF3cvGWhIJGtc/7ErGaGN/uaAmJU8OHivLJRqSLRaT5fkQ==", + "version": "0.2.0-prerelease.20210209044554", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210209044554.tgz", + "integrity": "sha512-rfwcxTO5NNoJtGcfEqZrs8OrTi37m1JXEwiV6Yvg8RVzwHZY8G/D8h61ekD7yz6eFZl9oODtM56mD4UxtrwWJQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index f4196de34..01f65fe42 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210208043947", + "scratch-gui": "0.1.0-prerelease.20210209053420", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 2ef2845406b246f785d151a9be2b50773598bb0f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 03:28:10 +0000 Subject: [PATCH 18/19] Bump scratch-l10n from 3.11.20210209031515 to 3.11.20210210031517 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210209031515 to 3.11.20210210031517. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210209031515...3.11.20210210031517) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 109377b38..789b30412 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24663,6 +24663,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.11.20210209031515", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210209031515.tgz", + "integrity": "sha512-0f+8hi3YVHxy7xZr1B3bRvpHoHWfGeKLkSNM0mlip8BB9HFmBVykkjiJuKXuQCHOqEWn1a/G4qrG7W47R3VJ1A==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24730,9 +24742,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210209031515", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210209031515.tgz", - "integrity": "sha512-0f+8hi3YVHxy7xZr1B3bRvpHoHWfGeKLkSNM0mlip8BB9HFmBVykkjiJuKXuQCHOqEWn1a/G4qrG7W47R3VJ1A==", + "version": "3.11.20210210031517", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210210031517.tgz", + "integrity": "sha512-mtBxXPsXzfXdTMMPEs+QXFTJ46e1GUKhmSSjFjQcFXVaOkTWDyjsgYn3eT0v5fS9xG+whRD6E1tAOdunCblwQQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From dcf746b4e9cfede54081817889d390f15e1b44b9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 10:49:55 +0000 Subject: [PATCH 19/19] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210209053420 to 0.1.0-prerelease.20210210053415. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210209053420...0.1.0-prerelease.20210210053415) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 42 +++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 789b30412..d04b4386f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24177,9 +24177,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210208034746", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210208034746.tgz", - "integrity": "sha512-t487fkADA6CQ0tXBRxwY1HMymK81w3XGGLuvprOimWSEm8MIwGCNeXdkAHWQQhzgssCDf7+LLo9j18klMR5bTA==", + "version": "0.1.0-prerelease.20210210034743", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210210034743.tgz", + "integrity": "sha512-7yU1wkgDbQl72o3NaS767GCAMCYaZkrBT9XPWJejFCzORJJcBcbi1nKtLjGUWhei/H8sB1nubBDDR2Z0rRJtPw==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -24187,9 +24187,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210209053420", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210209053420.tgz", - "integrity": "sha512-Ic3x0Zemts55mHGzy60xs5AqSKd6RHp99/C+itw9S3FUEY3KUy3Waunwf4hylyo7gCcXHhyC0itLmnZ/6Cu90Q==", + "version": "0.1.0-prerelease.20210210053415", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210210053415.tgz", + "integrity": "sha512-2NFpAtXuva5wPsr343dNKIzdJW6RCQYuPsXJopeylCr5cd7fJSTS6j0UISzMWE7FDlRsTEAD3qozEbJlKAhc9g==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -24240,9 +24240,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210208034746", - "scratch-l10n": "3.11.20210209031515", - "scratch-paint": "0.2.0-prerelease.20210209044554", + "scratch-blocks": "0.1.0-prerelease.20210210034743", + "scratch-l10n": "3.11.20210210031517", + "scratch-paint": "0.2.0-prerelease.20210210044507", "scratch-render": "0.1.0-prerelease.20210115005247", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210114214521", @@ -24425,9 +24425,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.659", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.659.tgz", - "integrity": "sha512-VPc1LcvuQYGjam6k7JcB6uJFTMo2YNlJ6rSbwbxApZQdow7X81kh/vDB6LB5B8DNmvkbKnpZkLmpKmnvoKA+Gw==", + "version": "1.3.661", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.661.tgz", + "integrity": "sha512-INNzKoL9ceOpPCpF5J+Fp9AOHY1RegwKViohAyTzV3XbkuRUx04r4v8edsDbevsog8UuL0GvD/Qerr2HwVTlSA==", "dev": true }, "file-loader": { @@ -24663,18 +24663,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210209031515", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210209031515.tgz", - "integrity": "sha512-0f+8hi3YVHxy7xZr1B3bRvpHoHWfGeKLkSNM0mlip8BB9HFmBVykkjiJuKXuQCHOqEWn1a/G4qrG7W47R3VJ1A==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -24754,9 +24742,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210209044554", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210209044554.tgz", - "integrity": "sha512-rfwcxTO5NNoJtGcfEqZrs8OrTi37m1JXEwiV6Yvg8RVzwHZY8G/D8h61ekD7yz6eFZl9oODtM56mD4UxtrwWJQ==", + "version": "0.2.0-prerelease.20210210044507", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210210044507.tgz", + "integrity": "sha512-W05EU07pDNvqQL4kKlYAijslKhX2rmMXbWhUYrta1ykhfk485N1v6YC22iWzrpv7G5jO+EGfoauzzZbyYUC+8w==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 01f65fe42..0c73add44 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210209053420", + "scratch-gui": "0.1.0-prerelease.20210210053415", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",