From 9a390eafebd252bd6765f14d30f7b3ec9b2a1ad3 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 6 Aug 2021 02:55:11 +0900 Subject: [PATCH 01/22] Move FAQ page to /faq --- src/components/footer/www/footer.jsx | 2 +- src/routes.json | 10 ++++++++-- src/views/about/about.jsx | 2 +- src/views/contact-us/contact-us.jsx | 4 ++-- src/views/parents/parents.jsx | 2 +- src/views/preview/unsupported-browser.jsx | 2 +- src/views/splash/presentation.jsx | 2 +- src/views/terms/terms.jsx | 2 +- test/integration/footer-links.test.js | 2 +- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx index 5603f76b2..f1a53be8e 100644 --- a/src/components/footer/www/footer.jsx +++ b/src/components/footer/www/footer.jsx @@ -138,7 +138,7 @@ const Footer = props => (
- +
diff --git a/src/routes.json b/src/routes.json index 6f7b86e4e..7c0059c39 100644 --- a/src/routes.json +++ b/src/routes.json @@ -151,8 +151,8 @@ }, { "name": "faq", - "pattern": "^/info/faq/?(\\?.*)?$", - "routeAlias": "/info/(cards|credits|faq)/?$", + "pattern": "^/faq/?(\\?.*)?$", + "routeAlias": "/faq", "view": "faq/faq", "title": "FAQ" }, @@ -392,6 +392,12 @@ "routeAlias": "/info/(cards|credits|faq|donate)/?$", "redirect" : "/credits" }, + { + "name" : "faq-redirect", + "pattern": "^/info/faq/?$", + "routeAlias": "/info/(cards|credits|faq|donate)/?$", + "redirect" : "/faq" + }, { "name": "donate-redirect", "pattern": "^/info/donate/?", diff --git a/src/views/about/about.jsx b/src/views/about/about.jsx index 52fe88eb9..1b38c04e9 100644 --- a/src/views/about/about.jsx +++ b/src/views/about/about.jsx @@ -175,7 +175,7 @@ const About = () => (
  • - +
  • diff --git a/src/views/contact-us/contact-us.jsx b/src/views/contact-us/contact-us.jsx index 03b9e95fd..2e57f148a 100644 --- a/src/views/contact-us/contact-us.jsx +++ b/src/views/contact-us/contact-us.jsx @@ -57,7 +57,7 @@ class ContactUs extends React.Component {

    + )}} />

    @@ -115,7 +115,7 @@ class ContactUs extends React.Component { {this.state.showForm && ( diff --git a/src/views/parents/parents.jsx b/src/views/parents/parents.jsx index 362de0a38..a8851d53e 100644 --- a/src/views/parents/parents.jsx +++ b/src/views/parents/parents.jsx @@ -114,7 +114,7 @@ const Landing = () => ( id="parents.faqMoreAndAsk" values={{ faqPage: ( - + diff --git a/src/views/preview/unsupported-browser.jsx b/src/views/preview/unsupported-browser.jsx index 1d16fac7d..8a5c5efcb 100644 --- a/src/views/preview/unsupported-browser.jsx +++ b/src/views/preview/unsupported-browser.jsx @@ -35,7 +35,7 @@ const UnsupportedBrowser = () => ( faqLink: ( diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index b65dde823..45f153ace 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -389,7 +389,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/ > Confirm your email {' '}to enable sharing.{' '} - + Having trouble? , diff --git a/src/views/terms/terms.jsx b/src/views/terms/terms.jsx index b372a6489..203cd2ebf 100644 --- a/src/views/terms/terms.jsx +++ b/src/views/terms/terms.jsx @@ -265,7 +265,7 @@ const Terms = () => (

    5.3 The source code for Scratch 1.4 is available for download and subject - to the copyright notice as indicated on the Scratch FAQ + to the copyright notice as indicated on the Scratch FAQ {' '}page.

    diff --git a/test/integration/footer-links.test.js b/test/integration/footer-links.test.js index 1e2eadd2f..7de3f475d 100644 --- a/test/integration/footer-links.test.js +++ b/test/integration/footer-links.test.js @@ -93,7 +93,7 @@ describe('www-integration footer links', () => { await clickText('FAQ'); let url = await driver.getCurrentUrl(); let pathname = (new URL(url)).pathname; - expect(pathname).toMatch(/^\/info\/faq\/?$/); + expect(pathname).toMatch(/^\/faq\/?$/); }); test('click Download link', async () => { From 6ffd1dbc661ad7ce733b02b310b700ea8b2a3a06 Mon Sep 17 00:00:00 2001 From: LankyBox01 <79767244+LankyBox01@users.noreply.github.com> Date: Sat, 28 Aug 2021 22:36:32 +0300 Subject: [PATCH 02/22] fix #5865 yup --- src/views/studio/studio.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index 30b18490c..551c9683d 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -204,6 +204,7 @@ $radius: 8px; img { margin-right: 0.5em; width: 1.5em; + height: 1.5em; filter: invert(0.55); } .tab-count { @@ -654,4 +655,4 @@ $radius: 8px; .studio-curator-mute-box { margin: 20px 0; -} \ No newline at end of file +} From dcadc47e6e32bb1c9ad7aa7e27525e2c066267fd Mon Sep 17 00:00:00 2001 From: Itta <86896657+itta611@users.noreply.github.com> Date: Tue, 14 Sep 2021 06:55:56 +0900 Subject: [PATCH 03/22] fix #5890 --- src/views/preview/comment/comment.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/preview/comment/comment.scss b/src/views/preview/comment/comment.scss index abd9ee6e2..e4f153a81 100644 --- a/src/views/preview/comment/comment.scss +++ b/src/views/preview/comment/comment.scss @@ -1,6 +1,6 @@ @import "../../../colors"; -.compose-row { +.compose-row, .compose-disabled { margin-top: 30px; margin-bottom: 40px; } From ac5fb8c9d2a157c30855bf44b5c97445ed95b62a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 6 Oct 2021 15:34:35 +0000 Subject: [PATCH 04/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211006130503 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 227ca9ae1..32236a5a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20526,9 +20526,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211006090606", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211006090606.tgz", - "integrity": "sha512-k5nVHArbf+H+1GmwU27JdVxBKEsLtMuXgz5NXDazbH8SxcbdXPXNOBecbq2E8La2nXA3aODI/88VFonSe1oyMg==", + "version": "0.1.0-prerelease.20211006130503", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211006130503.tgz", + "integrity": "sha512-evFzHsmZIJGI32h1vvFG/EJ/30cRNwfasapKD2ttYzFs8JvzPaqdrAS4mZdAUHskvSVc2hhFquD3Mw47tm0prg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20586,7 +20586,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211006040717", + "scratch-vm": "0.2.0-prerelease.20211006091121", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21225,9 +21225,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211006040717", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211006040717.tgz", - "integrity": "sha512-L8JzHKZsWk6DOiJ9HkpHHwtdZJQ2ZFtB41c6rBqPhPpRgOviBo9Wt8P2U662ZztJq2JrZPbesdmemqMf5Jkt5A==", + "version": "0.2.0-prerelease.20211006091121", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211006091121.tgz", + "integrity": "sha512-JKOlFpoO86i5Cz4T+j2y94bHGAra6mhrSfYRAu06tXeQS6SAppWLji0jUCMKNHcekQdjHUJsP9HXaojqByM6VA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 4c1863ff1..dd78878b0 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211006090606", + "scratch-gui": "0.1.0-prerelease.20211006130503", "scratch-l10n": "3.14.20211006031531", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 42bccff4f166b11627b722a6097c7ba3560f3075 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 8 Oct 2021 03:25:51 +0000 Subject: [PATCH 05/22] chore(deps): update dependency scratch-l10n to v3.14.20211008031546 --- package-lock.json | 146 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 84 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32236a5a8..a929405f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -225,20 +225,20 @@ "dev": true }, "@babel/core": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz", - "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz", + "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==", "dev": true, "requires": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.4", + "@babel/code-frame": "^7.15.8", + "@babel/generator": "^7.15.8", "@babel/helper-compilation-targets": "^7.15.4", - "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.8", "@babel/helpers": "^7.15.4", - "@babel/parser": "^7.15.5", + "@babel/parser": "^7.15.8", "@babel/template": "^7.15.4", "@babel/traverse": "^7.15.4", - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -248,21 +248,21 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "dev": true, "requires": { "@babel/highlight": "^7.14.5" } }, "@babel/generator": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", - "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", "dev": true, "requires": { - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -308,9 +308,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", "dev": true }, "@babel/template": { @@ -503,16 +503,10 @@ "picocolors": "^0.2.1" } }, - "caniuse-lite": { - "version": "1.0.30001264", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz", - "integrity": "sha512-Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA==", - "dev": true - }, "electron-to-chromium": { - "version": "1.3.860", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.860.tgz", - "integrity": "sha512-gWwGZ+Wv4Mou2SJRH6JQzhTPjL5f95SX7n6VkLTQ/Q/INsZLZNQ1vH2GlZjozKyvT0kkFuCmWTwIoCj+/hUDPw==", + "version": "1.3.862", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.862.tgz", + "integrity": "sha512-o+FMbCD+hAUJ9S8bfz/FaqA0gE8OpCCm58KhhGogOEqiA1BLFSoVYLi+tW+S/ZavnqBn++n0XZm7HQiBVPs8Jg==", "dev": true }, "semver": { @@ -625,9 +619,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz", - "integrity": "sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz", + "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.15.4", @@ -641,21 +635,21 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "dev": true, "requires": { "@babel/highlight": "^7.14.5" } }, "@babel/generator": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", - "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", "dev": true, "requires": { - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -701,9 +695,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", "dev": true }, "@babel/template": { @@ -860,21 +854,21 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "dev": true, "requires": { "@babel/highlight": "^7.14.5" } }, "@babel/generator": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", - "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", "dev": true, "requires": { - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -920,9 +914,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", "dev": true }, "@babel/template": { @@ -1093,21 +1087,21 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", - "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz", + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==", "dev": true, "requires": { "@babel/highlight": "^7.14.5" } }, "@babel/generator": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", - "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz", + "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==", "dev": true, "requires": { - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -1153,9 +1147,9 @@ } }, "@babel/parser": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz", - "integrity": "sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==", + "version": "7.15.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz", + "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==", "dev": true }, "@babel/template": { @@ -20523,6 +20517,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20211006031531" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20211006031531", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz", + "integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==", + "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-gui": { @@ -20928,6 +20936,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211006031531", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz", + "integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==", + "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", @@ -20994,9 +21014,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211006031531", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz", - "integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==", + "version": "3.14.20211008031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211008031546.tgz", + "integrity": "sha512-Mf6c2CEGpZEvGHIoDXiNVdkstNir7QOYz/5T4j1BcQ7IGyE2bOgeTFPP9ReXPcauf7sKHOTQaNCQraanOkSFfA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index dd78878b0..deaa52b4d 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211006130503", - "scratch-l10n": "3.14.20211006031531", + "scratch-l10n": "3.14.20211008031546", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 36a3669348f1c24b8eae13abd872bdcbbc33c742 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 8 Oct 2021 11:08:40 +0000 Subject: [PATCH 06/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211008105757 --- package-lock.json | 66 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index a929405f7..39798fcc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,35 +20508,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211006052142", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211006052142.tgz", - "integrity": "sha512-g7MIUkppbumntDSuAKQNJ2HUA4GYhmYK5e2p6iPULkOPuHktWOxZ/oZ3zuvpgyE+nTXjRz492dqSPycrireUIw==", + "version": "0.1.0-prerelease.20211008080038", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211008080038.tgz", + "integrity": "sha512-SL/Npmd7jTiKo9fRFxBgQY0Y8yXvmaNiDkNrVL16oM47e7gHiFmLkzV/fQDlnw3K657TUtRwbSXvKNN2+5F4VQ==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20211006031531" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20211006031531", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz", - "integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==", - "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-l10n": "3.14.20211008031546" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211006130503", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211006130503.tgz", - "integrity": "sha512-evFzHsmZIJGI32h1vvFG/EJ/30cRNwfasapKD2ttYzFs8JvzPaqdrAS4mZdAUHskvSVc2hhFquD3Mw47tm0prg==", + "version": "0.1.0-prerelease.20211008105757", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211008105757.tgz", + "integrity": "sha512-QKbB+AKtyri3iR28ZLyH7qCJs6NC+cc6eEkjFMgL52B8DEecgNuLd2wP4qXijXuAygEPOmVTEvLt/9resY3UFQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20587,14 +20573,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211006052142", - "scratch-l10n": "3.14.20211006031531", - "scratch-paint": "0.2.0-prerelease.20211006071611", + "scratch-blocks": "0.1.0-prerelease.20211008080038", + "scratch-l10n": "3.14.20211008031546", + "scratch-paint": "0.2.0-prerelease.20211008044157", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211006091121", + "scratch-vm": "0.2.0-prerelease.20211008071547", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20737,9 +20723,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.860", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.860.tgz", - "integrity": "sha512-gWwGZ+Wv4Mou2SJRH6JQzhTPjL5f95SX7n6VkLTQ/Q/INsZLZNQ1vH2GlZjozKyvT0kkFuCmWTwIoCj+/hUDPw==", + "version": "1.3.862", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.862.tgz", + "integrity": "sha512-o+FMbCD+hAUJ9S8bfz/FaqA0gE8OpCCm58KhhGogOEqiA1BLFSoVYLi+tW+S/ZavnqBn++n0XZm7HQiBVPs8Jg==", "dev": true }, "has-flag": { @@ -20936,18 +20922,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211006031531", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211006031531.tgz", - "integrity": "sha512-OyJePDPIVbcl9vR9xUxbORE56ZhBdw2q4bE29vgpMdk2uX6tsVul408Ea6DMsvg4j6qKFgFl1rELGr0i13U9xg==", - "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", @@ -21026,9 +21000,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20211006071611", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211006071611.tgz", - "integrity": "sha512-5hJTHgiUCOdzhUqgydQwVkpLr/KY1ow0i5Em7UTuCI98qUo1pFIKkSaR9ygEpEeHeC3anmxfmuUIpGRVJ4aHnA==", + "version": "0.2.0-prerelease.20211008044157", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211008044157.tgz", + "integrity": "sha512-Sb12Mo10RRK5i8abELUgYa/lHySNvYXLUSmlZjm6IdtMAlGRA3fFvDZhVgTjGcLqkxuqmdDBvvmHHho1aIJGWQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21245,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211006091121", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211006091121.tgz", - "integrity": "sha512-JKOlFpoO86i5Cz4T+j2y94bHGAra6mhrSfYRAu06tXeQS6SAppWLji0jUCMKNHcekQdjHUJsP9HXaojqByM6VA==", + "version": "0.2.0-prerelease.20211008071547", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211008071547.tgz", + "integrity": "sha512-kAHTRxUirZD4uB5l74SljgkI83tG4G+C95alAlx/ijFL2EDU/umV1Pa07mV3uoaoamKgRLFLz+cRRBgxyn+AmQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index deaa52b4d..0887a547d 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211006130503", + "scratch-gui": "0.1.0-prerelease.20211008105757", "scratch-l10n": "3.14.20211008031546", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 038d79a02a5299c20056612e066552f16f29c646 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 8 Oct 2021 14:01:23 +0000 Subject: [PATCH 07/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211008130122 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39798fcc7..bc410a311 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20520,9 +20520,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211008105757", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211008105757.tgz", - "integrity": "sha512-QKbB+AKtyri3iR28ZLyH7qCJs6NC+cc6eEkjFMgL52B8DEecgNuLd2wP4qXijXuAygEPOmVTEvLt/9resY3UFQ==", + "version": "0.1.0-prerelease.20211008130122", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211008130122.tgz", + "integrity": "sha512-7+QLn6JsZvPt4Hi9nsn5bVovYuyIP1Oi7ToHLGIiVL715mr28ieOgKq33OvluPEnWPWDErBNWmUs7Vhi4yJtsQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20580,7 +20580,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211008071547", + "scratch-vm": "0.2.0-prerelease.20211008105237", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21219,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211008071547", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211008071547.tgz", - "integrity": "sha512-kAHTRxUirZD4uB5l74SljgkI83tG4G+C95alAlx/ijFL2EDU/umV1Pa07mV3uoaoamKgRLFLz+cRRBgxyn+AmQ==", + "version": "0.2.0-prerelease.20211008105237", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211008105237.tgz", + "integrity": "sha512-hdaJCZr+0Ue9tFSMU8Jmrf02aNN41pr5t8f3uFgLoemIyAxGAYgbuzRckOe3VnQpRlS4x5QzlTNreOSNcw83JQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 0887a547d..a0b455681 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211008105757", + "scratch-gui": "0.1.0-prerelease.20211008130122", "scratch-l10n": "3.14.20211008031546", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 58dc901e0d99975e6bf7624890552a1b6469810b Mon Sep 17 00:00:00 2001 From: Itta <86896657+itta611@users.noreply.github.com> Date: Sat, 9 Oct 2021 07:10:11 +0900 Subject: [PATCH 08/22] Update src/views/preview/comment/comment.scss Thanks! Co-authored-by: Sarah Otts --- src/views/preview/comment/comment.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/preview/comment/comment.scss b/src/views/preview/comment/comment.scss index e4f153a81..b1bc682b4 100644 --- a/src/views/preview/comment/comment.scss +++ b/src/views/preview/comment/comment.scss @@ -2,7 +2,7 @@ .compose-row, .compose-disabled { margin-top: 30px; - margin-bottom: 40px; + margin-bottom: 32px; } .compose-comment { From 2aeace492d77c8477c215af8bc69e1e66ef52894 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 9 Oct 2021 07:44:49 +0000 Subject: [PATCH 09/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211009073348 --- package-lock.json | 26 +++++++++++++++++++------- package.json | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc410a311..cc5ef1528 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20520,9 +20520,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211008130122", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211008130122.tgz", - "integrity": "sha512-7+QLn6JsZvPt4Hi9nsn5bVovYuyIP1Oi7ToHLGIiVL715mr28ieOgKq33OvluPEnWPWDErBNWmUs7Vhi4yJtsQ==", + "version": "0.1.0-prerelease.20211009073348", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211009073348.tgz", + "integrity": "sha512-5s+yV2TlereAtEaoJX35BoMk7yCob+8th+gS+aoGf5y6ey9C6arP2n00l/qUEtJeEyGu6QruQ+fFKlJ4CKDbuA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20574,7 +20574,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211008080038", - "scratch-l10n": "3.14.20211008031546", + "scratch-l10n": "3.14.20211009031514", "scratch-paint": "0.2.0-prerelease.20211008044157", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20723,9 +20723,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.862", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.862.tgz", - "integrity": "sha512-o+FMbCD+hAUJ9S8bfz/FaqA0gE8OpCCm58KhhGogOEqiA1BLFSoVYLi+tW+S/ZavnqBn++n0XZm7HQiBVPs8Jg==", + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", "dev": true }, "has-flag": { @@ -20922,6 +20922,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211009031514", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", + "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", + "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", diff --git a/package.json b/package.json index a0b455681..cc3228682 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211008130122", + "scratch-gui": "0.1.0-prerelease.20211009073348", "scratch-l10n": "3.14.20211008031546", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 5fcb3c14989b09f6ac9378934bcef22ef660cee8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 9 Oct 2021 08:24:57 +0000 Subject: [PATCH 10/22] chore(deps): update dependency scratch-l10n to v3.14.20211009031514 --- package-lock.json | 20 +++++++++++++++++--- package.json | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc5ef1528..0780e0e39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20517,6 +20517,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20211008031546" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20211008031546", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211008031546.tgz", + "integrity": "sha512-Mf6c2CEGpZEvGHIoDXiNVdkstNir7QOYz/5T4j1BcQ7IGyE2bOgeTFPP9ReXPcauf7sKHOTQaNCQraanOkSFfA==", + "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-gui": { @@ -21000,9 +21014,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211008031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211008031546.tgz", - "integrity": "sha512-Mf6c2CEGpZEvGHIoDXiNVdkstNir7QOYz/5T4j1BcQ7IGyE2bOgeTFPP9ReXPcauf7sKHOTQaNCQraanOkSFfA==", + "version": "3.14.20211009031514", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", + "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index cc3228682..58e1b5ea9 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211009073348", - "scratch-l10n": "3.14.20211008031546", + "scratch-l10n": "3.14.20211009031514", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From f39d699f9937253eee6aef02339b20d79587367a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 9 Oct 2021 12:45:19 +0000 Subject: [PATCH 11/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211009120645 --- package-lock.json | 58 +++++++++++++---------------------------------- package.json | 2 +- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0780e0e39..90137c998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,35 +20508,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211008080038", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211008080038.tgz", - "integrity": "sha512-SL/Npmd7jTiKo9fRFxBgQY0Y8yXvmaNiDkNrVL16oM47e7gHiFmLkzV/fQDlnw3K657TUtRwbSXvKNN2+5F4VQ==", + "version": "0.1.0-prerelease.20211009073839", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211009073839.tgz", + "integrity": "sha512-Q2daRQIs3nrpfsXtpHgvzfEgk78rtS7wNHaCAUibzByOoJUagpEa1XZaULC8e0bPANn6UZZek8k89feHNfAArQ==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20211008031546" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20211008031546", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211008031546.tgz", - "integrity": "sha512-Mf6c2CEGpZEvGHIoDXiNVdkstNir7QOYz/5T4j1BcQ7IGyE2bOgeTFPP9ReXPcauf7sKHOTQaNCQraanOkSFfA==", - "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-l10n": "3.14.20211009031514" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211009073348", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211009073348.tgz", - "integrity": "sha512-5s+yV2TlereAtEaoJX35BoMk7yCob+8th+gS+aoGf5y6ey9C6arP2n00l/qUEtJeEyGu6QruQ+fFKlJ4CKDbuA==", + "version": "0.1.0-prerelease.20211009120645", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211009120645.tgz", + "integrity": "sha512-VWRe/5wNgpTmdGHMYgCwATueynfMFgr5J72oL8Tx9kfmyqDCQNd5HBRQSqHwBeHvvW0OFYf/u9F6CHPS8aWZmg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20587,14 +20573,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211008080038", + "scratch-blocks": "0.1.0-prerelease.20211009073839", "scratch-l10n": "3.14.20211009031514", - "scratch-paint": "0.2.0-prerelease.20211008044157", + "scratch-paint": "0.2.0-prerelease.20211009045139", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211008105237", + "scratch-vm": "0.2.0-prerelease.20211009094326", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20936,18 +20922,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211009031514", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", - "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", - "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", @@ -21026,9 +21000,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20211008044157", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211008044157.tgz", - "integrity": "sha512-Sb12Mo10RRK5i8abELUgYa/lHySNvYXLUSmlZjm6IdtMAlGRA3fFvDZhVgTjGcLqkxuqmdDBvvmHHho1aIJGWQ==", + "version": "0.2.0-prerelease.20211009045139", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211009045139.tgz", + "integrity": "sha512-c+XIBzsGCA1zD9DekWLTDKM/p3uYQV6CY+mnWHOT4RjvZ8HaOoDh+s0/zyp2dEu8Jz+OEyAl+hn8feNrwH8QYA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21245,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211008105237", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211008105237.tgz", - "integrity": "sha512-hdaJCZr+0Ue9tFSMU8Jmrf02aNN41pr5t8f3uFgLoemIyAxGAYgbuzRckOe3VnQpRlS4x5QzlTNreOSNcw83JQ==", + "version": "0.2.0-prerelease.20211009094326", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211009094326.tgz", + "integrity": "sha512-8VEZP7Wg5h75UChTDcQHrMAe/mbv37BWlzJYUbH86RYl0pHuhmar3yzqbUVrneR3g8wLAd2hVkobmcM6oOwgeA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 58e1b5ea9..5d81f04c5 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211009073348", + "scratch-gui": "0.1.0-prerelease.20211009120645", "scratch-l10n": "3.14.20211009031514", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 8355201e463809f547f11af5291a20a5e1407884 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 10 Oct 2021 03:53:41 +0000 Subject: [PATCH 12/22] chore(deps): update dependency scratch-l10n to v3.14.20211010031510 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90137c998..4e63601b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.862", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.862.tgz", - "integrity": "sha512-o+FMbCD+hAUJ9S8bfz/FaqA0gE8OpCCm58KhhGogOEqiA1BLFSoVYLi+tW+S/ZavnqBn++n0XZm7HQiBVPs8Jg==", + "version": "1.3.864", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", + "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", "dev": true }, "semver": { @@ -20517,6 +20517,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20211009031514" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20211009031514", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", + "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", + "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-gui": { @@ -20922,6 +20936,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211009031514", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", + "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", + "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", @@ -20988,9 +21014,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211009031514", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", - "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", + "version": "3.14.20211010031510", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", + "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 5d81f04c5..e0de094dc 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211009120645", - "scratch-l10n": "3.14.20211009031514", + "scratch-l10n": "3.14.20211010031510", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From a21aee448c452c827c15f1fc2f0a8a9fdf9de440 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 10 Oct 2021 05:21:47 +0000 Subject: [PATCH 13/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211010045433 --- 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 4e63601b4..09fd230ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20534,9 +20534,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211009120645", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211009120645.tgz", - "integrity": "sha512-VWRe/5wNgpTmdGHMYgCwATueynfMFgr5J72oL8Tx9kfmyqDCQNd5HBRQSqHwBeHvvW0OFYf/u9F6CHPS8aWZmg==", + "version": "0.1.0-prerelease.20211010045433", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211010045433.tgz", + "integrity": "sha512-ophv8GprzaWbude/6KKQNzJPnZzk49BkF8BdO7e/xzGVweLnItcZBtCj3pTep4OTxMO10vpLl1BlJ2sqNwhe6A==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20588,7 +20588,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211009073839", - "scratch-l10n": "3.14.20211009031514", + "scratch-l10n": "3.14.20211010031510", "scratch-paint": "0.2.0-prerelease.20211009045139", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20936,18 +20936,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211009031514", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", - "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", - "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", diff --git a/package.json b/package.json index e0de094dc..9ca4a08f0 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211009120645", + "scratch-gui": "0.1.0-prerelease.20211010045433", "scratch-l10n": "3.14.20211010031510", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 9254249ac6afbbf0376d0a053fa7554b1d66c2dc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 10 Oct 2021 12:49:22 +0000 Subject: [PATCH 14/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211010121103 --- package-lock.json | 46 ++++++++++++++++------------------------------ package.json | 2 +- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09fd230ea..daabd06bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,35 +20508,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211009073839", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211009073839.tgz", - "integrity": "sha512-Q2daRQIs3nrpfsXtpHgvzfEgk78rtS7wNHaCAUibzByOoJUagpEa1XZaULC8e0bPANn6UZZek8k89feHNfAArQ==", + "version": "0.1.0-prerelease.20211010075939", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211010075939.tgz", + "integrity": "sha512-ve15vgaE0qFfxfwb2Gdt7z90uYNS62OKl6bqWGQeoZdALOi1skRgJhWvAUFNOa9xsBgjjBiC08/ZsgL1JXAvBA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20211009031514" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20211009031514", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211009031514.tgz", - "integrity": "sha512-pKvD9LpHknjowuJRNdb4bwoQCpvlU/r9Zxoz/lp73hUVgrInxAPB5GZEnIE0as8CWbOGUMNuJNoGAmbNPX/N3w==", - "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-l10n": "3.14.20211010031510" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211010045433", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211010045433.tgz", - "integrity": "sha512-ophv8GprzaWbude/6KKQNzJPnZzk49BkF8BdO7e/xzGVweLnItcZBtCj3pTep4OTxMO10vpLl1BlJ2sqNwhe6A==", + "version": "0.1.0-prerelease.20211010121103", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211010121103.tgz", + "integrity": "sha512-g8Xq5ODwg0s8z8gH+doDgMWTkXfTJqvpvQ63qDy9b/4jS7oqvOsrR9zuNKU0BK6PnlULIrYmT5jCxWVEZNaQGA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20587,14 +20573,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211009073839", + "scratch-blocks": "0.1.0-prerelease.20211010075939", "scratch-l10n": "3.14.20211010031510", - "scratch-paint": "0.2.0-prerelease.20211009045139", + "scratch-paint": "0.2.0-prerelease.20211010044751", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211009094326", + "scratch-vm": "0.2.0-prerelease.20211010104353", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21014,9 +21000,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20211009045139", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211009045139.tgz", - "integrity": "sha512-c+XIBzsGCA1zD9DekWLTDKM/p3uYQV6CY+mnWHOT4RjvZ8HaOoDh+s0/zyp2dEu8Jz+OEyAl+hn8feNrwH8QYA==", + "version": "0.2.0-prerelease.20211010044751", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211010044751.tgz", + "integrity": "sha512-TsTgc1zKMqFQdHODsKUyTTc173GJgZiN4dFJ0ttfoFjsY2Fovlj1H6Me4Xu0XWi7m9CjctpQiA1y4NtqWHP6vQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21233,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211009094326", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211009094326.tgz", - "integrity": "sha512-8VEZP7Wg5h75UChTDcQHrMAe/mbv37BWlzJYUbH86RYl0pHuhmar3yzqbUVrneR3g8wLAd2hVkobmcM6oOwgeA==", + "version": "0.2.0-prerelease.20211010104353", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211010104353.tgz", + "integrity": "sha512-svZZ8LEUqKq9blvHdeGgHQ8weGkS4CHFnqwGZRHQLYU7sEff10kYgmXdmuwB7DL1z9oolCM4XnYc8rGteu1B8A==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 9ca4a08f0..4aadb1d0e 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211010045433", + "scratch-gui": "0.1.0-prerelease.20211010121103", "scratch-l10n": "3.14.20211010031510", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From b92783d5e680a887210b58762f9284bc24012085 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 04:21:21 +0000 Subject: [PATCH 15/22] chore(deps): update dependency scratch-l10n to v3.14.20211011031532 --- package-lock.json | 32 +++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index daabd06bc..fba03ca7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20517,6 +20517,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20211010031510" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20211010031510", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", + "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", + "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-gui": { @@ -20922,6 +20936,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211010031510", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", + "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", + "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", @@ -20988,9 +21014,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211010031510", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", - "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", + "version": "3.14.20211011031532", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", + "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 4aadb1d0e..59c1b0609 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211010121103", - "scratch-l10n": "3.14.20211010031510", + "scratch-l10n": "3.14.20211011031532", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 3e60aee3e0724551afe475793cf7b0c5c8f958b5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 07:12:21 +0000 Subject: [PATCH 16/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211011050928 --- 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 fba03ca7e..315f94cdf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20534,9 +20534,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211010121103", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211010121103.tgz", - "integrity": "sha512-g8Xq5ODwg0s8z8gH+doDgMWTkXfTJqvpvQ63qDy9b/4jS7oqvOsrR9zuNKU0BK6PnlULIrYmT5jCxWVEZNaQGA==", + "version": "0.1.0-prerelease.20211011050928", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011050928.tgz", + "integrity": "sha512-Pc+TmZb08dZQSVqOzfaaJpwkBCJQ87DUf7k1JmeN7+VnqO5svDp1pZR1p5/wRp5GF7XpMOR07Aq5MY9dANYyCA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20588,7 +20588,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211010075939", - "scratch-l10n": "3.14.20211010031510", + "scratch-l10n": "3.14.20211011031532", "scratch-paint": "0.2.0-prerelease.20211010044751", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20936,18 +20936,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211010031510", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", - "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", - "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", diff --git a/package.json b/package.json index 59c1b0609..f39b49683 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211010121103", + "scratch-gui": "0.1.0-prerelease.20211011050928", "scratch-l10n": "3.14.20211011031532", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 73dbe4aa77d09ae3f23b8d024e8e2eb0a43b7cce Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 12:16:05 +0000 Subject: [PATCH 17/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211011115231 --- package-lock.json | 38 ++++++++++++-------------------------- package.json | 2 +- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 315f94cdf..532b568ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,35 +20508,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211010075939", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211010075939.tgz", - "integrity": "sha512-ve15vgaE0qFfxfwb2Gdt7z90uYNS62OKl6bqWGQeoZdALOi1skRgJhWvAUFNOa9xsBgjjBiC08/ZsgL1JXAvBA==", + "version": "0.1.0-prerelease.20211011082619", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211011082619.tgz", + "integrity": "sha512-IT5j2M2RNLvvJXRYi4Qmbjzf+jL0pUAe4kaEPMqXGbuzMD/lpwwVBYVv56JqKaRjG6apm+70NZMlL2t/LfSpXA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20211010031510" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20211010031510", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211010031510.tgz", - "integrity": "sha512-LDv0+2nnphzFrxLrS7kInPFBTOPZsm/5V7iKS0f+NySDeKyX9lv9/MiHQDZU4B13jMDjkKcRZ7FcWCCfH3gIhA==", - "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-l10n": "3.14.20211011031532" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211011050928", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011050928.tgz", - "integrity": "sha512-Pc+TmZb08dZQSVqOzfaaJpwkBCJQ87DUf7k1JmeN7+VnqO5svDp1pZR1p5/wRp5GF7XpMOR07Aq5MY9dANYyCA==", + "version": "0.1.0-prerelease.20211011115231", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011115231.tgz", + "integrity": "sha512-bbTw7j7lFafDZ23WKTahAInt5X0i2L7+bv1kcUDcA9b7Kx/GC2cZRp+xa9QrctSTfqSr+wCVO7xESTQWShrgOQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20587,14 +20573,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211010075939", + "scratch-blocks": "0.1.0-prerelease.20211011082619", "scratch-l10n": "3.14.20211011031532", "scratch-paint": "0.2.0-prerelease.20211010044751", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211010104353", + "scratch-vm": "0.2.0-prerelease.20211011072154", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21233,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211010104353", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211010104353.tgz", - "integrity": "sha512-svZZ8LEUqKq9blvHdeGgHQ8weGkS4CHFnqwGZRHQLYU7sEff10kYgmXdmuwB7DL1z9oolCM4XnYc8rGteu1B8A==", + "version": "0.2.0-prerelease.20211011072154", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011072154.tgz", + "integrity": "sha512-amqbb1GoI9naM6WLdl6ij2ncPr4uklxYpETUu2w34bKH6gKLiER2VCaxeH4i0Dwr4nrdo8OZlMpGQxMydks0jQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index f39b49683..e6ee311c3 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211011050928", + "scratch-gui": "0.1.0-prerelease.20211011115231", "scratch-l10n": "3.14.20211011031532", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 91afd547efab1071db9960d02683b0f62343de74 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 15:41:06 +0000 Subject: [PATCH 18/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211011151713 --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 532b568ce..bd07ed561 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20520,9 +20520,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211011115231", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011115231.tgz", - "integrity": "sha512-bbTw7j7lFafDZ23WKTahAInt5X0i2L7+bv1kcUDcA9b7Kx/GC2cZRp+xa9QrctSTfqSr+wCVO7xESTQWShrgOQ==", + "version": "0.1.0-prerelease.20211011151713", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011151713.tgz", + "integrity": "sha512-pTD6fxSDUkq/rlmZ1rCAkDrLaSFcMCCPvTmkmbdWYCqYlUEYOuWx5dpeTOgbSwZ2U+Ll3wsimLQmHisTBwJ4qg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20575,12 +20575,12 @@ "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211011082619", "scratch-l10n": "3.14.20211011031532", - "scratch-paint": "0.2.0-prerelease.20211010044751", + "scratch-paint": "0.2.0-prerelease.20211011080827", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211011072154", + "scratch-vm": "0.2.0-prerelease.20211011104249", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21000,9 +21000,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20211010044751", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211010044751.tgz", - "integrity": "sha512-TsTgc1zKMqFQdHODsKUyTTc173GJgZiN4dFJ0ttfoFjsY2Fovlj1H6Me4Xu0XWi7m9CjctpQiA1y4NtqWHP6vQ==", + "version": "0.2.0-prerelease.20211011080827", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211011080827.tgz", + "integrity": "sha512-/xBUqx6e4iuaEWhL8tD5x70dnpTMxxMGO2dO/rmNYpJWTu8R8KxA4ot+agwhy9OScfC/zQ8JIMR5+UOvCtEGRQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21219,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211011072154", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011072154.tgz", - "integrity": "sha512-amqbb1GoI9naM6WLdl6ij2ncPr4uklxYpETUu2w34bKH6gKLiER2VCaxeH4i0Dwr4nrdo8OZlMpGQxMydks0jQ==", + "version": "0.2.0-prerelease.20211011104249", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011104249.tgz", + "integrity": "sha512-wxkgY1VK7yWvFWEbjxxh8sHcuxT71v/JNUunUo6SFTp6e5Oa3Egxn7CLbmC/UG55d6G2qzIovPOlFqx2/ftZxA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index e6ee311c3..69be26970 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211011115231", + "scratch-gui": "0.1.0-prerelease.20211011151713", "scratch-l10n": "3.14.20211011031532", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From c547df185f538886fe7a113d63655163f75b5438 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Oct 2021 21:01:57 +0000 Subject: [PATCH 19/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211011202750 --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd07ed561..f3d6b7e5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,9 +20508,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211011082619", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211011082619.tgz", - "integrity": "sha512-IT5j2M2RNLvvJXRYi4Qmbjzf+jL0pUAe4kaEPMqXGbuzMD/lpwwVBYVv56JqKaRjG6apm+70NZMlL2t/LfSpXA==", + "version": "0.1.0-prerelease.20211011161731", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211011161731.tgz", + "integrity": "sha512-Od892LCkzcjK+HzEUYG9W6DQ5Ofz5X2b2bWbCTelzyo4OWD1NS1UE7AIcGvo5Q/H2pe0d929tB/nL6XEoythNw==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20520,9 +20520,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211011151713", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011151713.tgz", - "integrity": "sha512-pTD6fxSDUkq/rlmZ1rCAkDrLaSFcMCCPvTmkmbdWYCqYlUEYOuWx5dpeTOgbSwZ2U+Ll3wsimLQmHisTBwJ4qg==", + "version": "0.1.0-prerelease.20211011202750", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011202750.tgz", + "integrity": "sha512-6gZWVbjpuLM5MFpR6rrvb/TkxSUF33V4F9Ag1oNVyibx3iJclzMWJJGoihNNZEiJ+Irpmi2lznlzbrKZuisnow==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20573,14 +20573,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211011082619", + "scratch-blocks": "0.1.0-prerelease.20211011161731", "scratch-l10n": "3.14.20211011031532", "scratch-paint": "0.2.0-prerelease.20211011080827", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211011104249", + "scratch-vm": "0.2.0-prerelease.20211011184543", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21219,9 +21219,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211011104249", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011104249.tgz", - "integrity": "sha512-wxkgY1VK7yWvFWEbjxxh8sHcuxT71v/JNUunUo6SFTp6e5Oa3Egxn7CLbmC/UG55d6G2qzIovPOlFqx2/ftZxA==", + "version": "0.2.0-prerelease.20211011184543", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011184543.tgz", + "integrity": "sha512-4t/uIQt35HGL52U5gp9/DXALycvo1KkFmsAOyOy4hahrI6xLOGA5M27zOZDh4c9GX8EGPV51xzTqLstd/Fh3Wg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 69be26970..cc1e023c3 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211011151713", + "scratch-gui": "0.1.0-prerelease.20211011202750", "scratch-l10n": "3.14.20211011031532", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From b2d7a7d863ce2a5c03cf79ab3f44d5b731e173ef Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 13 Oct 2021 04:41:02 +0000 Subject: [PATCH 20/22] chore(deps): update dependency scratch-l10n to v3.14.20211013031511 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3d6b7e5e..7f68ffe8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.864", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", - "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", + "version": "1.3.867", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz", + "integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==", "dev": true }, "semver": { @@ -20517,6 +20517,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20211011031532" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20211011031532", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", + "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", + "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-gui": { @@ -20922,6 +20936,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211011031532", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", + "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", + "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", @@ -20988,9 +21014,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211011031532", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", - "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", + "version": "3.14.20211013031511", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211013031511.tgz", + "integrity": "sha512-AeAIz+u7lblZMis8xwA4kxJoRmG4UIjRwRaRaApoicGpbUjap2WFpylSy7ebIDn6CBo8TKNH6mRY9Mmgzp23Kw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index cc1e023c3..96c40f60a 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211011202750", - "scratch-l10n": "3.14.20211011031532", + "scratch-l10n": "3.14.20211013031511", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From a7fbace1474af8b81023b4a015bd172821f2f9ff Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 13 Oct 2021 11:29:27 +0000 Subject: [PATCH 21/22] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211013110407 --- package-lock.json | 58 +++++++++++++---------------------------------- package.json | 2 +- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f68ffe8e..370583e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20508,35 +20508,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20211011161731", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211011161731.tgz", - "integrity": "sha512-Od892LCkzcjK+HzEUYG9W6DQ5Ofz5X2b2bWbCTelzyo4OWD1NS1UE7AIcGvo5Q/H2pe0d929tB/nL6XEoythNw==", + "version": "0.1.0-prerelease.20211013085421", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211013085421.tgz", + "integrity": "sha512-OOa5CgD7ZZ8zFqVUOhiSep4xtRLgswl6mZUqWPVO2BT4SbJH19xlu91xCBpbHm5ozrmA6XMzMJcmX/TO57Ye6A==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20211011031532" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20211011031532", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", - "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", - "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-l10n": "3.14.20211013031511" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211011202750", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211011202750.tgz", - "integrity": "sha512-6gZWVbjpuLM5MFpR6rrvb/TkxSUF33V4F9Ag1oNVyibx3iJclzMWJJGoihNNZEiJ+Irpmi2lznlzbrKZuisnow==", + "version": "0.1.0-prerelease.20211013110407", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211013110407.tgz", + "integrity": "sha512-2M8qawOyb7fzd16cjeJQUgR70BriUnArRa77TvVADRqpxDDimXs6R7/QA9IwZLNeomrCMHOYZ18gXAI4T9vnsw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20587,9 +20573,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20211011161731", - "scratch-l10n": "3.14.20211011031532", - "scratch-paint": "0.2.0-prerelease.20211011080827", + "scratch-blocks": "0.1.0-prerelease.20211013085421", + "scratch-l10n": "3.14.20211013031511", + "scratch-paint": "0.2.0-prerelease.20211013052452", "scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", @@ -20737,9 +20723,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.864", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz", - "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==", + "version": "1.3.867", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz", + "integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==", "dev": true }, "has-flag": { @@ -20936,18 +20922,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211011031532", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211011031532.tgz", - "integrity": "sha512-fwqgoGoxNCFXFUWaE8bw85VnR5OKNX6Q9gDywL0Sz/3q4ewAQAvv2/ohsIO0zHfhsbrqY69xBaVgS8TDWZfPuA==", - "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", @@ -21026,9 +21000,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20211011080827", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211011080827.tgz", - "integrity": "sha512-/xBUqx6e4iuaEWhL8tD5x70dnpTMxxMGO2dO/rmNYpJWTu8R8KxA4ot+agwhy9OScfC/zQ8JIMR5+UOvCtEGRQ==", + "version": "0.2.0-prerelease.20211013052452", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211013052452.tgz", + "integrity": "sha512-pyKwXuxcxmS9WoHIoiE3CkifZVapIpUOiQmbcM5XV/BS6GqJ8CKwknUFRrO5pM5UUhGU8ksGSnJEtoI80MYqkA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 96c40f60a..95bad361f 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211011202750", + "scratch-gui": "0.1.0-prerelease.20211013110407", "scratch-l10n": "3.14.20211013031511", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From c25059bb4b53cc6db11d72e13d8f8704a8b978ee Mon Sep 17 00:00:00 2001 From: seotts Date: Wed, 13 Oct 2021 15:35:22 -0400 Subject: [PATCH 22/22] Redirect 3faq to /faq, not /info/faq --- src/routes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes.json b/src/routes.json index 39bbc63c6..714ee1b86 100644 --- a/src/routes.json +++ b/src/routes.json @@ -376,7 +376,7 @@ "name":"3-faq-redirect", "pattern": "^/3faq/?$", "routeAlias": "/3faq/?$", - "redirect": "info/faq#scratch3" + "redirect": "/faq#scratch3" }, { "name" : "credits-redirect",