From 5a7cb21ea5311e04231a39b0939b391070f5719b Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Wed, 21 Oct 2020 15:03:13 -0400
Subject: [PATCH 01/33] Add "FloralSunset" to Credits Page
---
src/views/credits/people.json | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/views/credits/people.json b/src/views/credits/people.json
index d4dd76593..56e16d87e 100644
--- a/src/views/credits/people.json
+++ b/src/views/credits/people.json
@@ -44,6 +44,11 @@
"userId": 1494,
"name": "Chris"
},
+ {
+ "userName": "floralsunset",
+ "userId": 64635632,
+ "name": "Cindy"
+ },
{
"userName": "cwillisf",
"userId": 3532363,
From 590873c7658d326c5de720b572e35dbbac35b248 Mon Sep 17 00:00:00 2001
From: Ben Wheeler
Date: Tue, 24 Nov 2020 13:54:11 -0500
Subject: [PATCH 02/33] switch educator registration checkusername endpoint
from scratchr2 to api
---
src/components/registration/steps.jsx | 11 +++++++----
src/lib/validate.js | 2 ++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index d38639965..b7b470792 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -109,17 +109,20 @@ class UsernameStep extends React.Component {
}
api({
- host: '',
- uri: `/accounts/check_username/${username}/`
+ uri: `/accounts/checkusername/${username}/`
}, (err, body, res) => {
if (err || res.statusCode !== 200) {
err = err || this.props.intl.formatMessage({id: 'general.error'});
this.form.formsy.updateInputsWithError({all: err});
return callback(false);
}
- body = body[0];
+ // get the message in a way that will work for both scratchr2 and api
+ // versions of the checkusername endpoint
+ let msg = '';
+ if (body && body.msg) msg = body.msg;
+ else if (body && body[0]) msg = body[0].msg;
- switch (body.msg) {
+ switch (msg) {
case 'valid username':
this.setState({
validUsername: 'pass'
diff --git a/src/lib/validate.js b/src/lib/validate.js
index 3e734ac77..d97b46a64 100644
--- a/src/lib/validate.js
+++ b/src/lib/validate.js
@@ -25,6 +25,8 @@ module.exports.validateUsernameRemotely = username => (
if (err || res.statusCode !== 200) {
resolve({requestSucceeded: false, valid: false, errMsgId: 'general.error'});
}
+ // get the message in a way that will work for both scratchr2 and api
+ // versions of the checkusername endpoint
let msg = '';
if (body && body.msg) msg = body.msg;
else if (body && body[0]) msg = body[0].msg;
From 88aee16cb715a470eb1af6787c0acce5413af547 Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Thu, 10 Dec 2020 16:59:07 -0500
Subject: [PATCH 03/33] Move to fix alphabetization
---
src/views/credits/people.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/credits/people.json b/src/views/credits/people.json
index 56e16d87e..f52b0758a 100644
--- a/src/views/credits/people.json
+++ b/src/views/credits/people.json
@@ -44,11 +44,6 @@
"userId": 1494,
"name": "Chris"
},
- {
- "userName": "floralsunset",
- "userId": 64635632,
- "name": "Cindy"
- },
{
"userName": "cwillisf",
"userId": 3532363,
@@ -59,6 +54,11 @@
"userId": 2755634,
"name": "Christan"
},
+ {
+ "userName": "floralsunset",
+ "userId": 64635632,
+ "name": "Cindy"
+ },
{
"userName": "codubee",
"userId": 10866958,
From c40f44431cfbaec3ce3a5e9ba15e2d16451a6a5f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 03:36:50 +0000
Subject: [PATCH 04/33] Bump scratch-l10n from 3.10.20201215031549 to
3.10.20201216031625
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201215031549 to 3.10.20201216031625.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201215031549...3.10.20201216031625)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 262 ++++++++++++++++++++++++----------------------
1 file changed, 137 insertions(+), 125 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b6baf0ec9..0df2ae388 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -249,34 +249,34 @@
},
"dependencies": {
"@babel/code-frame": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
- "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+ "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
"dev": true,
"requires": {
"@babel/highlight": "^7.10.4"
}
},
"@babel/generator": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
- "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+ "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.10",
+ "@babel/types": "^7.12.11",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
},
"@babel/helper-function-name": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
- "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
+ "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.10.4",
- "@babel/template": "^7.10.4",
- "@babel/types": "^7.10.4"
+ "@babel/helper-get-function-arity": "^7.12.10",
+ "@babel/template": "^7.12.7",
+ "@babel/types": "^7.12.11"
}
},
"@babel/helper-get-function-arity": {
@@ -289,12 +289,12 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
- "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
+ "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
"dev": true,
"requires": {
- "@babel/types": "^7.11.0"
+ "@babel/types": "^7.12.11"
}
},
"@babel/highlight": {
@@ -309,9 +309,9 @@
}
},
"@babel/parser": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
- "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
+ "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
"dev": true
},
"@babel/template": {
@@ -343,12 +343,12 @@
}
},
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -516,12 +516,12 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -550,12 +550,12 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -592,34 +592,34 @@
},
"dependencies": {
"@babel/code-frame": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
- "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+ "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
"dev": true,
"requires": {
"@babel/highlight": "^7.10.4"
}
},
"@babel/generator": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
- "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+ "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.10",
+ "@babel/types": "^7.12.11",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
},
"@babel/helper-function-name": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
- "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
+ "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.10.4",
- "@babel/template": "^7.10.4",
- "@babel/types": "^7.10.4"
+ "@babel/helper-get-function-arity": "^7.12.10",
+ "@babel/template": "^7.12.7",
+ "@babel/types": "^7.12.11"
}
},
"@babel/helper-get-function-arity": {
@@ -632,12 +632,12 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
- "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
+ "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
"dev": true,
"requires": {
- "@babel/types": "^7.11.0"
+ "@babel/types": "^7.12.11"
}
},
"@babel/highlight": {
@@ -652,9 +652,9 @@
}
},
"@babel/parser": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
- "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
+ "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
"dev": true
},
"@babel/template": {
@@ -686,12 +686,12 @@
}
},
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -788,12 +788,12 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -819,46 +819,46 @@
"dev": true
},
"@babel/helper-replace-supers": {
- "version": "7.12.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
- "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz",
+ "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==",
"dev": true,
"requires": {
- "@babel/helper-member-expression-to-functions": "^7.12.1",
- "@babel/helper-optimise-call-expression": "^7.10.4",
- "@babel/traverse": "^7.12.5",
- "@babel/types": "^7.12.5"
+ "@babel/helper-member-expression-to-functions": "^7.12.7",
+ "@babel/helper-optimise-call-expression": "^7.12.10",
+ "@babel/traverse": "^7.12.10",
+ "@babel/types": "^7.12.11"
},
"dependencies": {
"@babel/code-frame": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
- "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+ "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
"dev": true,
"requires": {
"@babel/highlight": "^7.10.4"
}
},
"@babel/generator": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
- "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+ "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.10",
+ "@babel/types": "^7.12.11",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
},
"@babel/helper-function-name": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
- "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
+ "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.10.4",
- "@babel/template": "^7.10.4",
- "@babel/types": "^7.10.4"
+ "@babel/helper-get-function-arity": "^7.12.10",
+ "@babel/template": "^7.12.7",
+ "@babel/types": "^7.12.11"
}
},
"@babel/helper-get-function-arity": {
@@ -871,12 +871,12 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
- "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
+ "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
"dev": true,
"requires": {
- "@babel/types": "^7.11.0"
+ "@babel/types": "^7.12.11"
}
},
"@babel/highlight": {
@@ -891,9 +891,9 @@
}
},
"@babel/parser": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
- "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
+ "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
"dev": true
},
"@babel/template": {
@@ -925,12 +925,12 @@
}
},
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -1027,12 +1027,12 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -1061,9 +1061,9 @@
}
},
"@babel/helper-validator-identifier": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
- "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+ "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
"dev": true
},
"@babel/helpers": {
@@ -1078,34 +1078,34 @@
},
"dependencies": {
"@babel/code-frame": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
- "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+ "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
"dev": true,
"requires": {
"@babel/highlight": "^7.10.4"
}
},
"@babel/generator": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
- "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
+ "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.10",
+ "@babel/types": "^7.12.11",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
},
"@babel/helper-function-name": {
- "version": "7.10.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
- "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz",
+ "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==",
"dev": true,
"requires": {
- "@babel/helper-get-function-arity": "^7.10.4",
- "@babel/template": "^7.10.4",
- "@babel/types": "^7.10.4"
+ "@babel/helper-get-function-arity": "^7.12.10",
+ "@babel/template": "^7.12.7",
+ "@babel/types": "^7.12.11"
}
},
"@babel/helper-get-function-arity": {
@@ -1118,12 +1118,12 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.11.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
- "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz",
+ "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==",
"dev": true,
"requires": {
- "@babel/types": "^7.11.0"
+ "@babel/types": "^7.12.11"
}
},
"@babel/highlight": {
@@ -1138,9 +1138,9 @@
}
},
"@babel/parser": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
- "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
+ "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
"dev": true
},
"@babel/template": {
@@ -1172,12 +1172,12 @@
}
},
"@babel/types": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
- "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+ "version": "7.12.11",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
+ "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.10.4",
+ "@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
"to-fast-properties": "^2.0.0"
}
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201215031549",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201215031549.tgz",
+ "integrity": "sha512-YE1sq/NGiONV0hOZSyAsVi62qd4MhCiVEyCvv6FuaE5xiSOXM/zsFgSgB3PfrPbjGOu90cPgl9DPw3cx4LYP5A==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201215031549",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201215031549.tgz",
- "integrity": "sha512-YE1sq/NGiONV0hOZSyAsVi62qd4MhCiVEyCvv6FuaE5xiSOXM/zsFgSgB3PfrPbjGOu90cPgl9DPw3cx4LYP5A==",
+ "version": "3.10.20201216031625",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201216031625.tgz",
+ "integrity": "sha512-sBkeOteNgdOlsSNoGb5aaMgy/eWfLmntHhU0zdFawzG9vv/Ay7Ga/KLck2hvW0yLmPSxO2Kgi8VTYJYhMaG/Gw==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 7f3e0973d8df92d1693d159d8bdc7d9d44cfa73a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 11:16:54 +0000
Subject: [PATCH 05/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201215053836 to 0.1.0-prerelease.20201216054808.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201215053836...0.1.0-prerelease.20201216054808)
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 0df2ae388..d1da7ae5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4609,9 +4609,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001166",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001166.tgz",
- "integrity": "sha512-nCL4LzYK7F4mL0TjEMeYavafOGnBa98vTudH5c8lW9izUjnB99InG6pmC1ElAI1p0GlyZajv4ltUdFXvOHIl1A==",
+ "version": "1.0.30001168",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz",
+ "integrity": "sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ==",
"dev": true
},
"canvas-fit": {
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201215042523",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201215042523.tgz",
- "integrity": "sha512-M7X2syd3/bPmL/XA7NZRMS+/UTTQjZ6A09D3y4lz7Wtx7YnehszSlxAYcwR4JsLwsqeizU8YoxoFYYcE15LGQQ==",
+ "version": "0.1.0-prerelease.20201216042451",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201216042451.tgz",
+ "integrity": "sha512-+TTEl2PkuLGXLxT1RIl8CRh1kex1D84LxC1BtsOjiKe7/RtfAncAB2MCaGFR58sGtNnWSeK9Z5ktL921EkwNHw==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201215053836",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201215053836.tgz",
- "integrity": "sha512-UH4n45ROLI648s8TsbfeCfanJPkrtZb4QGzCWV6na2RlqWUBNPain2zZNnuSm1ti4Y/sxO3F5i3lTVVeNDJI/Q==",
+ "version": "0.1.0-prerelease.20201216054808",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201216054808.tgz",
+ "integrity": "sha512-J6Lv3AJwrLwvC3yNUDLF/F3ILrvzJ4A3azu6JzI29boU+8AUgWt55WdJEFiHdjT1WRTtGoiklzf5E9X5fztVjA==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201215042523",
- "scratch-l10n": "3.10.20201215031549",
+ "scratch-blocks": "0.1.0-prerelease.20201216042451",
+ "scratch-l10n": "3.10.20201216031625",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.626",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.626.tgz",
- "integrity": "sha512-7CanEvJx74EnvjHu1X8gf93KieyxvFLnqOXAH/ddjWD4RrUZYqdg3pykrQ/7t6SLI7DTsp4tfQXEfzeK5t6oAw==",
+ "version": "1.3.627",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.627.tgz",
+ "integrity": "sha512-O5IVRS4sCxP2+vECAp7uHkaI8V+dKYpuCyBcLn+hqVAOy/RONd8zx+6eH7TuWSTBYs/oUrzBXkNMZuVsQd58kQ==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201215031549",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201215031549.tgz",
- "integrity": "sha512-YE1sq/NGiONV0hOZSyAsVi62qd4MhCiVEyCvv6FuaE5xiSOXM/zsFgSgB3PfrPbjGOu90cPgl9DPw3cx4LYP5A==",
- "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 3e7c7ff1d..283a27d46 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201215053836",
+ "scratch-gui": "0.1.0-prerelease.20201216054808",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From 760082d2d781ab029755a6858a838012eea6c45d Mon Sep 17 00:00:00 2001
From: picklesrus
Date: Wed, 16 Dec 2020 07:54:20 -0500
Subject: [PATCH 06/33] Fix prop type. muteStepContent is an array not a
string.
---
src/components/modal/mute/modal.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/modal/mute/modal.jsx b/src/components/modal/mute/modal.jsx
index 2a4f34397..f72565328 100644
--- a/src/components/modal/mute/modal.jsx
+++ b/src/components/modal/mute/modal.jsx
@@ -128,7 +128,7 @@ MuteModal.propTypes = {
muteModalMessages: PropTypes.shape({
commentType: PropTypes.string,
muteStepHeader: PropTypes.string,
- muteStepContent: PropTypes.string
+ muteStepContent: PropTypes.array
}),
onRequestClose: PropTypes.func,
timeMuted: PropTypes.string
From cb3557468ce3af107c3af33c1d7f5f5eb1f1dfc4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 03:27:00 +0000
Subject: [PATCH 07/33] Bump scratch-l10n from 3.10.20201216031625 to
3.10.20201217031549
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201216031625 to 3.10.20201217031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201216031625...3.10.20201217031549)
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 d1da7ae5b..3f8753634 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201216031625",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201216031625.tgz",
+ "integrity": "sha512-sBkeOteNgdOlsSNoGb5aaMgy/eWfLmntHhU0zdFawzG9vv/Ay7Ga/KLck2hvW0yLmPSxO2Kgi8VTYJYhMaG/Gw==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201216031625",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201216031625.tgz",
- "integrity": "sha512-sBkeOteNgdOlsSNoGb5aaMgy/eWfLmntHhU0zdFawzG9vv/Ay7Ga/KLck2hvW0yLmPSxO2Kgi8VTYJYhMaG/Gw==",
+ "version": "3.10.20201217031549",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201217031549.tgz",
+ "integrity": "sha512-478GHjQeqmd0Y4kodXNudl3bvFHP1QFXiDeRbb9iBQ438PVwS2nuO0e0qFJUw4pbYfEMWTP/NtttKZ+XRuFAkw==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 0c5b12ccc4fe2da200ac0263553fad1c265f6cec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:47:09 +0000
Subject: [PATCH 08/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201216054808 to 0.1.0-prerelease.20201217045706.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201216054808...0.1.0-prerelease.20201217045706)
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 3f8753634..1e40b727d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201216042451",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201216042451.tgz",
- "integrity": "sha512-+TTEl2PkuLGXLxT1RIl8CRh1kex1D84LxC1BtsOjiKe7/RtfAncAB2MCaGFR58sGtNnWSeK9Z5ktL921EkwNHw==",
+ "version": "0.1.0-prerelease.20201217041149",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201217041149.tgz",
+ "integrity": "sha512-dWHRFuu9yHIBvmDIQtXaE3sgQYRzU1KOJ93jvu1TQru/qNwQagL1RPOb1pKRg3ewjBSSlwLQ4JGa7exsOcLvYA==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201216054808",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201216054808.tgz",
- "integrity": "sha512-J6Lv3AJwrLwvC3yNUDLF/F3ILrvzJ4A3azu6JzI29boU+8AUgWt55WdJEFiHdjT1WRTtGoiklzf5E9X5fztVjA==",
+ "version": "0.1.0-prerelease.20201217045706",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201217045706.tgz",
+ "integrity": "sha512-2/YGzgh/dnZb9EG9ccCq8D8R+AEA7FRyv50RyMXWtjWNR28saN+XAd64I5FreZsb3ZUY0Tnkq3jVcEMDyEmdAA==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201216042451",
- "scratch-l10n": "3.10.20201216031625",
+ "scratch-blocks": "0.1.0-prerelease.20201217041149",
+ "scratch-l10n": "3.10.20201217031549",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.627",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.627.tgz",
- "integrity": "sha512-O5IVRS4sCxP2+vECAp7uHkaI8V+dKYpuCyBcLn+hqVAOy/RONd8zx+6eH7TuWSTBYs/oUrzBXkNMZuVsQd58kQ==",
+ "version": "1.3.628",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.628.tgz",
+ "integrity": "sha512-fmhO4YGo/kapy+xL9Eq/cZwDASaTHZu3psIFYo4yc+RY1LzbZr84xjKlDImDrlrmWhOxsrDi98nX097U/xK/cQ==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201216031625",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201216031625.tgz",
- "integrity": "sha512-sBkeOteNgdOlsSNoGb5aaMgy/eWfLmntHhU0zdFawzG9vv/Ay7Ga/KLck2hvW0yLmPSxO2Kgi8VTYJYhMaG/Gw==",
- "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 283a27d46..adefdc52c 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201216054808",
+ "scratch-gui": "0.1.0-prerelease.20201217045706",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From d8ad0c38eaf06d7bc35b23367d5ac8f007f3d550 Mon Sep 17 00:00:00 2001
From: picklesrus
Date: Thu, 17 Dec 2020 15:43:07 -0500
Subject: [PATCH 09/33] Show warning message when user has been muted several
times.
---
src/components/modal/mute/modal.jsx | 24 ++++++++++++-
src/l10n.json | 3 ++
src/views/preview/comment/compose-comment.jsx | 14 +++++---
test/unit/components/compose-comment.test.jsx | 36 ++++++++++++++++++-
test/unit/components/mute-modal.test.jsx | 14 ++++++++
5 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/src/components/modal/mute/modal.jsx b/src/components/modal/mute/modal.jsx
index 2a4f34397..00a25ee74 100644
--- a/src/components/modal/mute/modal.jsx
+++ b/src/components/modal/mute/modal.jsx
@@ -20,6 +20,10 @@ class MuteModal extends React.Component {
'handleNext',
'handlePrevious'
]);
+ this.numSteps = 2;
+ if (this.props.showWarning) {
+ this.numSteps++;
+ }
this.state = {
step: 0
};
@@ -82,6 +86,23 @@ class MuteModal extends React.Component {
/>
+ {this.props.showWarning ? (
+
+
+
+ ) : null}
@@ -97,7 +118,7 @@ class MuteModal extends React.Component {
) : null }
- {this.state.step >= 1 ? (
+ {this.state.step >= this.numSteps - 1 ? (
@@ -300,7 +305,8 @@ ComposeComment.propTypes = {
commenteeId: PropTypes.number,
muteStatus: PropTypes.shape({
offenses: PropTypes.array,
- muteExpiresAt: PropTypes.number
+ muteExpiresAt: PropTypes.number,
+ showWarning: PropTypes.bool
}),
onAddComment: PropTypes.func,
onCancel: PropTypes.func,
@@ -317,7 +323,7 @@ ComposeComment.propTypes = {
const mapStateToProps = state => ({
muteStatus: state.session.session.permissions.mute_status ?
state.session.session.permissions.mute_status :
- {muteExpiresAt: 0, offenses: []},
+ {muteExpiresAt: 0, offenses: [], showWarning: false},
user: state.session.session.user
});
diff --git a/test/unit/components/compose-comment.test.jsx b/test/unit/components/compose-comment.test.jsx
index c49e9dd75..f0fd8558b 100644
--- a/test/unit/components/compose-comment.test.jsx
+++ b/test/unit/components/compose-comment.test.jsx
@@ -104,7 +104,8 @@ describe('Compose Comment test', () => {
permissions: {
mute_status: {
muteExpiresAt: 5,
- offenses: []
+ offenses: [],
+ showWarning: true
}
}
}
@@ -114,6 +115,7 @@ describe('Compose Comment test', () => {
const commentInstance = component.instance();
// Check conversion to ms from seconds is done at init time.
expect(commentInstance.state.muteExpiresAtMs).toEqual(5 * 1000);
+ expect(commentInstance.state.showWarning).toBe(true);
// Compose box should be hidden if muted unless they got muted due to a comment they just posted.
expect(component.find('FlexRow.compose-comment').exists()).toEqual(false);
expect(component.find('MuteModal').exists()).toEqual(false);
@@ -191,9 +193,41 @@ describe('Compose Comment test', () => {
commentInstance.setState({muteOpen: true});
component.update();
expect(component.find('MuteModal').exists()).toEqual(true);
+ expect(component.find('MuteModal').props().showWarning).toBe(false);
global.Date.now = realDateNow;
});
+ test('Mute Modal gets showWarning props from state', () => {
+ const store = mockStore({
+ session: {
+ session: {
+ user: {},
+ permissions: {
+ mute_status: {}
+ }
+ }
+ }
+ });
+ const component = mountWithIntl(
+
+ , {context: {store}}
+ );
+ // set state on the ComposeComment component, not the wrapper
+ const commentInstance = component.find('ComposeComment').instance();
+ commentInstance.setState({muteOpen: true});
+ component.update();
+ expect(component.find('MuteModal').exists()).toEqual(true);
+ expect(component.find('MuteModal').props().showWarning).toBe(false);
+ commentInstance.setState({
+ muteOpen: true,
+ showWarning: true
+ });
+ component.update();
+ expect(component.find('MuteModal').props().showWarning).toBe(true);
+ });
+
test('shouldShowMuteModal is false when list is undefined ', () => {
const commentInstance = getComposeCommentWrapper({}).instance();
expect(commentInstance.shouldShowMuteModal()).toBe(false);
diff --git a/test/unit/components/mute-modal.test.jsx b/test/unit/components/mute-modal.test.jsx
index d5c1907f6..94550a346 100644
--- a/test/unit/components/mute-modal.test.jsx
+++ b/test/unit/components/mute-modal.test.jsx
@@ -33,6 +33,20 @@ describe('MuteModalTest', () => {
expect(component.find('button.back-button').exists()).toEqual(false);
});
+ test('Mute Modal shows extra showWarning step', () => {
+ const component = mountWithIntl(
+
+ );
+ component.find('MuteModal').instance()
+ .setState({step: 2});
+ component.update();
+ expect(component.find('MuteStep').prop('bottomImg')).toEqual('/svgs/commenting/warning.svg');
+ expect(component.find('MuteStep').prop('totalSteps')).toEqual(3);
+ });
+
test('Mute Modal shows back & close button on last step', () => {
const component = mountWithIntl(
From b2284062071b530a6976acc8f5cacfa8c2f32c5d Mon Sep 17 00:00:00 2001
From: picklesrus
Date: Thu, 17 Dec 2020 15:43:48 -0500
Subject: [PATCH 10/33] Add new image for warning.
---
static/svgs/commenting/warning.svg | 1 +
1 file changed, 1 insertion(+)
create mode 100644 static/svgs/commenting/warning.svg
diff --git a/static/svgs/commenting/warning.svg b/static/svgs/commenting/warning.svg
new file mode 100644
index 000000000..2e3dda2ce
--- /dev/null
+++ b/static/svgs/commenting/warning.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
From 348e56ec28752610fc241c180678df617454ff17 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 03:35:25 +0000
Subject: [PATCH 11/33] Bump scratch-l10n from 3.10.20201217031549 to
3.10.20201218031454
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201217031549 to 3.10.20201218031454.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201217031549...3.10.20201218031454)
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 1e40b727d..442c082a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201217031549",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201217031549.tgz",
+ "integrity": "sha512-478GHjQeqmd0Y4kodXNudl3bvFHP1QFXiDeRbb9iBQ438PVwS2nuO0e0qFJUw4pbYfEMWTP/NtttKZ+XRuFAkw==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201217031549",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201217031549.tgz",
- "integrity": "sha512-478GHjQeqmd0Y4kodXNudl3bvFHP1QFXiDeRbb9iBQ438PVwS2nuO0e0qFJUw4pbYfEMWTP/NtttKZ+XRuFAkw==",
+ "version": "3.10.20201218031454",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201218031454.tgz",
+ "integrity": "sha512-qccQ9JYM3ZDghwtfdkJk7TdfN5Q+rtG7bxzbjGAgBSCuaZwtWgOrbdsG4NLyoZiQnX/sFJ8+lL7+mWEA5k0keQ==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From b35651ad7a7a08b89cf047d92ef8669a7de1fe26 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 10:45:46 +0000
Subject: [PATCH 12/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201217045706 to 0.1.0-prerelease.20201218042700.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201217045706...0.1.0-prerelease.20201218042700)
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 442c082a9..cb11b97e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201217041149",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201217041149.tgz",
- "integrity": "sha512-dWHRFuu9yHIBvmDIQtXaE3sgQYRzU1KOJ93jvu1TQru/qNwQagL1RPOb1pKRg3ewjBSSlwLQ4JGa7exsOcLvYA==",
+ "version": "0.1.0-prerelease.20201218040309",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201218040309.tgz",
+ "integrity": "sha512-iT19iwmmycUS3rOUCakn9tSJKTAIi7QuzC202ACFIap+WlURgiFe5YIkDe5odPElJYzVU3bWie4qw4ijTmgSSQ==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201217045706",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201217045706.tgz",
- "integrity": "sha512-2/YGzgh/dnZb9EG9ccCq8D8R+AEA7FRyv50RyMXWtjWNR28saN+XAd64I5FreZsb3ZUY0Tnkq3jVcEMDyEmdAA==",
+ "version": "0.1.0-prerelease.20201218042700",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201218042700.tgz",
+ "integrity": "sha512-y2PxYENDUlRWRG8xueNJCVLp4ouAi5eLUIlhKyYycupDjvIBjzNNgSx9sTg+uIOkFzL4L6p4/ZKAzxYfDb7z+g==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201217041149",
- "scratch-l10n": "3.10.20201217031549",
+ "scratch-blocks": "0.1.0-prerelease.20201218040309",
+ "scratch-l10n": "3.10.20201218031454",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.628",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.628.tgz",
- "integrity": "sha512-fmhO4YGo/kapy+xL9Eq/cZwDASaTHZu3psIFYo4yc+RY1LzbZr84xjKlDImDrlrmWhOxsrDi98nX097U/xK/cQ==",
+ "version": "1.3.629",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz",
+ "integrity": "sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201217031549",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201217031549.tgz",
- "integrity": "sha512-478GHjQeqmd0Y4kodXNudl3bvFHP1QFXiDeRbb9iBQ438PVwS2nuO0e0qFJUw4pbYfEMWTP/NtttKZ+XRuFAkw==",
- "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 adefdc52c..05dca8bd4 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201217045706",
+ "scratch-gui": "0.1.0-prerelease.20201218042700",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From ad5dc31cc7c3b70c44cff271907d589d9ffe4069 Mon Sep 17 00:00:00 2001
From: picklesrus
Date: Fri, 18 Dec 2020 09:30:02 -0500
Subject: [PATCH 13/33] Have mute modal always show if you post a comment and
showWarning is true.
---
src/views/preview/comment/compose-comment.jsx | 16 ++++--
test/unit/components/compose-comment.test.jsx | 50 ++++++++++++++++---
2 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/src/views/preview/comment/compose-comment.jsx b/src/views/preview/comment/compose-comment.jsx
index eb0688c16..343e0c216 100644
--- a/src/views/preview/comment/compose-comment.jsx
+++ b/src/views/preview/comment/compose-comment.jsx
@@ -85,7 +85,7 @@ class ComposeComment extends React.Component {
if (body.status && body.status.mute_status) {
muteExpiresAtMs = body.status.mute_status.muteExpiresAt * 1000; // convert to ms
rejectedStatus = ComposeStatus.REJECTED_MUTE;
- if (this.shouldShowMuteModal(body.status.mute_status.offenses)) {
+ if (this.shouldShowMuteModal(body.status.mute_status)) {
muteOpen = true;
}
showWarning = body.status.mute_status.showWarning;
@@ -136,8 +136,9 @@ class ComposeComment extends React.Component {
muteOpen: true
});
}
- shouldShowMuteModal (offensesList) {
- // We should show the mute modal whne the user is newly muted or hasn't seen it for a while.
+ shouldShowMuteModal (muteStatus) {
+ // We should show the mute modal if the user is in danger of being blocked or
+ // when the user is newly muted or hasn't seen it for a while.
// We don't want to show it more than about once a week.
// A newly muted user has only 1 offense and it happened in the last coulpe of minutes.
// If a user has more than 1 offense, it means that they have have been muted in the
@@ -145,10 +146,17 @@ class ComposeComment extends React.Component {
// Assumption: The offenses list is ordered by time with the most recent at the end.
// This check is here just in case we somehow get bad data back from a backend.
- if (!offensesList) {
+ if (!muteStatus || !muteStatus.offenses) {
return false;
}
+ // If the backend tells us to show a warning about getting blocked, we should show the modal
+ // regardless of what the offenses list looks like.
+ if (muteStatus.showWarning) {
+ return true;
+ }
+
+ const offensesList = muteStatus.offenses;
const numOffenses = offensesList.length;
// This isn't intended to be called if there are no offenses, but
// say no just in case.
diff --git a/test/unit/components/compose-comment.test.jsx b/test/unit/components/compose-comment.test.jsx
index f0fd8558b..002edbd84 100644
--- a/test/unit/components/compose-comment.test.jsx
+++ b/test/unit/components/compose-comment.test.jsx
@@ -228,19 +228,26 @@ describe('Compose Comment test', () => {
expect(component.find('MuteModal').props().showWarning).toBe(true);
});
- test('shouldShowMuteModal is false when list is undefined ', () => {
+ test('shouldShowMuteModal is false when muteStatus is undefined ', () => {
const commentInstance = getComposeCommentWrapper({}).instance();
expect(commentInstance.shouldShowMuteModal()).toBe(false);
});
- test('shouldShowMuteModal is false when list empty ', () => {
- const offenses = [];
+ test('shouldShowMuteModal is false when list is undefined ', () => {
+ const muteStatus = {};
const commentInstance = getComposeCommentWrapper({}).instance();
- expect(commentInstance.shouldShowMuteModal(offenses)).toBe(false);
+ expect(commentInstance.shouldShowMuteModal(muteStatus)).toBe(false);
+ });
+
+ test('shouldShowMuteModal is false when list empty ', () => {
+ const muteStatus = {
+ offenses: []
+ };
+ const commentInstance = getComposeCommentWrapper({}).instance();
+ expect(commentInstance.shouldShowMuteModal(muteStatus)).toBe(false);
});
test('shouldShowMuteModal is true when only 1 recent offesnse ', () => {
- const offenses = [];
const realDateNow = Date.now.bind(global.Date);
global.Date.now = () => 0;
// Since Date.now mocked to 0 above, we just need a small number to make
@@ -249,9 +256,11 @@ describe('Compose Comment test', () => {
expiresAt: '1000',
createdAt: '-60' // ~1 ago min given shouldShowMuteModal's conversions,
};
- offenses.push(offense);
+ const muteStatus = {
+ offenses: [offense]
+ };
const commentInstance = getComposeCommentWrapper({}).instance();
- expect(commentInstance.shouldShowMuteModal(offenses)).toBe(true);
+ expect(commentInstance.shouldShowMuteModal(muteStatus)).toBe(true);
global.Date.now = realDateNow;
});
@@ -268,8 +277,33 @@ describe('Compose Comment test', () => {
offenses.push(offense);
offense.createdAt = '-180'; // 3 minutes ago;
offenses.push(offense);
+ const muteStatus = {
+ offenses: offenses
+ };
const commentInstance = getComposeCommentWrapper({}).instance();
- expect(commentInstance.shouldShowMuteModal(offenses)).toBe(false);
+ expect(commentInstance.shouldShowMuteModal(muteStatus)).toBe(false);
+ global.Date.now = realDateNow;
+ });
+
+ test('shouldShowMuteModal is true when showWarning is true even with multiple offenses', () => {
+ const offenses = [];
+ const realDateNow = Date.now.bind(global.Date);
+ global.Date.now = () => 0;
+ // Since Date.now mocked to 0 above, we just need a small number to make
+ // it look like it was created more than 2 minutes ago.
+ let offense = {
+ expiresAt: '1000',
+ createdAt: '-119' // just shy of two min ago
+ };
+ offenses.push(offense);
+ offense.createdAt = '-180'; // 3 minutes ago;
+ offenses.push(offense);
+ const muteStatus = {
+ offenses: offenses,
+ showWarning: true
+ };
+ const commentInstance = getComposeCommentWrapper({}).instance();
+ expect(commentInstance.shouldShowMuteModal(muteStatus)).toBe(true);
global.Date.now = realDateNow;
});
From de65ef801d82084b3cdaa8958fd01aa08117b3ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 19 Dec 2020 03:20:14 +0000
Subject: [PATCH 14/33] Bump scratch-l10n from 3.10.20201218031454 to
3.10.20201219031451
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201218031454 to 3.10.20201219031451.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201218031454...3.10.20201219031451)
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 cb11b97e2..2c0d11884 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201218031454",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201218031454.tgz",
+ "integrity": "sha512-qccQ9JYM3ZDghwtfdkJk7TdfN5Q+rtG7bxzbjGAgBSCuaZwtWgOrbdsG4NLyoZiQnX/sFJ8+lL7+mWEA5k0keQ==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201218031454",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201218031454.tgz",
- "integrity": "sha512-qccQ9JYM3ZDghwtfdkJk7TdfN5Q+rtG7bxzbjGAgBSCuaZwtWgOrbdsG4NLyoZiQnX/sFJ8+lL7+mWEA5k0keQ==",
+ "version": "3.10.20201219031451",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201219031451.tgz",
+ "integrity": "sha512-sDdAUWzIy4bLOJ/E+EdgRZzx/n1p+zdLPkB6EJVTyI6m1QZtcdG5lIsXJFG2Uiu+zuRsc/OQx5FgajyhFdIPUQ==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From ff1a7f552df971d8812cacc95f08ba558c861195 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 20 Dec 2020 03:20:15 +0000
Subject: [PATCH 15/33] Bump scratch-l10n from 3.10.20201219031451 to
3.10.20201220031455
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201219031451 to 3.10.20201220031455.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201219031451...3.10.20201220031455)
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 2c0d11884..f1ba109b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21092,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201219031451",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201219031451.tgz",
- "integrity": "sha512-sDdAUWzIy4bLOJ/E+EdgRZzx/n1p+zdLPkB6EJVTyI6m1QZtcdG5lIsXJFG2Uiu+zuRsc/OQx5FgajyhFdIPUQ==",
+ "version": "3.10.20201220031455",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201220031455.tgz",
+ "integrity": "sha512-LFX2GXqdlxa1dsK3KZmPfE3zcMd+M82pYxwLIwGRH3ABvBJHxQ7PlS0/SztjwQacgCVDz4qyJmupqpVMmz+t/Q==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 738aded2bd1d031b73ef0cb54836b4856d71e3cb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 03:34:58 +0000
Subject: [PATCH 16/33] Bump scratch-l10n from 3.10.20201220031455 to
3.10.20201221031502
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201220031455 to 3.10.20201221031502.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201220031455...3.10.20201221031502)
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 f1ba109b9..793f95a93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21092,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201220031455",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201220031455.tgz",
- "integrity": "sha512-LFX2GXqdlxa1dsK3KZmPfE3zcMd+M82pYxwLIwGRH3ABvBJHxQ7PlS0/SztjwQacgCVDz4qyJmupqpVMmz+t/Q==",
+ "version": "3.10.20201221031502",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201221031502.tgz",
+ "integrity": "sha512-ETdmV6AC64QNWqaq5YChJ8UKNiVyxlTMs/chzm2mg4Xc2QBGi+1eti0cdwb7E5GVLYRcAcFYk7znFKeFm+t1zQ==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 9e3a6ddfa612c43a84353cbd59a3c105e61be647 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 11:21:46 +0000
Subject: [PATCH 17/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201218042700 to 0.1.0-prerelease.20201221041259.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201218042700...0.1.0-prerelease.20201221041259)
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 793f95a93..480c86973 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4609,9 +4609,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001168",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001168.tgz",
- "integrity": "sha512-P2zmX7swIXKu+GMMR01TWa4csIKELTNnZKc+f1CjebmZJQtTAEXmpQSoKVJVVcvPGAA0TEYTOUp3VehavZSFPQ==",
+ "version": "1.0.30001170",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz",
+ "integrity": "sha512-Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==",
"dev": true
},
"canvas-fit": {
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201218040309",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201218040309.tgz",
- "integrity": "sha512-iT19iwmmycUS3rOUCakn9tSJKTAIi7QuzC202ACFIap+WlURgiFe5YIkDe5odPElJYzVU3bWie4qw4ijTmgSSQ==",
+ "version": "0.1.0-prerelease.20201221034416",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201221034416.tgz",
+ "integrity": "sha512-ylaNnIGm6BS9cf7jwmGRzIUBCujl5JdDYYrltxoRBpqSg7GvFkvKwld13XHQNDr5t7Zo4WPB3cfXYhSQ/wINOw==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201218042700",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201218042700.tgz",
- "integrity": "sha512-y2PxYENDUlRWRG8xueNJCVLp4ouAi5eLUIlhKyYycupDjvIBjzNNgSx9sTg+uIOkFzL4L6p4/ZKAzxYfDb7z+g==",
+ "version": "0.1.0-prerelease.20201221041259",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201221041259.tgz",
+ "integrity": "sha512-/ZHX3M3YI7+u3WhfnejMkytMjrExvTzzRWB+RbxSouabpRLucqsKxOtTTKkob6B3SjboQXWefQ3pBegKnVLOvQ==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201218040309",
- "scratch-l10n": "3.10.20201218031454",
+ "scratch-blocks": "0.1.0-prerelease.20201221034416",
+ "scratch-l10n": "3.10.20201221031502",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201218031454",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201218031454.tgz",
- "integrity": "sha512-qccQ9JYM3ZDghwtfdkJk7TdfN5Q+rtG7bxzbjGAgBSCuaZwtWgOrbdsG4NLyoZiQnX/sFJ8+lL7+mWEA5k0keQ==",
- "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 05dca8bd4..2914c36fd 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201218042700",
+ "scratch-gui": "0.1.0-prerelease.20201221041259",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From 5d80d9a9e892edc3b8bd417511f08916f79d113f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Dec 2020 03:38:33 +0000
Subject: [PATCH 18/33] Bump scratch-l10n from 3.10.20201221031502 to
3.10.20201222031511
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201221031502 to 3.10.20201222031511.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201221031502...3.10.20201222031511)
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 480c86973..ab59d61ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201221031502",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201221031502.tgz",
+ "integrity": "sha512-ETdmV6AC64QNWqaq5YChJ8UKNiVyxlTMs/chzm2mg4Xc2QBGi+1eti0cdwb7E5GVLYRcAcFYk7znFKeFm+t1zQ==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201221031502",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201221031502.tgz",
- "integrity": "sha512-ETdmV6AC64QNWqaq5YChJ8UKNiVyxlTMs/chzm2mg4Xc2QBGi+1eti0cdwb7E5GVLYRcAcFYk7znFKeFm+t1zQ==",
+ "version": "3.10.20201222031511",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201222031511.tgz",
+ "integrity": "sha512-Jm7lZ21Lv0p9EyHk7IWlgJDcjxnMpkP7YLpyQ3NVE5xEHCR8bO3ZLLaJY00QPf77c48pu3Qf2dAkXb5ZY9SJJA==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 0cfceefe106e3b80aa383a5df83395537438428e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 22 Dec 2020 10:47:45 +0000
Subject: [PATCH 19/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201221041259 to 0.1.0-prerelease.20201222041026.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201221041259...0.1.0-prerelease.20201222041026)
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 ab59d61ce..829980539 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201221034416",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201221034416.tgz",
- "integrity": "sha512-ylaNnIGm6BS9cf7jwmGRzIUBCujl5JdDYYrltxoRBpqSg7GvFkvKwld13XHQNDr5t7Zo4WPB3cfXYhSQ/wINOw==",
+ "version": "0.1.0-prerelease.20201222034511",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201222034511.tgz",
+ "integrity": "sha512-BU7qlYsKi1mIBp9CszHI6ITIkMZJNubAb81y2NQqSI3WvpWAB58hOB6ZioToG347lgQ+EnK+RjWrOSFT2kYmgQ==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201221041259",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201221041259.tgz",
- "integrity": "sha512-/ZHX3M3YI7+u3WhfnejMkytMjrExvTzzRWB+RbxSouabpRLucqsKxOtTTKkob6B3SjboQXWefQ3pBegKnVLOvQ==",
+ "version": "0.1.0-prerelease.20201222041026",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201222041026.tgz",
+ "integrity": "sha512-DHt2XtISZgzukf+PYCplM3p4DhqAzwW7v7TD2Z2n8yJ6JnFnCU5KlWpL/dPTqNBhiY9PVO2dNwgF6NyOLxENXg==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201221034416",
- "scratch-l10n": "3.10.20201221031502",
+ "scratch-blocks": "0.1.0-prerelease.20201222034511",
+ "scratch-l10n": "3.10.20201222031511",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.629",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz",
- "integrity": "sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ==",
+ "version": "1.3.631",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.631.tgz",
+ "integrity": "sha512-mPEG/52142po0XK1jQkZtbMmp38MZtQ3JDFItYxV65WXyhxDYEQ54tP4rb93m0RbMlZqQ+4zBw2N7UumSgGfbA==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201221031502",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201221031502.tgz",
- "integrity": "sha512-ETdmV6AC64QNWqaq5YChJ8UKNiVyxlTMs/chzm2mg4Xc2QBGi+1eti0cdwb7E5GVLYRcAcFYk7znFKeFm+t1zQ==",
- "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 2914c36fd..b55faa4a2 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201221041259",
+ "scratch-gui": "0.1.0-prerelease.20201222041026",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From 03300d6a7e5c3ffa8f8041805ecdb5b65f9e6cda Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 03:27:30 +0000
Subject: [PATCH 20/33] Bump scratch-l10n from 3.10.20201222031511 to
3.10.20201223031554
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201222031511 to 3.10.20201223031554.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201222031511...3.10.20201223031554)
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 829980539..9916201b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201222031511",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201222031511.tgz",
+ "integrity": "sha512-Jm7lZ21Lv0p9EyHk7IWlgJDcjxnMpkP7YLpyQ3NVE5xEHCR8bO3ZLLaJY00QPf77c48pu3Qf2dAkXb5ZY9SJJA==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201222031511",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201222031511.tgz",
- "integrity": "sha512-Jm7lZ21Lv0p9EyHk7IWlgJDcjxnMpkP7YLpyQ3NVE5xEHCR8bO3ZLLaJY00QPf77c48pu3Qf2dAkXb5ZY9SJJA==",
+ "version": "3.10.20201223031554",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201223031554.tgz",
+ "integrity": "sha512-+wDxF0sSXJG4WcbwT9IZYNhv4Ha/a4isI8dkC1tZR3/R3mSb51TzTr32xtH+vs2HkQwJQK+C5TNi5rENlJwvIw==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 855cee5401fd55d8cc5288dc9d37f61b9cd79848 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 10:46:36 +0000
Subject: [PATCH 21/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201222041026 to 0.1.0-prerelease.20201223034244.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201222041026...0.1.0-prerelease.20201223034244)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 26 +++++++-------------------
package.json | 2 +-
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 9916201b5..41e85ecbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201222041026",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201222041026.tgz",
- "integrity": "sha512-DHt2XtISZgzukf+PYCplM3p4DhqAzwW7v7TD2Z2n8yJ6JnFnCU5KlWpL/dPTqNBhiY9PVO2dNwgF6NyOLxENXg==",
+ "version": "0.1.0-prerelease.20201223034244",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201223034244.tgz",
+ "integrity": "sha512-tEpzhCIBSjqjCkbhqcY708VvChKISYDU5R9bQZajXaIE/l5qWTY/5HyBxN7DFbMJNceEVb2Nv7iXbzKW6xoLow==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20591,7 +20591,7 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20201222034511",
- "scratch-l10n": "3.10.20201222031511",
+ "scratch-l10n": "3.10.20201223031554",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.631",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.631.tgz",
- "integrity": "sha512-mPEG/52142po0XK1jQkZtbMmp38MZtQ3JDFItYxV65WXyhxDYEQ54tP4rb93m0RbMlZqQ+4zBw2N7UumSgGfbA==",
+ "version": "1.3.632",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.632.tgz",
+ "integrity": "sha512-LkaEH9HHr9fodmm3txF4nFMyHN3Yr50HcpD/DBHpLCxzM9doV8AV0er6aBWva4IDs2aA9kGguces0rp+WKL7rg==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201222031511",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201222031511.tgz",
- "integrity": "sha512-Jm7lZ21Lv0p9EyHk7IWlgJDcjxnMpkP7YLpyQ3NVE5xEHCR8bO3ZLLaJY00QPf77c48pu3Qf2dAkXb5ZY9SJJA==",
- "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 b55faa4a2..173624a73 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201222041026",
+ "scratch-gui": "0.1.0-prerelease.20201223034244",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From caadfdfbc53c130b935d7744aa591ca381390223 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 25 Dec 2020 03:39:21 +0000
Subject: [PATCH 22/33] Bump scratch-l10n from 3.10.20201223031554 to
3.10.20201225031621
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201223031554 to 3.10.20201225031621.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201223031554...3.10.20201225031621)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 138 +++++++++++++++++++++++++---------------------
1 file changed, 75 insertions(+), 63 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 41e85ecbb..fb77d51b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -326,26 +326,26 @@
}
},
"@babel/traverse": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
- "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
+ "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.12.10",
- "@babel/helper-function-name": "^7.10.4",
- "@babel/helper-split-export-declaration": "^7.11.0",
- "@babel/parser": "^7.12.10",
- "@babel/types": "^7.12.10",
+ "@babel/code-frame": "^7.12.11",
+ "@babel/generator": "^7.12.11",
+ "@babel/helper-function-name": "^7.12.11",
+ "@babel/helper-split-export-declaration": "^7.12.11",
+ "@babel/parser": "^7.12.11",
+ "@babel/types": "^7.12.12",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -516,9 +516,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -550,9 +550,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -669,26 +669,26 @@
}
},
"@babel/traverse": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
- "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
+ "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.12.10",
- "@babel/helper-function-name": "^7.10.4",
- "@babel/helper-split-export-declaration": "^7.11.0",
- "@babel/parser": "^7.12.10",
- "@babel/types": "^7.12.10",
+ "@babel/code-frame": "^7.12.11",
+ "@babel/generator": "^7.12.11",
+ "@babel/helper-function-name": "^7.12.11",
+ "@babel/helper-split-export-declaration": "^7.12.11",
+ "@babel/parser": "^7.12.11",
+ "@babel/types": "^7.12.12",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -788,9 +788,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -908,26 +908,26 @@
}
},
"@babel/traverse": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
- "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
+ "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.12.10",
- "@babel/helper-function-name": "^7.10.4",
- "@babel/helper-split-export-declaration": "^7.11.0",
- "@babel/parser": "^7.12.10",
- "@babel/types": "^7.12.10",
+ "@babel/code-frame": "^7.12.11",
+ "@babel/generator": "^7.12.11",
+ "@babel/helper-function-name": "^7.12.11",
+ "@babel/helper-split-export-declaration": "^7.12.11",
+ "@babel/parser": "^7.12.11",
+ "@babel/types": "^7.12.12",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -1027,9 +1027,9 @@
},
"dependencies": {
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -1155,26 +1155,26 @@
}
},
"@babel/traverse": {
- "version": "7.12.10",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
- "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz",
+ "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/generator": "^7.12.10",
- "@babel/helper-function-name": "^7.10.4",
- "@babel/helper-split-export-declaration": "^7.11.0",
- "@babel/parser": "^7.12.10",
- "@babel/types": "^7.12.10",
+ "@babel/code-frame": "^7.12.11",
+ "@babel/generator": "^7.12.11",
+ "@babel/helper-function-name": "^7.12.11",
+ "@babel/helper-split-export-declaration": "^7.12.11",
+ "@babel/parser": "^7.12.11",
+ "@babel/types": "^7.12.12",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.19"
}
},
"@babel/types": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.11.tgz",
- "integrity": "sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==",
+ "version": "7.12.12",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz",
+ "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201223031554",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201223031554.tgz",
+ "integrity": "sha512-+wDxF0sSXJG4WcbwT9IZYNhv4Ha/a4isI8dkC1tZR3/R3mSb51TzTr32xtH+vs2HkQwJQK+C5TNi5rENlJwvIw==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201223031554",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201223031554.tgz",
- "integrity": "sha512-+wDxF0sSXJG4WcbwT9IZYNhv4Ha/a4isI8dkC1tZR3/R3mSb51TzTr32xtH+vs2HkQwJQK+C5TNi5rENlJwvIw==",
+ "version": "3.10.20201225031621",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201225031621.tgz",
+ "integrity": "sha512-Amefl39AtTAk/lpszIm0FxUL2lr4F8H1yvek46nIUHBNjqG7vSjahyXzdTgA31GsAJjDXl1ERws8DqcHhqUw6A==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 6b21053ea8c185a7a52a3c4fbbfea9209a3d7b53 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 25 Dec 2020 10:49:02 +0000
Subject: [PATCH 23/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201223034244 to 0.1.0-prerelease.20201225035427.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201223034244...0.1.0-prerelease.20201225035427)
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 fb77d51b0..9a17c1f1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201222034511",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201222034511.tgz",
- "integrity": "sha512-BU7qlYsKi1mIBp9CszHI6ITIkMZJNubAb81y2NQqSI3WvpWAB58hOB6ZioToG347lgQ+EnK+RjWrOSFT2kYmgQ==",
+ "version": "0.1.0-prerelease.20201223034356",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201223034356.tgz",
+ "integrity": "sha512-aKBVxfiRacFOoJQ+sttVB46AxFHS/olcJOiUu9a9wfzxhBsJQsxRXAHIAziwZIvt1x8IK0EftMyL5XPUiWBqbQ==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201223034244",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201223034244.tgz",
- "integrity": "sha512-tEpzhCIBSjqjCkbhqcY708VvChKISYDU5R9bQZajXaIE/l5qWTY/5HyBxN7DFbMJNceEVb2Nv7iXbzKW6xoLow==",
+ "version": "0.1.0-prerelease.20201225035427",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201225035427.tgz",
+ "integrity": "sha512-iymZ91xkf/87EHZkWUQaZnu0eIYMm7b/bZ0mlpxdUrW6Mygr6uJsIAvjoQ2RZPQmdmAYqCpOkl2ST6ZxiNQcyw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201222034511",
- "scratch-l10n": "3.10.20201223031554",
+ "scratch-blocks": "0.1.0-prerelease.20201223034356",
+ "scratch-l10n": "3.10.20201225031621",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -20775,9 +20775,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.632",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.632.tgz",
- "integrity": "sha512-LkaEH9HHr9fodmm3txF4nFMyHN3Yr50HcpD/DBHpLCxzM9doV8AV0er6aBWva4IDs2aA9kGguces0rp+WKL7rg==",
+ "version": "1.3.633",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz",
+ "integrity": "sha512-bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==",
"dev": true
},
"file-loader": {
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201223031554",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201223031554.tgz",
- "integrity": "sha512-+wDxF0sSXJG4WcbwT9IZYNhv4Ha/a4isI8dkC1tZR3/R3mSb51TzTr32xtH+vs2HkQwJQK+C5TNi5rENlJwvIw==",
- "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 173624a73..f61ff1c35 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201223034244",
+ "scratch-gui": "0.1.0-prerelease.20201225035427",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From d02d534f05c2fe92f29626e2fd2cb64a9d1bdeb2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 26 Dec 2020 03:24:23 +0000
Subject: [PATCH 24/33] Bump scratch-l10n from 3.10.20201225031621 to
3.10.20201226031447
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201225031621 to 3.10.20201226031447.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201225031621...3.10.20201226031447)
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 9a17c1f1d..08170ffa5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201225031621",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201225031621.tgz",
+ "integrity": "sha512-Amefl39AtTAk/lpszIm0FxUL2lr4F8H1yvek46nIUHBNjqG7vSjahyXzdTgA31GsAJjDXl1ERws8DqcHhqUw6A==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201225031621",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201225031621.tgz",
- "integrity": "sha512-Amefl39AtTAk/lpszIm0FxUL2lr4F8H1yvek46nIUHBNjqG7vSjahyXzdTgA31GsAJjDXl1ERws8DqcHhqUw6A==",
+ "version": "3.10.20201226031447",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201226031447.tgz",
+ "integrity": "sha512-oS31CbocaBcaMT7MhdYniDW8IoZoPzF1UXDtCmsi73oaxkoRpveWj1bgfvfVKXdWTv4HASw0I/0MmCIVNTaotA==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From a5e70ee3450ee892e3638e3a1397fbac429a2c93 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:20:58 +0000
Subject: [PATCH 25/33] Bump scratch-l10n from 3.10.20201226031447 to
3.10.20201227031524
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201226031447 to 3.10.20201227031524.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201226031447...3.10.20201227031524)
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 08170ffa5..cc326a88f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21092,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201226031447",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201226031447.tgz",
- "integrity": "sha512-oS31CbocaBcaMT7MhdYniDW8IoZoPzF1UXDtCmsi73oaxkoRpveWj1bgfvfVKXdWTv4HASw0I/0MmCIVNTaotA==",
+ "version": "3.10.20201227031524",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201227031524.tgz",
+ "integrity": "sha512-rKWINVC2/miGmJ4mGoJcE350r6wNovxbWOiE+ro44gkxr5wZYL0IeQwHMf2LzhbtZXFnil0ImhRLffBk98L5Ag==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From a818f5e1d36d8651032084b5b0620db18da11cf2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 28 Dec 2020 10:46:46 +0000
Subject: [PATCH 26/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201225035427 to 0.1.0-prerelease.20201227033512.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201225035427...0.1.0-prerelease.20201227033512)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 20 ++++----------------
package.json | 2 +-
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index cc326a88f..0cb01d721 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201225035427",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201225035427.tgz",
- "integrity": "sha512-iymZ91xkf/87EHZkWUQaZnu0eIYMm7b/bZ0mlpxdUrW6Mygr6uJsIAvjoQ2RZPQmdmAYqCpOkl2ST6ZxiNQcyw==",
+ "version": "0.1.0-prerelease.20201227033512",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201227033512.tgz",
+ "integrity": "sha512-78TV2zagXsBLm+lFzrW57UROkSpo3RnLfgP95232XxxEwTvMZfKM2SQAhRnV7D5FO0S83kl2Qkbw2ILz4kNntw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20591,7 +20591,7 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20201223034356",
- "scratch-l10n": "3.10.20201225031621",
+ "scratch-l10n": "3.10.20201227031524",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201225031621",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201225031621.tgz",
- "integrity": "sha512-Amefl39AtTAk/lpszIm0FxUL2lr4F8H1yvek46nIUHBNjqG7vSjahyXzdTgA31GsAJjDXl1ERws8DqcHhqUw6A==",
- "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 f61ff1c35..8e9b8e6f9 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201225035427",
+ "scratch-gui": "0.1.0-prerelease.20201227033512",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From b44c661f3bc8c85503261ef7deaa8dcbf7e37d64 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 03:39:12 +0000
Subject: [PATCH 27/33] Bump scratch-l10n from 3.10.20201227031524 to
3.10.20201229031520
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201227031524 to 3.10.20201229031520.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201227031524...3.10.20201229031520)
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 0cb01d721..b911da6fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201227031524",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201227031524.tgz",
+ "integrity": "sha512-rKWINVC2/miGmJ4mGoJcE350r6wNovxbWOiE+ro44gkxr5wZYL0IeQwHMf2LzhbtZXFnil0ImhRLffBk98L5Ag==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201227031524",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201227031524.tgz",
- "integrity": "sha512-rKWINVC2/miGmJ4mGoJcE350r6wNovxbWOiE+ro44gkxr5wZYL0IeQwHMf2LzhbtZXFnil0ImhRLffBk98L5Ag==",
+ "version": "3.10.20201229031520",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201229031520.tgz",
+ "integrity": "sha512-4UshjyKCCdZHnyO2nfqlQfOrA6/PaBF2cfZzVUqm9ufPxO8pQIMv5MQyhS8c7JMU7/8e1q5bIVFVxQy6eaffeQ==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 9de79cdb10b66482765a65d91bd9cd7b63dbddf6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 10:44:40 +0000
Subject: [PATCH 28/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201227033512 to 0.1.0-prerelease.20201229035216.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201227033512...0.1.0-prerelease.20201229035216)
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 b911da6fa..b8385d91e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4609,9 +4609,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001170",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz",
- "integrity": "sha512-Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==",
+ "version": "1.0.30001171",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001171.tgz",
+ "integrity": "sha512-5Alrh8TTYPG9IH4UkRqEBZoEToWRLvPbSQokvzSz0lii8/FOWKG4keO1HoYfPWs8IF/NH/dyNPg1cmJGvV3Zlg==",
"dev": true
},
"canvas-fit": {
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201223034356",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201223034356.tgz",
- "integrity": "sha512-aKBVxfiRacFOoJQ+sttVB46AxFHS/olcJOiUu9a9wfzxhBsJQsxRXAHIAziwZIvt1x8IK0EftMyL5XPUiWBqbQ==",
+ "version": "0.1.0-prerelease.20201228160904",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201228160904.tgz",
+ "integrity": "sha512-ptO3yX+bx5Y0yMfxfgRYmaVa1jWZCYG0bF13PCK995q5NVSj+o/DrUFY0/YhzUExn2Zd2ue4/gN355Kq+advxQ==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201227033512",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201227033512.tgz",
- "integrity": "sha512-78TV2zagXsBLm+lFzrW57UROkSpo3RnLfgP95232XxxEwTvMZfKM2SQAhRnV7D5FO0S83kl2Qkbw2ILz4kNntw==",
+ "version": "0.1.0-prerelease.20201229035216",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201229035216.tgz",
+ "integrity": "sha512-qbAr3UN5PajUNYCsG5Fo6LY5zzr9loHeNoizPUFdCD3EXpiNIujCTfqnrtJgHp45NY1THjkKnXe0qSSvVzV0Bg==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201223034356",
- "scratch-l10n": "3.10.20201227031524",
+ "scratch-blocks": "0.1.0-prerelease.20201228160904",
+ "scratch-l10n": "3.10.20201229031520",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201227031524",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201227031524.tgz",
- "integrity": "sha512-rKWINVC2/miGmJ4mGoJcE350r6wNovxbWOiE+ro44gkxr5wZYL0IeQwHMf2LzhbtZXFnil0ImhRLffBk98L5Ag==",
- "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 8e9b8e6f9..eba20def9 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201227033512",
+ "scratch-gui": "0.1.0-prerelease.20201229035216",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From fac2077e44b98c21b9e12cf6b64c91904bf7491e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Dec 2020 03:31:25 +0000
Subject: [PATCH 29/33] Bump scratch-l10n from 3.10.20201229031520 to
3.10.20201230031512
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201229031520 to 3.10.20201230031512.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201229031520...3.10.20201230031512)
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 b8385d91e..ec0dc0a5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201229031520",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201229031520.tgz",
+ "integrity": "sha512-4UshjyKCCdZHnyO2nfqlQfOrA6/PaBF2cfZzVUqm9ufPxO8pQIMv5MQyhS8c7JMU7/8e1q5bIVFVxQy6eaffeQ==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201229031520",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201229031520.tgz",
- "integrity": "sha512-4UshjyKCCdZHnyO2nfqlQfOrA6/PaBF2cfZzVUqm9ufPxO8pQIMv5MQyhS8c7JMU7/8e1q5bIVFVxQy6eaffeQ==",
+ "version": "3.10.20201230031512",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201230031512.tgz",
+ "integrity": "sha512-egyB4lN9lAdQiSn2vyIpifrCwUcgl8CJwCIeloNQpaLTpDwEToMuPGqMXzaYzPxqJ1hGoio2FgbIkDNuEEYXhA==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From db62ae59888c91492691e2e27af05e780d11e3b1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 03:37:06 +0000
Subject: [PATCH 30/33] Bump scratch-l10n from 3.10.20201230031512 to
3.10.20201231031527
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201230031512 to 3.10.20201231031527.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201230031512...3.10.20201231031527)
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 ec0dc0a5b..834ead7d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21092,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201230031512",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201230031512.tgz",
- "integrity": "sha512-egyB4lN9lAdQiSn2vyIpifrCwUcgl8CJwCIeloNQpaLTpDwEToMuPGqMXzaYzPxqJ1hGoio2FgbIkDNuEEYXhA==",
+ "version": "3.10.20201231031527",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201231031527.tgz",
+ "integrity": "sha512-P6ABqHnJeQyvjV3SwSnNksZJXvT2IMj1FU1qFuBMffS+7cjXkJLB3Yz1Z4TiChBtThlhh3YZ/nPJcSlhK6Byqg==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From 67f3838edd17c38c0367819fab776af745735621 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 10:50:35 +0000
Subject: [PATCH 31/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201229035216 to 0.1.0-prerelease.20201231040136.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201229035216...0.1.0-prerelease.20201231040136)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 28 ++++++++--------------------
package.json | 2 +-
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 834ead7d6..886a7ff5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201228160904",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201228160904.tgz",
- "integrity": "sha512-ptO3yX+bx5Y0yMfxfgRYmaVa1jWZCYG0bF13PCK995q5NVSj+o/DrUFY0/YhzUExn2Zd2ue4/gN355Kq+advxQ==",
+ "version": "0.1.0-prerelease.20201231033759",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201231033759.tgz",
+ "integrity": "sha512-aW5L6k+hOOyJAQf06x3hhPRZiFQXDpC0ySBK+fE65FMfJX7CoOZybaOw2rakQAgODasApR3KFZtAye3pcguYBw==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201229035216",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201229035216.tgz",
- "integrity": "sha512-qbAr3UN5PajUNYCsG5Fo6LY5zzr9loHeNoizPUFdCD3EXpiNIujCTfqnrtJgHp45NY1THjkKnXe0qSSvVzV0Bg==",
+ "version": "0.1.0-prerelease.20201231040136",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201231040136.tgz",
+ "integrity": "sha512-Z00ga4htaQcXncXjYDqe7LhyQmQVe0bssg+Hs7RD6BywbBgLLoJLIXOfrUi0yUMISWBdG8pS6SoHY2piJGP6hw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201228160904",
- "scratch-l10n": "3.10.20201229031520",
+ "scratch-blocks": "0.1.0-prerelease.20201231033759",
+ "scratch-l10n": "3.10.20201231031527",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201229031520",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201229031520.tgz",
- "integrity": "sha512-4UshjyKCCdZHnyO2nfqlQfOrA6/PaBF2cfZzVUqm9ufPxO8pQIMv5MQyhS8c7JMU7/8e1q5bIVFVxQy6eaffeQ==",
- "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 eba20def9..504988038 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201229035216",
+ "scratch-gui": "0.1.0-prerelease.20201231040136",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
From 481b05156ef96265f5109dd398b79b1c19301995 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 03:48:08 +0000
Subject: [PATCH 32/33] Bump scratch-l10n from 3.10.20201231031527 to
3.10.20210101031524
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201231031527 to 3.10.20210101031524.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201231031527...3.10.20210101031524)
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 886a7ff5a..1e211fa9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21013,6 +21013,18 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
+ "scratch-l10n": {
+ "version": "3.10.20201231031527",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201231031527.tgz",
+ "integrity": "sha512-P6ABqHnJeQyvjV3SwSnNksZJXvT2IMj1FU1qFuBMffS+7cjXkJLB3Yz1Z4TiChBtThlhh3YZ/nPJcSlhK6Byqg==",
+ "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",
@@ -21080,9 +21092,9 @@
}
},
"scratch-l10n": {
- "version": "3.10.20201231031527",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201231031527.tgz",
- "integrity": "sha512-P6ABqHnJeQyvjV3SwSnNksZJXvT2IMj1FU1qFuBMffS+7cjXkJLB3Yz1Z4TiChBtThlhh3YZ/nPJcSlhK6Byqg==",
+ "version": "3.10.20210101031524",
+ "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20210101031524.tgz",
+ "integrity": "sha512-35xT0fNTjyjCvJAlsDWHW41Fd6YvuCDcKhVkehsPfhEXPpx9oTuKMeBhtXhoJYBn1A96Gj7E+PkSGEjY4U8ukA==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
From fdeef2a13d00edd38b3e50f9040cc3977c2ca3dd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 10:47:59 +0000
Subject: [PATCH 33/33] Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201231040136 to 0.1.0-prerelease.20210101040933.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201231040136...0.1.0-prerelease.20210101040933)
Signed-off-by: dependabot-preview[bot]
---
package-lock.json | 28 ++++++++--------------------
package.json | 2 +-
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1e211fa9c..8d2c8ecbd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20527,9 +20527,9 @@
}
},
"scratch-blocks": {
- "version": "0.1.0-prerelease.20201231033759",
- "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201231033759.tgz",
- "integrity": "sha512-aW5L6k+hOOyJAQf06x3hhPRZiFQXDpC0ySBK+fE65FMfJX7CoOZybaOw2rakQAgODasApR3KFZtAye3pcguYBw==",
+ "version": "0.1.0-prerelease.20210101034043",
+ "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210101034043.tgz",
+ "integrity": "sha512-ruyYUiF4QvmjPSqp2mUv3PWNR1RJD2BE9gbeZJZz9bcfkiWczFQHEdCd8lWVV+TI83BUVpxiRwjAaNarPpiJhQ==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
- "version": "0.1.0-prerelease.20201231040136",
- "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201231040136.tgz",
- "integrity": "sha512-Z00ga4htaQcXncXjYDqe7LhyQmQVe0bssg+Hs7RD6BywbBgLLoJLIXOfrUi0yUMISWBdG8pS6SoHY2piJGP6hw==",
+ "version": "0.1.0-prerelease.20210101040933",
+ "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210101040933.tgz",
+ "integrity": "sha512-xKdyId0x8BaRz2uD0vZsy2NcO3w8l2HFQjwUUsK2TsUBnaodzqHeJ2n9wrE64GhRIWrcWiXybtm4kVduBT8bGQ==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@@ -20590,8 +20590,8 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
- "scratch-blocks": "0.1.0-prerelease.20201231033759",
- "scratch-l10n": "3.10.20201231031527",
+ "scratch-blocks": "0.1.0-prerelease.20210101034043",
+ "scratch-l10n": "3.10.20210101031524",
"scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3",
@@ -21013,18 +21013,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "scratch-l10n": {
- "version": "3.10.20201231031527",
- "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201231031527.tgz",
- "integrity": "sha512-P6ABqHnJeQyvjV3SwSnNksZJXvT2IMj1FU1qFuBMffS+7cjXkJLB3Yz1Z4TiChBtThlhh3YZ/nPJcSlhK6Byqg==",
- "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 504988038..7a7ccea5a 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
- "scratch-gui": "0.1.0-prerelease.20201231040136",
+ "scratch-gui": "0.1.0-prerelease.20210101040933",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",