From 7157057bab0739086bac6a66f58dda7f6278a6e8 Mon Sep 17 00:00:00 2001 From: Maximouse <51849865+mxmou@users.noreply.github.com> Date: Sun, 9 Jan 2022 14:15:29 +0100 Subject: [PATCH 01/25] Use font weight 500 consistently for teacher registration form labels --- src/components/forms/radio-group.jsx | 2 +- src/components/registration/steps.jsx | 4 ++-- src/components/registration/steps.scss | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/forms/radio-group.jsx b/src/components/forms/radio-group.jsx index 168f0a926..608748b0a 100644 --- a/src/components/forms/radio-group.jsx +++ b/src/components/forms/radio-group.jsx @@ -11,7 +11,7 @@ require('./radio-group.scss'); const RadioGroup = props => ( ); diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index da8fcd1aa..f9d17ca83 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -792,7 +792,7 @@ class OrganizationStep extends React.Component { }} />
- +

@@ -833,7 +833,7 @@ class OrganizationStep extends React.Component { />
- +

diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index a2cc34a58..dedfa1dbe 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -26,6 +26,10 @@ } } + .row-label { + font-weight: 500; + } + .help-text { margin: .25rem 0; text-align: left; @@ -64,6 +68,14 @@ } &.demographics-step { + .radio-group { + .control-label { + strong { + font-weight: 500; + } + } + } + .radio { margin: 1.5rem 1.5rem 0 0; } From 2bd58a32cee274d9aed847ed7e36355472c43bc2 Mon Sep 17 00:00:00 2001 From: Maximouse <51849865+mxmou@users.noreply.github.com> Date: Sun, 9 Jan 2022 16:50:42 +0100 Subject: [PATCH 02/25] Use className --- src/components/registration/steps.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index f9d17ca83..8dc4d9d4a 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -792,7 +792,7 @@ class OrganizationStep extends React.Component { }} />
- +

From f7afa73cc562484163eaddb5603feb6ec336fa6f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Jan 2022 22:11:10 +0000 Subject: [PATCH 03/25] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220119214001 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d5e4340fa..2b100b414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220118124756", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220118124756.tgz", - "integrity": "sha512-dyF9po7oRRIjslNFZoRa6I46YtKf5qeOEbDYk/bmqHdcr6MqnqVv6fV9je8PuBNCY9La/PbpPmbG2KsEr+Z37g==", + "version": "0.1.0-prerelease.20220119214001", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220119214001.tgz", + "integrity": "sha512-YbwMnneKz43K9tLSwirzo3NWtpNjvszOFC9+XBPdaFVds6RSG3GiDBIIHL0iFYCaHfxE1bZl1kOKi51OUxVGtw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.47", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.47.tgz", - "integrity": "sha512-ZHc8i3/cgeCRK/vC7W2htAG6JqUmOUgDNn/f9yY9J8UjfLjwzwOVEt4MWmgJAdvmxyrsR5KIFA/6+kUHGY0eUA==", + "version": "1.4.49", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz", + "integrity": "sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ==", "dev": true }, "has-flag": { diff --git a/package.json b/package.json index 133adc70d..c69d43c78 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20220118124756", + "scratch-gui": "0.1.0-prerelease.20220119214001", "scratch-l10n": "3.14.20220118031528", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From f6c6af580867da77c1477be3becf3869854f5d99 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 20 Jan 2022 03:46:23 +0000 Subject: [PATCH 04/25] chore(deps): update dependency scratch-l10n to v3.14.20220120031513 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b100b414..071876125 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20994,6 +20994,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20220118031528", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220118031528.tgz", + "integrity": "sha512-y5Mzi+r6hxZ3kfax3aXhfiJwJIfN8FHdcvLd0E46KqUjpbvbs1TTUZjWBQdV9SmWAwii8L7U0z+1iWN4+K7W+A==", + "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.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21060,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220118031528", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220118031528.tgz", - "integrity": "sha512-y5Mzi+r6hxZ3kfax3aXhfiJwJIfN8FHdcvLd0E46KqUjpbvbs1TTUZjWBQdV9SmWAwii8L7U0z+1iWN4+K7W+A==", + "version": "3.14.20220120031513", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220120031513.tgz", + "integrity": "sha512-X9TYIBtNJfnlmwsejMUJklOoBWjf0iSclZiJIwkBDPeHbu6adV9dNLMq0k99ihIN863AoGwrqJIUaGzCwKULnQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index c69d43c78..23319b6c8 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220118031528", + "scratch-l10n": "3.14.20220120031513", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From ad78172e0506abcc84f385085adc070e76c285c0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 21 Jan 2022 04:52:10 +0000 Subject: [PATCH 05/25] chore(deps): update dependency scratch-l10n to v3.14.20220121031527 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 071876125..be979994c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220120031513", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220120031513.tgz", - "integrity": "sha512-X9TYIBtNJfnlmwsejMUJklOoBWjf0iSclZiJIwkBDPeHbu6adV9dNLMq0k99ihIN863AoGwrqJIUaGzCwKULnQ==", + "version": "3.14.20220121031527", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220121031527.tgz", + "integrity": "sha512-C3S9r+Xe6d4ycYXs3bWTn4Rpk+G5oJhEgFV3KrNUoeKTTiy+wumthY8AnlWU+oFUekYgEWO6lNR0lwfOhPiKkQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 23319b6c8..e30814495 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220120031513", + "scratch-l10n": "3.14.20220121031527", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 1143821dab8645be4bbba395885bb7b56a00455c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Bentley?= Date: Fri, 21 Jan 2022 10:18:26 -0500 Subject: [PATCH 06/25] Updated text on Code of Ethics page --- src/views/ethics/ethics.jsx | 5 +++++ src/views/ethics/l10n.json | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/ethics/ethics.jsx b/src/views/ethics/ethics.jsx index 5c8419ea9..6e1bb6b87 100644 --- a/src/views/ethics/ethics.jsx +++ b/src/views/ethics/ethics.jsx @@ -25,6 +25,11 @@ const Ethics = () => ( + ), + researchEmailLink: ( + + + ) }} />

diff --git a/src/views/ethics/l10n.json b/src/views/ethics/l10n.json index 380a9aa94..9e208b04a 100644 --- a/src/views/ethics/l10n.json +++ b/src/views/ethics/l10n.json @@ -1,11 +1,12 @@ { "ethics.title": "Scratch Foundation Research Code of Ethics", - "ethics.intro1": "At the Scratch Foundation, our mission is to provide young people with digital tools and equitable opportunities to imagine, create, share, and learn. The Scratch platform is a free, safe, playful learning environment that engages all children in thinking creatively, reasoning systematically, and working collaboratively — essential skills for everyone in today's society. We work with educators and families to support children in this playful learning environment.", - "ethics.intro2": "This Code of Ethics guides Scratch Foundation employees and affiliates as they conduct research and evaluation in support of the efforts to improve the platform, user experience, teaching and learning outcomes, and grant-funded work. All research and evaluation work at the Foundation adheres to the following principles.", - "ethics.principle1Title": "Principle 1: Protect our users.", - "ethics.principle1": "{title} Scratch Foundation employees and contractors respect the privacy and confidentiality of users. Employees and contractors will not disclose any personally identifiable information about any user without the permission of the user or (if a minor) the user’s parent or guardian.", - "ethics.principle2Title": "Principle 2: Lead with honesty.", - "ethics.principle2": "{title} When collecting data, Foundation staff and contractors will disclose the objective, rationale, ways in which we safeguard data, and relevant Foundation contact information for anyone who requests that information.", - "ethics.principle3Title": "Principle 3. Adhere to the law.", - "ethics.principle3": "{title} Foundation staff and contractors will adhere to the spirit and letter of the law, particularly with regard to digital privacy policies such as (but not limited to) the Scratch Privacy Policy and the General Data Protection Regulation (GDPR)." + "ethics.intro1": "At the Scratch Foundation, our mission is to provide young people with digital tools and opportunities to imagine, create, share, and learn. The Scratch platform is a free, safe, playful learning environment that engages all children in thinking creatively, reasoning systematically, and working collaboratively — essential skills for everyone in today's society. We work with educators and families to support children in this playful learning environment.", + "ethics.intro2": "This Code of Ethics guides Scratch Foundation employees and affiliates as they conduct research and evaluation in support of the efforts to improve the platform, participant experience, teaching and learning outcomes, and grant-funded work. All research and evaluation work at the Foundation adheres to the following principles.", + "ethics.principle1Title": "Principle 1: Protect our participants.", + "ethics.researchEmailLinkText": "research@scratchfoundation.org", + "ethics.principle1": "{title} Scratch Foundation employees and contractors respect the privacy and confidentiality of participants. Employees and contractors will not disclose any personally identifiable information about any participant without the permission of the participant and (if a minor) the participant’s parent or guardian. Additionally, we will avoid causing harm to participants and seek to maximize the benefits of participation. Participation in research activities is always voluntary; contact us at {researchEmailLink} to opt-out.", + "ethics.principle2Title": "Principle 2: Lead with transparency.", + "ethics.principle2": "{title} When collecting data, Foundation staff and contractors will disclose the objective, participation requirements (including time and effort), any possible participation-related risks, ways in which we will safeguard and report the data, ways in which participants can opt out, and relevant Foundation contact information. ", + "ethics.principle3Title": "Principle 3. Embrace data-stewardship.", + "ethics.principle3": "{title} Foundation staff and contractors will ensure data security and compliance with digital privacy policies such as (but not limited to) the Scratch Privacy Policy and the General Data Protection Regulation (GDPR). " } From 8ddf80110fa7a1d8db818d839276b5063244f4f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 23 Jan 2022 05:07:43 +0000 Subject: [PATCH 07/25] chore(deps): update dependency scratch-l10n to v3.14.20220123031613 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index be979994c..2ec9644ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220121031527", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220121031527.tgz", - "integrity": "sha512-C3S9r+Xe6d4ycYXs3bWTn4Rpk+G5oJhEgFV3KrNUoeKTTiy+wumthY8AnlWU+oFUekYgEWO6lNR0lwfOhPiKkQ==", + "version": "3.14.20220123031613", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220123031613.tgz", + "integrity": "sha512-9yIX4nZ16hLozLnVk0gURBmtqF5yMnL3OVQtUQshW+3umV4yRmOOAXNFBeqFnYCdqWKMzsh2kOfU5yfVULOxDQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index e30814495..231a4b264 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220121031527", + "scratch-l10n": "3.14.20220123031613", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 55fa30e904488329411ec45b78da011facd5fdcb Mon Sep 17 00:00:00 2001 From: Maximouse <51849865+mxmou@users.noreply.github.com> Date: Sun, 23 Jan 2022 11:23:42 +0100 Subject: [PATCH 08/25] Use bold instead --- src/components/registration/steps.scss | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index dedfa1dbe..1dd988309 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -26,8 +26,16 @@ } } - .row-label { - font-weight: 500; + .row { + label { + font-weight: bold; + } + + .checkbox { + label { + font-weight: 300; + } + } } .help-text { @@ -68,16 +76,12 @@ } &.demographics-step { - .radio-group { - .control-label { - strong { - font-weight: 500; - } - } - } - .radio { margin: 1.5rem 1.5rem 0 0; + + label { + font-weight: 300; + } } input[type="radio"] { From bc75966ab4e2ab6c1dbfc7f7899f83a5fa4f5b65 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 24 Jan 2022 05:39:05 +0000 Subject: [PATCH 09/25] chore(deps): update dependency scratch-l10n to v3.14.20220124031601 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ec9644ef..288833b3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220123031613", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220123031613.tgz", - "integrity": "sha512-9yIX4nZ16hLozLnVk0gURBmtqF5yMnL3OVQtUQshW+3umV4yRmOOAXNFBeqFnYCdqWKMzsh2kOfU5yfVULOxDQ==", + "version": "3.14.20220124031601", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220124031601.tgz", + "integrity": "sha512-lINiD3KwLs+2op9//LY/cf/Bvn1yGb43j7TVmu0B7adoHKfkdaYED1V3ivEQzE/dcr1HElyjYiQDlG41PlKjNg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 231a4b264..3988371b6 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220123031613", + "scratch-l10n": "3.14.20220124031601", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From fe5982e110b9b06ddd0131c1c6ae2d2381b4a4b6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 26 Jan 2022 04:25:30 +0000 Subject: [PATCH 10/25] chore(deps): update dependency scratch-l10n to v3.14.20220126031626 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 288833b3c..08e192834 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220124031601", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220124031601.tgz", - "integrity": "sha512-lINiD3KwLs+2op9//LY/cf/Bvn1yGb43j7TVmu0B7adoHKfkdaYED1V3ivEQzE/dcr1HElyjYiQDlG41PlKjNg==", + "version": "3.14.20220126031626", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220126031626.tgz", + "integrity": "sha512-W29YHLRowoxNItqkkbnc0HSdEzuU5ySCUqo5gq8Q67FYyHfUDu2zUJGXwSZrxmMUxZ49sqQ5kbYLwYVCLlwixA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 3988371b6..1acd4a6ef 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220124031601", + "scratch-l10n": "3.14.20220126031626", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 9338f208980b81985e2deb318c9cef30ab5d0652 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 27 Jan 2022 05:05:46 +0000 Subject: [PATCH 11/25] chore(deps): update dependency scratch-l10n to v3.14.20220127031517 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08e192834..1beaa373d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220126031626", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220126031626.tgz", - "integrity": "sha512-W29YHLRowoxNItqkkbnc0HSdEzuU5ySCUqo5gq8Q67FYyHfUDu2zUJGXwSZrxmMUxZ49sqQ5kbYLwYVCLlwixA==", + "version": "3.14.20220127031517", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220127031517.tgz", + "integrity": "sha512-l1a77W4hqyeggdpS6zTgODgDV/rDhv2YEr4MeJPrH0abY8aziaz91SWHI+huIr+uDwVuohlN7XqvAy5SQUjQOg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 1acd4a6ef..e14a6332c 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220126031626", + "scratch-l10n": "3.14.20220127031517", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 345d23e3a8a8112fb3c58feca416c7027e224705 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 28 Jan 2022 04:32:16 +0000 Subject: [PATCH 12/25] chore(deps): update dependency scratch-l10n to v3.14.20220128031528 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1beaa373d..8b5ec450e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220127031517", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220127031517.tgz", - "integrity": "sha512-l1a77W4hqyeggdpS6zTgODgDV/rDhv2YEr4MeJPrH0abY8aziaz91SWHI+huIr+uDwVuohlN7XqvAy5SQUjQOg==", + "version": "3.14.20220128031528", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220128031528.tgz", + "integrity": "sha512-6BSO5OAZXvQA8fRyaXE7pa+cBe8U7EyNGz7IlahXhh8porWIydsO7dML5f3R+FpAH4ruuhfiRlgKVQHImhciYw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index e14a6332c..cd9cbea9e 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220127031517", + "scratch-l10n": "3.14.20220128031528", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 46435c4123cce785545b032bd16481d3ff511e7e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Jan 2022 04:16:16 +0000 Subject: [PATCH 13/25] chore(deps): update dependency scratch-l10n to v3.14.20220129031537 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b5ec450e..63fa09904 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220128031528", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220128031528.tgz", - "integrity": "sha512-6BSO5OAZXvQA8fRyaXE7pa+cBe8U7EyNGz7IlahXhh8porWIydsO7dML5f3R+FpAH4ruuhfiRlgKVQHImhciYw==", + "version": "3.14.20220129031537", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220129031537.tgz", + "integrity": "sha512-YM30JzmtSMcekLC8LQ32y2oVJ6SOiDSyiSDc5Cakf+3LcsEJIXuK8XN++VF4+nxBhB1PKQjvURf3bsz1UzoH0g==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index cd9cbea9e..d6297d5d6 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220128031528", + "scratch-l10n": "3.14.20220129031537", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From e473a86311dc2ea0f595c1ce04e7cf0d842e98d7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 30 Jan 2022 05:37:11 +0000 Subject: [PATCH 14/25] chore(deps): update dependency scratch-l10n to v3.14.20220130031518 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63fa09904..14baf8a6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220129031537", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220129031537.tgz", - "integrity": "sha512-YM30JzmtSMcekLC8LQ32y2oVJ6SOiDSyiSDc5Cakf+3LcsEJIXuK8XN++VF4+nxBhB1PKQjvURf3bsz1UzoH0g==", + "version": "3.14.20220130031518", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220130031518.tgz", + "integrity": "sha512-1BkXBLz6VLVy7C/8gVWOlGwg2DA+GWvcVN+ByQDMUZ25tK5JuqhdtMD5v7aqMG/nmPHv6aJtlwm+I12ioDqWhA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d6297d5d6..b5cc53f4b 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220129031537", + "scratch-l10n": "3.14.20220130031518", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From b5922994ca8adc6cb451f8df089e2ffdfd991d95 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 31 Jan 2022 04:35:57 +0000 Subject: [PATCH 15/25] chore(deps): update dependency scratch-l10n to v3.14.20220131031531 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14baf8a6e..b6bf1436c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220130031518", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220130031518.tgz", - "integrity": "sha512-1BkXBLz6VLVy7C/8gVWOlGwg2DA+GWvcVN+ByQDMUZ25tK5JuqhdtMD5v7aqMG/nmPHv6aJtlwm+I12ioDqWhA==", + "version": "3.14.20220131031531", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220131031531.tgz", + "integrity": "sha512-wIJljjR6EtTEstVCshdzYPGQH4V8epMglzguT82P37XZtasoHHJjeFUKmrpkxT6H0UEXfm3r9B1B8FbOdWZWGQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index b5cc53f4b..85a743e72 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220130031518", + "scratch-l10n": "3.14.20220131031531", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From c6b3f4eecd8fde8c463608546cbba4114a79c15b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Feb 2022 04:36:45 +0000 Subject: [PATCH 16/25] chore(deps): update dependency scratch-l10n to v3.14.20220201031528 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6bf1436c..d88d86fdb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220131031531", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220131031531.tgz", - "integrity": "sha512-wIJljjR6EtTEstVCshdzYPGQH4V8epMglzguT82P37XZtasoHHJjeFUKmrpkxT6H0UEXfm3r9B1B8FbOdWZWGQ==", + "version": "3.14.20220201031528", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220201031528.tgz", + "integrity": "sha512-sym9fnCwamoLmzw6UVRWw5zAgFZ+CpaWFWJFVbP7NVv47F4HNaT8EiviALqazjYo1TTqayT2Ca3ExaRvF/O3aA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 85a743e72..9c43ff34d 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220119214001", - "scratch-l10n": "3.14.20220131031531", + "scratch-l10n": "3.14.20220201031528", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From d55185eb1cbdbb2034ab48906e4f1f380db62255 Mon Sep 17 00:00:00 2001 From: zoebentley <37678690+zoebentley@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:29:35 -0500 Subject: [PATCH 17/25] Update src/views/ethics/ethics.jsx Leave email untranslated Co-authored-by: Sarah Otts --- src/views/ethics/ethics.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ethics/ethics.jsx b/src/views/ethics/ethics.jsx index 6e1bb6b87..f6317be29 100644 --- a/src/views/ethics/ethics.jsx +++ b/src/views/ethics/ethics.jsx @@ -28,7 +28,7 @@ const Ethics = () => ( ), researchEmailLink: ( - + research@scratchfoundation.org ) }} From 18a1f5f55f818a1c3998815b15700beb9d013427 Mon Sep 17 00:00:00 2001 From: zoebentley <37678690+zoebentley@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:30:04 -0500 Subject: [PATCH 18/25] Update src/views/ethics/l10n.json Leave email on translated Co-authored-by: Sarah Otts --- src/views/ethics/l10n.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ethics/l10n.json b/src/views/ethics/l10n.json index 9e208b04a..db30d8b92 100644 --- a/src/views/ethics/l10n.json +++ b/src/views/ethics/l10n.json @@ -3,7 +3,6 @@ "ethics.intro1": "At the Scratch Foundation, our mission is to provide young people with digital tools and opportunities to imagine, create, share, and learn. The Scratch platform is a free, safe, playful learning environment that engages all children in thinking creatively, reasoning systematically, and working collaboratively — essential skills for everyone in today's society. We work with educators and families to support children in this playful learning environment.", "ethics.intro2": "This Code of Ethics guides Scratch Foundation employees and affiliates as they conduct research and evaluation in support of the efforts to improve the platform, participant experience, teaching and learning outcomes, and grant-funded work. All research and evaluation work at the Foundation adheres to the following principles.", "ethics.principle1Title": "Principle 1: Protect our participants.", - "ethics.researchEmailLinkText": "research@scratchfoundation.org", "ethics.principle1": "{title} Scratch Foundation employees and contractors respect the privacy and confidentiality of participants. Employees and contractors will not disclose any personally identifiable information about any participant without the permission of the participant and (if a minor) the participant’s parent or guardian. Additionally, we will avoid causing harm to participants and seek to maximize the benefits of participation. Participation in research activities is always voluntary; contact us at {researchEmailLink} to opt-out.", "ethics.principle2Title": "Principle 2: Lead with transparency.", "ethics.principle2": "{title} When collecting data, Foundation staff and contractors will disclose the objective, participation requirements (including time and effort), any possible participation-related risks, ways in which we will safeguard and report the data, ways in which participants can opt out, and relevant Foundation contact information. ", From 7238d57354d6a1ed88cc59d0dd3118c62fad5e2a Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 28 Jan 2022 16:56:46 -0500 Subject: [PATCH 19/25] webpack config make limit TerserPlugin to parallel: 4 --- webpack.config.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 87a89ab73..6c704ad51 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,6 +8,7 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl const CopyWebpackPlugin = require('copy-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); +const TerserPlugin = require('terser-webpack-plugin'); // PostCss const autoprefixer = require('autoprefixer'); @@ -141,7 +142,14 @@ module.exports = { minChunks: pageRoutes.length // Extract only chunks common to all html pages } } - } + }, + minimize: true, + minimizer: [ + new TerserPlugin({ + parallel: 4 + }) + ] + }, plugins: [ new MiniCssExtractPlugin(), From 98a0bef30965f421fa0598a97c7edcd2cb47708a Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Tue, 1 Feb 2022 14:24:13 -0500 Subject: [PATCH 20/25] remove minimize: true from webpack config --- webpack.config.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 6c704ad51..bb2678140 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -143,13 +143,11 @@ module.exports = { } } }, - minimize: true, minimizer: [ new TerserPlugin({ parallel: 4 }) ] - }, plugins: [ new MiniCssExtractPlugin(), From 3daaed7e0731e035f51d07c03d5dd759382345c9 Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Mon, 24 Jan 2022 16:05:45 -0500 Subject: [PATCH 21/25] circle remove having separate jobs and caching --- .circleci/config.yml | 217 ++++++++++++------------------------------- 1 file changed, 59 insertions(+), 158 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fd545f7a..d6f093e44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,92 +8,74 @@ aliases: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD working_directory: ~/repo - - &save_git_cache - save_cache: - paths: - - .git - key: v1-git-{{ .Revision }} - - &restore_git_cache - restore_cache: - keys: - - v1-git-{{ .Revision }} - - v1-git- - - &save_npm_cache - save_cache: - paths: - - node_modules - key: v1-npm-{{ checksum "package-lock.json" }} - - &restore_npm_cache - restore_cache: - keys: - - v1-npm-{{ checksum "package-lock.json" }} - - &save_build_cache - save_cache: - paths: - - ./build - - ./intl - key: v1-build-{{ .Revision }} - - &restore_build_cache - restore_cache: - keys: - - v1-build-{{ .Revision }} - - v1-build- - - &build_no_cache + - &setup + name: "setup" + command: | + npm --production=false ci + mkdir ./test/results + - &lint + name: "run lint tests" + command: | + npm run test:lint:ci + - &build + name: "run npm build" + command: | + WWW_VERSION=${CIRCLE_SHA1:0:5} npm run build + - &unit + name: "Run unit tests" + command: | + JEST_JUNIT_OUTPUT_NAME=unit-jest-results.xml npm run test:unit:jest:unit -- --reporters=jest-junit + JEST_JUNIT_OUTPUT_NAME=localization-jest-results.xml npm run test:unit:jest:localization -- --reporters=jest-junit + npm run test:unit:tap -- --output-file ./test/results/unit-raw.tap + npm run test:unit:convertReportToXunit + - &setup_python + name: "setup python" + command: | + curl https://bootstrap.pypa.io/pip/3.5/get-pip.py -o get-pip.py + python3 get-pip.py pip==21.0.1 + pip install s3cmd==2.1.0 + - &deploy + name: "deploy" + command: | + npm run deploy + - &integration + name: "integration tests with Jest" + command: | + JEST_JUNIT_OUTPUT_NAME=integration-jest-results.xml npm run test:integration:remote -- --reporters=jest-junit + - &build_no_deploy <<: *defaults resource_class: large steps: - checkout - run: - name: "setup" - command: | - npm --production=false ci - mkdir ./test/results + <<: *setup - run: - name: "run lint tests" - command: | - npm run test:lint:ci + <<: *lint - run: - name: "run npm build" - command: | - WWW_VERSION=${CIRCLE_SHA1:0:5} npm run build + <<: *build - run: - name: "Run unit tests" - command: | - JEST_JUNIT_OUTPUT_NAME=unit-jest-results.xml npm run test:unit:jest:unit -- --reporters=jest-junit - JEST_JUNIT_OUTPUT_NAME=localization-jest-results.xml npm run test:unit:jest:localization -- --reporters=jest-junit - npm run test:unit:tap -- --output-file ./test/results/unit-raw.tap - npm run test:unit:convertReportToXunit + <<: *unit - store_test_results: path: test/results - - &build + - &build_and_deploy <<: *defaults resource_class: large steps: - - *restore_git_cache - checkout - run: - name: "setup" - command: | - npm --production=false ci - mkdir ./test/results + <<: *setup - run: - name: "run lint tests" - command: | - npm run test:lint:ci + <<: *lint - run: - name: "run npm build" - command: | - WWW_VERSION=${CIRCLE_SHA1:0:5} npm run build + <<: *build - run: - name: "Run unit tests" - command: | - JEST_JUNIT_OUTPUT_NAME=unit-jest-results.xml npm run test:unit:jest:unit -- --reporters=jest-junit - JEST_JUNIT_OUTPUT_NAME=localization-jest-results.xml npm run test:unit:jest:localization -- --reporters=jest-junit - npm run test:unit:tap -- --output-file ./test/results/unit-raw.tap - npm run test:unit:convertReportToXunit - - *save_npm_cache - - *save_git_cache - - *save_build_cache + <<: *unit + - run: + <<: *setup_python + - run: + <<: *deploy + - run: + <<: *integration - store_test_results: path: test/results - run: @@ -101,35 +83,6 @@ aliases: command: tar -cvzf build.tar build - store_artifacts: path: build.tar - - &deploy - <<: *defaults - steps: - - *restore_git_cache - - checkout - - *restore_npm_cache - - *restore_build_cache - - run: - name: "setup python" - command: | - curl https://bootstrap.pypa.io/pip/3.5/get-pip.py -o get-pip.py - python3 get-pip.py pip==21.0.1 - pip install s3cmd==2.1.0 - - run: - name: "deploy" - command: | - npm run deploy - - &integration_jest - <<: *defaults - steps: - - *restore_git_cache - - checkout - - *restore_npm_cache - - run: - name: "integration tests with Jest" - command: | - JEST_JUNIT_OUTPUT_NAME=integration-jest-results.xml npm run test:integration:remote -- --reporters=jest-junit - - store_test_results: - path: test/results - &update-translations <<: *defaults steps: @@ -142,27 +95,19 @@ aliases: command: npm run i18n:push jobs: - build-staging: - <<: *build - build-production: - <<: *build - deploy-staging: - <<: *deploy - deploy-production: - <<: *deploy - integration-staging-jest: - <<: *integration_jest - integration-production-jest: - <<: *integration_jest + build-and-deploy-staging: + <<: *build_and_deploy + build-and-deploy-production: + <<: *build_and_deploy update-translations: <<: *update-translations - build-no-cache: - <<: *build_no_cache + build-no-deploy: + <<: *build_no_deploy workflows: build-test-deploy: jobs: - - build-staging: + - build-and-deploy-staging: context: - scratch-www-all - scratch-www-staging @@ -172,7 +117,7 @@ workflows: - develop - /^hotfix\/.*/ - /^release\/.*/ - - build-production: + - build-and-deploy-production: context: - scratch-www-all - scratch-www-production @@ -180,50 +125,6 @@ workflows: branches: only: - master - - deploy-staging: - context: - - scratch-www-all - - scratch-www-staging - requires: - - build-staging - filters: - branches: - only: - - develop - - /^hotfix\/.*/ - - /^release\/.*/ - - deploy-production: - context: - - scratch-www-all - - scratch-www-production - requires: - - build-production - filters: - branches: - only: - - master - - integration-staging-jest: - context: - - scratch-www-all - - scratch-www-staging - requires: - - deploy-staging - filters: - branches: - only: - - develop - - /^hotfix\/.*/ - - /^release\/.*/ - - integration-production-jest: - context: - - scratch-www-all - - scratch-www-production - requires: - - deploy-production - filters: - branches: - only: - - master Update-translations: triggers: - schedule: # every evening at 7pm EST (8pm EDT, Midnight UTC) @@ -242,7 +143,7 @@ workflows: - develop build-test-no-deploy: jobs: - - build-no-cache: + - build-no-deploy: filters: branches: ignore: From fa74735caf0ecd7b16907f0e95f6d97489798828 Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Tue, 1 Feb 2022 14:59:24 -0500 Subject: [PATCH 22/25] add comment to circle config --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6f093e44..84e7f3694 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,6 +94,7 @@ aliases: name: "run i18n script" command: npm run i18n:push +# build-test-deploy requires two separately named jobs jobs: build-and-deploy-staging: <<: *build_and_deploy From d0357ee534f191ef194911e66e565292a0b99954 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Feb 2022 22:22:55 +0000 Subject: [PATCH 23/25] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220201204308 --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index d88d86fdb..bfd99580a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4509,9 +4509,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001300", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz", - "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==", + "version": "1.0.30001304", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz", + "integrity": "sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==", "dev": true }, "canvas-fit": { @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220119214001", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220119214001.tgz", - "integrity": "sha512-YbwMnneKz43K9tLSwirzo3NWtpNjvszOFC9+XBPdaFVds6RSG3GiDBIIHL0iFYCaHfxE1bZl1kOKi51OUxVGtw==", + "version": "0.1.0-prerelease.20220201204308", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220201204308.tgz", + "integrity": "sha512-bdDiMWuNnCyduEkqxWJBjsc4PBgEgtJx5Mk58e7kKZh8AnXSXEV3tnRGRuzxMYKKB31nVGg8kpSt3qj7w9gogA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.49", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz", - "integrity": "sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ==", + "version": "1.4.60", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.60.tgz", + "integrity": "sha512-h53hbEiKC6hijelDgxgkgAUC3PKyR7TmIfvjHnBjUGPMg/3sBuTyG6eDormw+lY24uUJvHkUPzB8dpK8b2u3Sw==", "dev": true }, "has-flag": { diff --git a/package.json b/package.json index 9c43ff34d..e17c3a33b 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20220119214001", + "scratch-gui": "0.1.0-prerelease.20220201204308", "scratch-l10n": "3.14.20220201031528", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From de1ddcdeceda756f2fd4d721c6a2f8964a343b23 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Feb 2022 04:38:30 +0000 Subject: [PATCH 24/25] chore(deps): update dependency scratch-l10n to v3.14.20220202031539 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index bfd99580a..41512f32c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21072,9 +21072,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220201031528", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220201031528.tgz", - "integrity": "sha512-sym9fnCwamoLmzw6UVRWw5zAgFZ+CpaWFWJFVbP7NVv47F4HNaT8EiviALqazjYo1TTqayT2Ca3ExaRvF/O3aA==", + "version": "3.14.20220202031539", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220202031539.tgz", + "integrity": "sha512-OBMVkfjuRpfOTF9+u9JrKyrJEIlvRbJzYd9KxiSvJLjF8BsdS4fALJDa8Yl4GX0w/DInSHt+iiO8xgtdf7WjgQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index e17c3a33b..63b88d2b6 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20220201204308", - "scratch-l10n": "3.14.20220201031528", + "scratch-l10n": "3.14.20220202031539", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 6e23a10405c046ab58739af699bc60e40393480e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Feb 2022 14:54:31 +0000 Subject: [PATCH 25/25] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220202135032 --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41512f32c..c4e029dbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4509,9 +4509,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001304", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz", - "integrity": "sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==", + "version": "1.0.30001305", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz", + "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==", "dev": true }, "canvas-fit": { @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220201204308", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220201204308.tgz", - "integrity": "sha512-bdDiMWuNnCyduEkqxWJBjsc4PBgEgtJx5Mk58e7kKZh8AnXSXEV3tnRGRuzxMYKKB31nVGg8kpSt3qj7w9gogA==", + "version": "0.1.0-prerelease.20220202135032", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220202135032.tgz", + "integrity": "sha512-OelxP2ULGnLz0f2Y10rdZ2cAipM2Iho8ZJYewesevOs3KhZKQguyj+b0D3T2fTxnU8CXKq36dpt7oGFGxJcPLg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.60", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.60.tgz", - "integrity": "sha512-h53hbEiKC6hijelDgxgkgAUC3PKyR7TmIfvjHnBjUGPMg/3sBuTyG6eDormw+lY24uUJvHkUPzB8dpK8b2u3Sw==", + "version": "1.4.61", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.61.tgz", + "integrity": "sha512-kpzCOOFlx63C9qKRyIDEsKIUgzoe98ump7T4gU+/OLzj8gYkkWf2SIyBjhTSE0keAjMAp3i7C262YtkQOMYrGw==", "dev": true }, "has-flag": { diff --git a/package.json b/package.json index 63b88d2b6..e01ee74d4 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20220201204308", + "scratch-gui": "0.1.0-prerelease.20220202135032", "scratch-l10n": "3.14.20220202031539", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0",