From c5c4bc163d4bb8275dfb193ebd4e6477f121f5af Mon Sep 17 00:00:00 2001 From: Erika Delfino Date: Thu, 1 Dec 2022 12:43:07 -0500 Subject: [PATCH 01/21] Fix(7137) Make the love and favorite icons colorblind friendly --- src/views/preview/stats.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/preview/stats.scss b/src/views/preview/stats.scss index b2bded497..cb9f83116 100644 --- a/src/views/preview/stats.scss +++ b/src/views/preview/stats.scss @@ -55,8 +55,9 @@ cursor: pointer; &:before { + opacity: .5; - background-image: url("/svgs/project/love-gray.svg"); + background-image: url("/svgs/love/love_type-gray.svg"); } } @@ -64,7 +65,7 @@ &:before { opacity: 1; - background-image: url("/svgs/project/love-red.svg"); + background-image: url("/svgs/favorite/favorite_type-gray.svg"); } } From 9c949ad0a42c04679fcc1f3f360f418857c112df Mon Sep 17 00:00:00 2001 From: Erika Delfino Date: Thu, 1 Dec 2022 21:27:36 -0500 Subject: [PATCH 02/21] Changes to stats, and new svgs --- src/views/preview/stats.scss | 4 ++-- static/svgs/project/fav-gray.svg | 13 +++---------- static/svgs/project/love-gray.svg | 13 +++---------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/views/preview/stats.scss b/src/views/preview/stats.scss index cb9f83116..3eb770008 100644 --- a/src/views/preview/stats.scss +++ b/src/views/preview/stats.scss @@ -57,7 +57,7 @@ &:before { opacity: .5; - background-image: url("/svgs/love/love_type-gray.svg"); + background-image: url("/svgs/project/love-gray.svg"); } } @@ -65,7 +65,7 @@ &:before { opacity: 1; - background-image: url("/svgs/favorite/favorite_type-gray.svg"); + background-image: url("/svgs/project/love-red.svg"); } } diff --git a/static/svgs/project/fav-gray.svg b/static/svgs/project/fav-gray.svg index 40fff7b6d..ebde608e8 100644 --- a/static/svgs/project/fav-gray.svg +++ b/static/svgs/project/fav-gray.svg @@ -1,10 +1,3 @@ - - - - fav-gray - Created with Sketch. - - - - - \ No newline at end of file + + + diff --git a/static/svgs/project/love-gray.svg b/static/svgs/project/love-gray.svg index fe6a0ec3d..19f721512 100644 --- a/static/svgs/project/love-gray.svg +++ b/static/svgs/project/love-gray.svg @@ -1,10 +1,3 @@ - - - - love-gray - Created with Sketch. - - - - - \ No newline at end of file + + + From eadc133cec519b2c056f4c537a30230730268f58 Mon Sep 17 00:00:00 2001 From: Erika Delfino Date: Wed, 7 Dec 2022 12:27:00 -0500 Subject: [PATCH 03/21] Fixes issue on EV3 --- src/components/extension-landing/extension-landing.scss | 1 + src/views/ev3/ev3.jsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/extension-landing/extension-landing.scss b/src/components/extension-landing/extension-landing.scss index a9182d592..7d0748d37 100644 --- a/src/components/extension-landing/extension-landing.scss +++ b/src/components/extension-landing/extension-landing.scss @@ -106,6 +106,7 @@ display: flex; margin-bottom: 2rem; color: $ui-white; + width: 100%; img { padding-right: .5rem; diff --git a/src/views/ev3/ev3.jsx b/src/views/ev3/ev3.jsx index 8c08a30c4..43c75be9f 100644 --- a/src/views/ev3/ev3.jsx +++ b/src/views/ev3/ev3.jsx @@ -39,7 +39,7 @@ class EV3 extends ExtensionLanding { renderCopy={

LEGO MINDSTORMS EV3

Date: Thu, 12 Jan 2023 05:37:45 +0000 Subject: [PATCH 04/21] fix(deps): update dependency scratch-l10n to v3.15.20230112032116 --- package-lock.json | 80 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3289507fb..72c10ffcd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.5", - "scratch-l10n": "3.15.20230110032123", + "scratch-l10n": "3.15.20230112032116", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23095,6 +23095,24 @@ "scratch-l10n": "3.15.20230110032123" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230110032123", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", + "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.5.tgz", @@ -23433,6 +23451,24 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.15.20230110032123", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", + "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", @@ -23515,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "version": "3.15.20230112032116", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", + "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51106,6 +51142,22 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", "scratch-l10n": "3.15.20230110032123" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.15.20230110032123", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", + "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51392,6 +51444,20 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.15.20230110032123", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", + "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", @@ -51456,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", + "version": "3.15.20230112032116", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", + "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 788b79ca7..f8f6fa221 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.5", - "scratch-l10n": "3.15.20230110032123", + "scratch-l10n": "3.15.20230112032116", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From aade9965c3edc0d12c8abf3f13efe0b529bed3cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:48:35 +0000 Subject: [PATCH 05/21] fix(deps): update dependency scratch-gui to v1.3.7 --- package-lock.json | 84 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 26 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72c10ffcd..2cbc10c9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.5", + "scratch-gui": "1.3.7", "scratch-l10n": "3.15.20230112032116", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23084,39 +23084,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20230110085824", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230110085824.tgz", - "integrity": "sha512-GHoE6UH67bB5OLRrPFl/cMHiq7fed0R111sS2QtjxRPLz40uXAvKYE6xphFxYY4z2bvOz1KM0Ya1sg0zsBYMIw==", + "version": "0.1.0-prerelease.20230112072449", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230112072449.tgz", + "integrity": "sha512-FdMBamFEgu5DCFVX+Ex5FJnrBeySCSvq+ON7wabmWdka4/yWBbph6yNyyfSduC+V3etZ1Xo70GyuDPLFELcz/g==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230110032123" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.15.20230112032116" } }, "node_modules/scratch-gui": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.5.tgz", - "integrity": "sha512-EOgNxudEtwNm9USdou9uWvrPlhUXffctEvRyScGxmkvtkhag4sA1zxFuJEAldUj0TDcUbFwKDaIzqZsmvNcHTg==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.7.tgz", + "integrity": "sha512-LMdY61UXdyNNZRzC3FslEdrOYWO00rAQwdtYDj5ilLJ191rf5onqgyFQwdqSGHcfIveKQs9VUAc1M8wjBwgGbA==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -23167,14 +23149,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230110085824", + "scratch-blocks": "0.1.0-prerelease.20230112072449", "scratch-l10n": "3.15.20230110032123", "scratch-paint": "1.1.31", "scratch-render": "0.1.0-prerelease.20221121051603", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.0.2", "scratch-svg-renderer": "0.2.0-prerelease.20221120235613", - "scratch-vm": "1.3.14", + "scratch-vm": "1.3.16", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23751,9 +23733,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.14.tgz", - "integrity": "sha512-P1l6oFzEObNP2WoO8N9bs2BqZ3ZvY/YrvzHeq14OC2i4l6BTbGX3tZiuPAAeVXTCodZKrssO/ny027jKYTqfkg==", + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.16.tgz", + "integrity": "sha512-YAXeW+LZTJSlQ2763gv2B1QWec420/iXtDZTb9MqTn4Yl26diVQk0Ub3QOoq3LipGg2UoDy//GnODOiPe4hmvQ==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -51133,37 +51115,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20230110085824", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230110085824.tgz", - "integrity": "sha512-GHoE6UH67bB5OLRrPFl/cMHiq7fed0R111sS2QtjxRPLz40uXAvKYE6xphFxYY4z2bvOz1KM0Ya1sg0zsBYMIw==", + "version": "0.1.0-prerelease.20230112072449", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230112072449.tgz", + "integrity": "sha512-FdMBamFEgu5DCFVX+Ex5FJnrBeySCSvq+ON7wabmWdka4/yWBbph6yNyyfSduC+V3etZ1Xo70GyuDPLFELcz/g==", "dev": true, "requires": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230110032123" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.15.20230112032116" } }, "scratch-gui": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.5.tgz", - "integrity": "sha512-EOgNxudEtwNm9USdou9uWvrPlhUXffctEvRyScGxmkvtkhag4sA1zxFuJEAldUj0TDcUbFwKDaIzqZsmvNcHTg==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.7.tgz", + "integrity": "sha512-LMdY61UXdyNNZRzC3FslEdrOYWO00rAQwdtYDj5ilLJ191rf5onqgyFQwdqSGHcfIveKQs9VUAc1M8wjBwgGbA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -51214,14 +51180,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230110085824", + "scratch-blocks": "0.1.0-prerelease.20230112072449", "scratch-l10n": "3.15.20230110032123", "scratch-paint": "1.1.31", "scratch-render": "0.1.0-prerelease.20221121051603", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.0.2", "scratch-svg-renderer": "0.2.0-prerelease.20221120235613", - "scratch-vm": "1.3.14", + "scratch-vm": "1.3.16", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51719,9 +51685,9 @@ "dev": true }, "scratch-vm": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.14.tgz", - "integrity": "sha512-P1l6oFzEObNP2WoO8N9bs2BqZ3ZvY/YrvzHeq14OC2i4l6BTbGX3tZiuPAAeVXTCodZKrssO/ny027jKYTqfkg==", + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.16.tgz", + "integrity": "sha512-YAXeW+LZTJSlQ2763gv2B1QWec420/iXtDZTb9MqTn4Yl26diVQk0Ub3QOoq3LipGg2UoDy//GnODOiPe4hmvQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index f8f6fa221..6369645bd 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.5", + "scratch-gui": "1.3.7", "scratch-l10n": "3.15.20230112032116", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 7b6f105d8adb5f06ed89ab1aee28685993bd8d85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 05:01:42 +0000 Subject: [PATCH 06/21] fix(deps): update dependency scratch-l10n to v3.15.20230113032113 --- package-lock.json | 48 ++++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2cbc10c9f..ab742fd71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.7", - "scratch-l10n": "3.15.20230112032116", + "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23095,6 +23095,24 @@ "scratch-l10n": "3.15.20230112032116" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230112032116", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", + "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.7.tgz", @@ -23533,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230112032116", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", - "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51124,6 +51142,22 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", "scratch-l10n": "3.15.20230112032116" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.15.20230112032116", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", + "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51488,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230112032116", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", - "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 6369645bd..4b9a21563 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.7", - "scratch-l10n": "3.15.20230112032116", + "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 60196f03bc2e7812716608de442b0b792f79f61b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 19:18:40 +0000 Subject: [PATCH 07/21] fix(deps): update dependency scratch-gui to v1.3.8 --- package-lock.json | 104 +++++++++------------------------------------- package.json | 2 +- 2 files changed, 20 insertions(+), 86 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab742fd71..ea6892dbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.7", + "scratch-gui": "1.3.8", "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23084,39 +23084,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20230112072449", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230112072449.tgz", - "integrity": "sha512-FdMBamFEgu5DCFVX+Ex5FJnrBeySCSvq+ON7wabmWdka4/yWBbph6yNyyfSduC+V3etZ1Xo70GyuDPLFELcz/g==", + "version": "0.1.0-prerelease.20230113103241", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230113103241.tgz", + "integrity": "sha512-bQgjkm54gr820GLZ4E9mYlKYTVdDnt5DcA6BOImiFgyBScdKfRnycuh0cMGJnJeQ1JcyVEX1uezre8Wix91mWQ==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230112032116" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230112032116", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", - "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" + "scratch-l10n": "3.15.20230113032113" } }, "node_modules/scratch-gui": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.7.tgz", - "integrity": "sha512-LMdY61UXdyNNZRzC3FslEdrOYWO00rAQwdtYDj5ilLJ191rf5onqgyFQwdqSGHcfIveKQs9VUAc1M8wjBwgGbA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.8.tgz", + "integrity": "sha512-1jRKDTmFIoWVTdj2PvoflRCjk9RkL4OpnS/E47tH6aW0rgQpgDqdBSIzAi/nYJc9BC87lPUhroyC1g1qHNwjKA==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -23167,8 +23149,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230112072449", - "scratch-l10n": "3.15.20230110032123", + "scratch-blocks": "0.1.0-prerelease.20230113103241", + "scratch-l10n": "3.15.20230113032113", "scratch-paint": "1.1.31", "scratch-render": "0.1.0-prerelease.20221121051603", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", @@ -23451,24 +23433,6 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", @@ -51133,37 +51097,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20230112072449", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230112072449.tgz", - "integrity": "sha512-FdMBamFEgu5DCFVX+Ex5FJnrBeySCSvq+ON7wabmWdka4/yWBbph6yNyyfSduC+V3etZ1Xo70GyuDPLFELcz/g==", + "version": "0.1.0-prerelease.20230113103241", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230113103241.tgz", + "integrity": "sha512-bQgjkm54gr820GLZ4E9mYlKYTVdDnt5DcA6BOImiFgyBScdKfRnycuh0cMGJnJeQ1JcyVEX1uezre8Wix91mWQ==", "dev": true, "requires": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230112032116" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.15.20230112032116", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230112032116.tgz", - "integrity": "sha512-Q5Y6GjKByXkPPBL+bzjuxOS2wmOJjJqSCFZSnYXLYWRSRzsDhmJQGmyCWVDXdT1n+GJ0sICS+i1uKTuMyI7oAw==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - } - } + "scratch-l10n": "3.15.20230113032113" } }, "scratch-gui": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.7.tgz", - "integrity": "sha512-LMdY61UXdyNNZRzC3FslEdrOYWO00rAQwdtYDj5ilLJ191rf5onqgyFQwdqSGHcfIveKQs9VUAc1M8wjBwgGbA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.8.tgz", + "integrity": "sha512-1jRKDTmFIoWVTdj2PvoflRCjk9RkL4OpnS/E47tH6aW0rgQpgDqdBSIzAi/nYJc9BC87lPUhroyC1g1qHNwjKA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -51214,8 +51162,8 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230112072449", - "scratch-l10n": "3.15.20230110032123", + "scratch-blocks": "0.1.0-prerelease.20230113103241", + "scratch-l10n": "3.15.20230113032113", "scratch-paint": "1.1.31", "scratch-render": "0.1.0-prerelease.20221121051603", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", @@ -51444,20 +51392,6 @@ "symbol-observable": "^1.0.3" } }, - "scratch-l10n": { - "version": "3.15.20230110032123", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230110032123.tgz", - "integrity": "sha512-YSIKWDeuz/Dx1k6NiPcu7No9iq0LaVBIBSGFoIhuYTMl0ew0kUFymdMVACCuHsvI/W24s9RR5sW/hRXZlksrYQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.2.5", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - } - }, "scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", diff --git a/package.json b/package.json index 4b9a21563..a92606850 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.7", + "scratch-gui": "1.3.8", "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From bb730d0d88be72c27bc2a9ec922bd6a11d0f9550 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Jan 2023 03:19:05 +0000 Subject: [PATCH 08/21] fix(deps): update dependency scratch-gui to v1.3.9 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea6892dbf..af98789db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.8", + "scratch-gui": "1.3.9", "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23096,9 +23096,9 @@ } }, "node_modules/scratch-gui": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.8.tgz", - "integrity": "sha512-1jRKDTmFIoWVTdj2PvoflRCjk9RkL4OpnS/E47tH6aW0rgQpgDqdBSIzAi/nYJc9BC87lPUhroyC1g1qHNwjKA==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.9.tgz", + "integrity": "sha512-MJe2ywjrMt/nZAAuUkzj2pcC7yv8ciBrSNz6XjSVR4uSqRNKOKP0pQYO7Id3PgTl0+xSs9F4WtTBgim3lcaH1g==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -23156,7 +23156,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.0.2", "scratch-svg-renderer": "0.2.0-prerelease.20221120235613", - "scratch-vm": "1.3.16", + "scratch-vm": "1.3.18", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23715,9 +23715,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "1.3.16", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.16.tgz", - "integrity": "sha512-YAXeW+LZTJSlQ2763gv2B1QWec420/iXtDZTb9MqTn4Yl26diVQk0Ub3QOoq3LipGg2UoDy//GnODOiPe4hmvQ==", + "version": "1.3.18", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.18.tgz", + "integrity": "sha512-qL/WYZqsvVPc2vXTjdQOxXfuXwm5eY9989yC2jw1JWYvU6WkOr2oCbu0BHaY9FLP2A0XYJ+i8CEPju+zeay2RA==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -51109,9 +51109,9 @@ } }, "scratch-gui": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.8.tgz", - "integrity": "sha512-1jRKDTmFIoWVTdj2PvoflRCjk9RkL4OpnS/E47tH6aW0rgQpgDqdBSIzAi/nYJc9BC87lPUhroyC1g1qHNwjKA==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.9.tgz", + "integrity": "sha512-MJe2ywjrMt/nZAAuUkzj2pcC7yv8ciBrSNz6XjSVR4uSqRNKOKP0pQYO7Id3PgTl0+xSs9F4WtTBgim3lcaH1g==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -51169,7 +51169,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.0.2", "scratch-svg-renderer": "0.2.0-prerelease.20221120235613", - "scratch-vm": "1.3.16", + "scratch-vm": "1.3.18", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -51653,9 +51653,9 @@ "dev": true }, "scratch-vm": { - "version": "1.3.16", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.16.tgz", - "integrity": "sha512-YAXeW+LZTJSlQ2763gv2B1QWec420/iXtDZTb9MqTn4Yl26diVQk0Ub3QOoq3LipGg2UoDy//GnODOiPe4hmvQ==", + "version": "1.3.18", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.18.tgz", + "integrity": "sha512-qL/WYZqsvVPc2vXTjdQOxXfuXwm5eY9989yC2jw1JWYvU6WkOr2oCbu0BHaY9FLP2A0XYJ+i8CEPju+zeay2RA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index a92606850..18dec6672 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.8", + "scratch-gui": "1.3.9", "scratch-l10n": "3.15.20230113032113", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 26c20782c9bf0ec8055f0ec860d64622645baee1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 03:57:15 +0000 Subject: [PATCH 09/21] fix(deps): update dependency scratch-l10n to v3.15.20230119032120 --- package-lock.json | 80 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index af98789db..c04c0470d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230113032113", + "scratch-l10n": "3.15.20230119032120", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23095,6 +23095,24 @@ "scratch-l10n": "3.15.20230113032113" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui": { "version": "1.3.9", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.9.tgz", @@ -23433,6 +23451,24 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "dev": true, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", @@ -23515,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230113032113", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", - "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "version": "3.15.20230119032120", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230119032120.tgz", + "integrity": "sha512-XsL2AZ0x8unpEez1gcMxLZHaBgETb9HvJ27pf8QtSpG//IGhPWFNc7dtkOwNzyCoU4i5CN3Oqv4087ZBSOvgaA==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51106,6 +51142,22 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", "scratch-l10n": "3.15.20230113032113" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + } + } } }, "scratch-gui": { @@ -51392,6 +51444,20 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.15.20230113032113", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", + "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "@transifex/api": "4.2.5", + "babel-plugin-react-intl": "^3.0.1", + "download": "^8.0.0", + "transifex": "1.6.6" + } + }, "scratch-paint": { "version": "1.1.31", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.31.tgz", @@ -51456,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230113032113", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230113032113.tgz", - "integrity": "sha512-q5//oIbED4o3VznMCFnbJH1vEtJwXUgWhEEHqdGGrysl/kp90X/F82YznCpCb042XpZy6FfS1X/YfcGvLRz6bA==", + "version": "3.15.20230119032120", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230119032120.tgz", + "integrity": "sha512-XsL2AZ0x8unpEez1gcMxLZHaBgETb9HvJ27pf8QtSpG//IGhPWFNc7dtkOwNzyCoU4i5CN3Oqv4087ZBSOvgaA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 18dec6672..1a69641e1 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230113032113", + "scratch-l10n": "3.15.20230119032120", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 1a193b49851be7d09a46cfb5797cfda749b25a6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Jan 2023 05:23:04 +0000 Subject: [PATCH 10/21] fix(deps): update dependency scratch-l10n to v3.15.20230121032138 --- 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 c04c0470d..df4cfcbe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230119032120", + "scratch-l10n": "3.15.20230121032138", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230119032120", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230119032120.tgz", - "integrity": "sha512-XsL2AZ0x8unpEez1gcMxLZHaBgETb9HvJ27pf8QtSpG//IGhPWFNc7dtkOwNzyCoU4i5CN3Oqv4087ZBSOvgaA==", + "version": "3.15.20230121032138", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230121032138.tgz", + "integrity": "sha512-ooQV5QpiySPezm4KDXpJm9WLc3afGnqVFtcjt26wznNW9Eg8JNLmIpq0nJxudZmU5VeWlftCeG45ngXXsdDXxg==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230119032120", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230119032120.tgz", - "integrity": "sha512-XsL2AZ0x8unpEez1gcMxLZHaBgETb9HvJ27pf8QtSpG//IGhPWFNc7dtkOwNzyCoU4i5CN3Oqv4087ZBSOvgaA==", + "version": "3.15.20230121032138", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230121032138.tgz", + "integrity": "sha512-ooQV5QpiySPezm4KDXpJm9WLc3afGnqVFtcjt26wznNW9Eg8JNLmIpq0nJxudZmU5VeWlftCeG45ngXXsdDXxg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 1a69641e1..ca63419d7 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230119032120", + "scratch-l10n": "3.15.20230121032138", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From aab7744e655f4c125c090177a04b9278ee8bd5aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 05:01:55 +0000 Subject: [PATCH 11/21] fix(deps): update dependency scratch-l10n to v3.15.20230123032119 --- 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 df4cfcbe2..fa62a0eb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230121032138", + "scratch-l10n": "3.15.20230123032119", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230121032138", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230121032138.tgz", - "integrity": "sha512-ooQV5QpiySPezm4KDXpJm9WLc3afGnqVFtcjt26wznNW9Eg8JNLmIpq0nJxudZmU5VeWlftCeG45ngXXsdDXxg==", + "version": "3.15.20230123032119", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230123032119.tgz", + "integrity": "sha512-Dr6opD/jsn3SCDRasW2s8bFEN77hP2J1xGY+mTrQ87JO7YtIxqLgZWkRbUxYg51XIUkUGaENJpjw/2j9ZMhgSQ==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230121032138", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230121032138.tgz", - "integrity": "sha512-ooQV5QpiySPezm4KDXpJm9WLc3afGnqVFtcjt26wznNW9Eg8JNLmIpq0nJxudZmU5VeWlftCeG45ngXXsdDXxg==", + "version": "3.15.20230123032119", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230123032119.tgz", + "integrity": "sha512-Dr6opD/jsn3SCDRasW2s8bFEN77hP2J1xGY+mTrQ87JO7YtIxqLgZWkRbUxYg51XIUkUGaENJpjw/2j9ZMhgSQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index ca63419d7..ed78c6eb4 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230121032138", + "scratch-l10n": "3.15.20230123032119", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From ff3eb8757b9d090e580a501b91d7c73b13c14717 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 04:44:03 +0000 Subject: [PATCH 12/21] fix(deps): update dependency scratch-l10n to v3.15.20230124032126 --- 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 fa62a0eb9..81551955b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230123032119", + "scratch-l10n": "3.15.20230124032126", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230123032119", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230123032119.tgz", - "integrity": "sha512-Dr6opD/jsn3SCDRasW2s8bFEN77hP2J1xGY+mTrQ87JO7YtIxqLgZWkRbUxYg51XIUkUGaENJpjw/2j9ZMhgSQ==", + "version": "3.15.20230124032126", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230124032126.tgz", + "integrity": "sha512-6XgC3F68vzx65qPtjC5dO6zE4NGVRe0GkcV9j6skAvXCiXDHt1uWCG/BlnBWBQFF5ZXy9IIKfgx6HuguApeZLg==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230123032119", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230123032119.tgz", - "integrity": "sha512-Dr6opD/jsn3SCDRasW2s8bFEN77hP2J1xGY+mTrQ87JO7YtIxqLgZWkRbUxYg51XIUkUGaENJpjw/2j9ZMhgSQ==", + "version": "3.15.20230124032126", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230124032126.tgz", + "integrity": "sha512-6XgC3F68vzx65qPtjC5dO6zE4NGVRe0GkcV9j6skAvXCiXDHt1uWCG/BlnBWBQFF5ZXy9IIKfgx6HuguApeZLg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index ed78c6eb4..244831897 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230123032119", + "scratch-l10n": "3.15.20230124032126", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 1520e74fbd0fd9610c03c6ba580116b0a3910250 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 05:28:53 +0000 Subject: [PATCH 13/21] fix(deps): update dependency scratch-l10n to v3.15.20230125032128 --- 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 81551955b..e4af0a05f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230124032126", + "scratch-l10n": "3.15.20230125032128", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230124032126", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230124032126.tgz", - "integrity": "sha512-6XgC3F68vzx65qPtjC5dO6zE4NGVRe0GkcV9j6skAvXCiXDHt1uWCG/BlnBWBQFF5ZXy9IIKfgx6HuguApeZLg==", + "version": "3.15.20230125032128", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230125032128.tgz", + "integrity": "sha512-gg8HzEjO+nAViMzTeDU9KwJprpniyJck4ZRWGu55kFVdiQnl6dIZD2d8M933mkErw9PesyUDAoQz7x5anfp/Jg==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230124032126", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230124032126.tgz", - "integrity": "sha512-6XgC3F68vzx65qPtjC5dO6zE4NGVRe0GkcV9j6skAvXCiXDHt1uWCG/BlnBWBQFF5ZXy9IIKfgx6HuguApeZLg==", + "version": "3.15.20230125032128", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230125032128.tgz", + "integrity": "sha512-gg8HzEjO+nAViMzTeDU9KwJprpniyJck4ZRWGu55kFVdiQnl6dIZD2d8M933mkErw9PesyUDAoQz7x5anfp/Jg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 244831897..b46676d66 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230124032126", + "scratch-l10n": "3.15.20230125032128", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 68cebdf7ca1ab4182b9cd66c5883c121a7db7a0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 05:32:24 +0000 Subject: [PATCH 14/21] fix(deps): update dependency scratch-l10n to v3.15.20230127032214 --- 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 e4af0a05f..0ecee2a94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230125032128", + "scratch-l10n": "3.15.20230127032214", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230125032128", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230125032128.tgz", - "integrity": "sha512-gg8HzEjO+nAViMzTeDU9KwJprpniyJck4ZRWGu55kFVdiQnl6dIZD2d8M933mkErw9PesyUDAoQz7x5anfp/Jg==", + "version": "3.15.20230127032214", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230127032214.tgz", + "integrity": "sha512-NlCcuPE1qYkiqlwRVdXp0CpAdb4dX7mSN0RN5Jsza/skMlx+2m7cUsDw1FwHgZkAuzxRVIusQBQlzdWUj0x7bQ==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230125032128", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230125032128.tgz", - "integrity": "sha512-gg8HzEjO+nAViMzTeDU9KwJprpniyJck4ZRWGu55kFVdiQnl6dIZD2d8M933mkErw9PesyUDAoQz7x5anfp/Jg==", + "version": "3.15.20230127032214", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230127032214.tgz", + "integrity": "sha512-NlCcuPE1qYkiqlwRVdXp0CpAdb4dX7mSN0RN5Jsza/skMlx+2m7cUsDw1FwHgZkAuzxRVIusQBQlzdWUj0x7bQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index b46676d66..8ca5a0af9 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230125032128", + "scratch-l10n": "3.15.20230127032214", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 3cb6bd91a2d4dde62c32879cc5377c7850dc187a Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Wed, 25 Jan 2023 19:15:54 -0800 Subject: [PATCH 15/21] fix: remove Sentry and rewrite ErrorBoundary tests --- README.md | 1 - package-lock.json | 152 +----------------- package.json | 2 +- .../errorboundary/errorboundary.jsx | 47 +++--- src/lib/sentry.js | 18 --- src/views/join/join.jsx | 3 - src/views/preview/embed-view.jsx | 3 - src/views/preview/project-view.jsx | 2 - test/unit/components/errorboundary.test.jsx | 76 ++------- webpack.config.js | 3 +- 10 files changed, 42 insertions(+), 265 deletions(-) delete mode 100644 src/lib/sentry.js diff --git a/README.md b/README.md index f25a63b29..5c71ca0ea 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,6 @@ the beginning of the command, before `npm start`: | `ASSET_HOST` | `https://assets.scratch.mit.edu` | Hostname for asset requests | | `BACKPACK_HOST` | `https://backpack.scratch.mit.edu` | Hostname for backpack requests | | `PROJECT_HOST` | `https://projects.scratch.mit.edu` | Hostname for project requests | -| `SENTRY_DSN` | `''` | DSN for Sentry | | `FALLBACK` | `''` | Pass-through location for old site | | `GA_TRACKER` | `''` | Where to log Google Analytics data | | `NODE_ENV` | `null` | If not `production`, app acts like development | diff --git a/package-lock.json b/package-lock.json index c04c0470d..12171db0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "1.0.0", "license": "BSD-3-Clause", "dependencies": { - "@sentry/browser": "4.4.2", "bunyan": "1.8.15", "clipboard-copy": "2.0.1", "express": "4.16.1", @@ -93,6 +92,7 @@ "react-slick": "0.16.0", "react-string-replace": "0.4.1", "react-telephone-input": "4.3.4", + "react-test-renderer": "16.14.0", "redux": "3.5.2", "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", @@ -1645,81 +1645,6 @@ "node": ">=8.0.0" } }, - "node_modules/@sentry/browser": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.4.2.tgz", - "integrity": "sha512-km5p3hPz+aoY4UiEvYxAdRJAbIK30urZSuMs/3zAUVe+8Zij0IHjHmdi9JtrMqpn+rAcWCxtRmFSYlkiKjdSUg==", - "dependencies": { - "@sentry/core": "4.4.2", - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/core": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.4.2.tgz", - "integrity": "sha512-hJyAodTCf4sZfVdf41Rtuzj4EsyzYq5rdMZ+zc2Vinwdf8D0/brHe91fHeO0CKXEb2P0wJsrjwMidG/ccq/M8A==", - "dependencies": { - "@sentry/hub": "4.4.2", - "@sentry/minimal": "4.4.2", - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/hub": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.4.2.tgz", - "integrity": "sha512-oe9ytXkTWyD+QmOpVzHAqTbRV4Hc0ee2Nt6HvrDtRmlXzQxfvTWG2F8KYT6w8kzqg5klnuRpnsmgTTV3KuNBVQ==", - "dependencies": { - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/minimal": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.4.2.tgz", - "integrity": "sha512-GEZZiNvVgqFAESZhAe3vjwTInn13lI2bSI3ItQN4RUWKL/W4n/fwVoDJbkb1U8aWxanuMnRDEpKwyQv6zYTZfw==", - "dependencies": { - "@sentry/hub": "4.4.2", - "@sentry/types": "4.4.2", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/types": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.4.2.tgz", - "integrity": "sha512-QyQd6PKKIyjJgaq/RQjsxPJEWbXcuiWZ9RvSnhBjS5jj53HEzkM1qkbAFqlYHJ1DTJJ1EuOM4+aTmGzHe93zuA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/utils": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.4.2.tgz", - "integrity": "sha512-j/Ad8G1abHlJdD2q7aWWbSOSeWB5M5v1R1VKL8YPlwEbSvvmEQWePhBKFI0qlnKd2ObdUQsj86pHEXJRSFNfCw==", - "dependencies": { - "@sentry/types": "4.4.2", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", @@ -20568,15 +20493,6 @@ "react-is": "^16.8.1" } }, - "node_modules/react-test-renderer/node_modules/scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, "node_modules/react-tooltip": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.8.0.tgz", @@ -33054,63 +32970,6 @@ "integrity": "sha512-cphYw/y/l36UJ8fv/LXyK+lHlxMXtoydJUsgA4u5QnaUaSZYepuSHik6PewJGT4qvaPwT5ImvHWwX2kElWXvoQ==", "dev": true }, - "@sentry/browser": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-4.4.2.tgz", - "integrity": "sha512-km5p3hPz+aoY4UiEvYxAdRJAbIK30urZSuMs/3zAUVe+8Zij0IHjHmdi9JtrMqpn+rAcWCxtRmFSYlkiKjdSUg==", - "requires": { - "@sentry/core": "4.4.2", - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - } - }, - "@sentry/core": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.4.2.tgz", - "integrity": "sha512-hJyAodTCf4sZfVdf41Rtuzj4EsyzYq5rdMZ+zc2Vinwdf8D0/brHe91fHeO0CKXEb2P0wJsrjwMidG/ccq/M8A==", - "requires": { - "@sentry/hub": "4.4.2", - "@sentry/minimal": "4.4.2", - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - } - }, - "@sentry/hub": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.4.2.tgz", - "integrity": "sha512-oe9ytXkTWyD+QmOpVzHAqTbRV4Hc0ee2Nt6HvrDtRmlXzQxfvTWG2F8KYT6w8kzqg5klnuRpnsmgTTV3KuNBVQ==", - "requires": { - "@sentry/types": "4.4.2", - "@sentry/utils": "4.4.2", - "tslib": "^1.9.3" - } - }, - "@sentry/minimal": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.4.2.tgz", - "integrity": "sha512-GEZZiNvVgqFAESZhAe3vjwTInn13lI2bSI3ItQN4RUWKL/W4n/fwVoDJbkb1U8aWxanuMnRDEpKwyQv6zYTZfw==", - "requires": { - "@sentry/hub": "4.4.2", - "@sentry/types": "4.4.2", - "tslib": "^1.9.3" - } - }, - "@sentry/types": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.4.2.tgz", - "integrity": "sha512-QyQd6PKKIyjJgaq/RQjsxPJEWbXcuiWZ9RvSnhBjS5jj53HEzkM1qkbAFqlYHJ1DTJJ1EuOM4+aTmGzHe93zuA==" - }, - "@sentry/utils": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.4.2.tgz", - "integrity": "sha512-j/Ad8G1abHlJdD2q7aWWbSOSeWB5M5v1R1VKL8YPlwEbSvvmEQWePhBKFI0qlnKd2ObdUQsj86pHEXJRSFNfCw==", - "requires": { - "@sentry/types": "4.4.2", - "tslib": "^1.9.3" - } - }, "@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", @@ -49108,15 +48967,6 @@ "object-assign": "^4.1.1", "react-is": "^16.8.1" } - }, - "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } } } }, diff --git a/package.json b/package.json index 1a69641e1..7fd9ad7a2 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ }, "homepage": "https://github.com/llk/scratch-www#readme", "dependencies": { - "@sentry/browser": "4.4.2", "bunyan": "1.8.15", "clipboard-copy": "2.0.1", "express": "4.16.1", @@ -128,6 +127,7 @@ "react-slick": "0.16.0", "react-string-replace": "0.4.1", "react-telephone-input": "4.3.4", + "react-test-renderer": "16.14.0", "redux": "3.5.2", "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", diff --git a/src/components/errorboundary/errorboundary.jsx b/src/components/errorboundary/errorboundary.jsx index a1c320e36..182592934 100644 --- a/src/components/errorboundary/errorboundary.jsx +++ b/src/components/errorboundary/errorboundary.jsx @@ -1,6 +1,5 @@ const PropTypes = require('prop-types'); const React = require('react'); -const Sentry = require('@sentry/browser'); const CrashMessageComponent = require('../crashmessage/crashmessage.jsx'); import log from '../../lib/log.js'; @@ -9,28 +8,37 @@ class ErrorBoundary extends React.Component { constructor (props) { super(props); this.state = { - hasError: false, - errorId: null + error: null, + errorInfo: null }; } + /** + * Handle an error caught by this ErrorBoundary component. + * @param {Error} error - the error that was caught. + * @param {React.ErrorInfo} errorInfo - the React error info associated with the error. + */ componentDidCatch (error, errorInfo) { - // Display fallback UI - Sentry.withScope(scope => { - scope.setTag('project', 'scratch-www'); - if (this.props.componentName) { - scope.setTag('component', this.props.componentName); - } - Object.keys(errorInfo).forEach(key => { - scope.setExtra(key, errorInfo[key]); + error = error || { + stack: 'Unknown stack', + message: 'Unknown error' + }; + errorInfo = errorInfo || { + componentStack: 'Unknown component stack' + }; + + // only remember the first error: later errors might just be side effects of that first one + if (!this.state.error) { + // store error & errorInfo for debugging + this.setState({ + error, + errorInfo }); - Sentry.captureException(error); - }); - this.setState({ - hasError: true, - errorId: Sentry.lastEventId() - }); - log.error(`Unhandled Error: ${error}, info: ${errorInfo}`); + } + + // report every error in the console + const componentInfo = this.props.componentName ? ` in ${this.props.componentName}` : ''; + log.error(`Unhandled Error${componentInfo}: ${error.stack}\nComponent stack: ${errorInfo.componentStack}`); } handleBack () { @@ -38,10 +46,9 @@ class ErrorBoundary extends React.Component { } render () { - if (this.state.hasError) { + if (this.state.error) { return ( ); diff --git a/src/lib/sentry.js b/src/lib/sentry.js deleted file mode 100644 index b16cd03a9..000000000 --- a/src/lib/sentry.js +++ /dev/null @@ -1,18 +0,0 @@ -const initSentry = () => { - // initialize Sentry instance, making sure it hasn't been initialized already - if (!window.Sentry && `${process.env.SENTRY_DSN}` !== '') { - const Sentry = require('@sentry/browser'); - - Sentry.init({ - dsn: `${process.env.SENTRY_DSN}`, - // Do not collect global onerror, only collect specifically from React error boundaries. - // TryCatch plugin also includes errors from setTimeouts (i.e. the VM) - integrations: integrations => integrations.filter(i => - !(i.name === 'GlobalHandlers' || i.name === 'TryCatch')) - }); - - window.Sentry = Sentry; // Allow GUI access to Sentry via window - } -}; - -module.exports = initSentry; diff --git a/src/views/join/join.jsx b/src/views/join/join.jsx index d829f7d2a..f394d6dcc 100644 --- a/src/views/join/join.jsx +++ b/src/views/join/join.jsx @@ -3,9 +3,6 @@ const render = require('../../lib/render.jsx'); const Scratch3Registration = require('../../components/registration/scratch3-registration.jsx'); const ErrorBoundary = require('../../components/errorboundary/errorboundary.jsx'); -const initSentry = require('../../lib/sentry.js'); -initSentry(); - require('./join.scss'); const Register = () => ( diff --git a/src/views/preview/embed-view.jsx b/src/views/preview/embed-view.jsx index 5ef630a53..9aad84fb6 100644 --- a/src/views/preview/embed-view.jsx +++ b/src/views/preview/embed-view.jsx @@ -14,9 +14,6 @@ const previewActions = require('../../redux/preview.js'); const GUI = require('scratch-gui'); const IntlGUI = injectIntl(GUI.default); -const initSentry = require('../../lib/sentry.js'); -initSentry(); - class EmbedView extends React.Component { constructor (props) { super(props); diff --git a/src/views/preview/project-view.jsx b/src/views/preview/project-view.jsx index 00c0cdd18..fab4edb48 100644 --- a/src/views/preview/project-view.jsx +++ b/src/views/preview/project-view.jsx @@ -39,9 +39,7 @@ const IntlGUI = injectIntl(GUI.default); const localStorageAvailable = 'localStorage' in window && window.localStorage !== null; -const initSentry = require('../../lib/sentry.js'); const xhr = require('xhr'); -initSentry(); class Preview extends React.Component { constructor (props) { diff --git a/test/unit/components/errorboundary.test.jsx b/test/unit/components/errorboundary.test.jsx index fbcaf2006..812d90029 100644 --- a/test/unit/components/errorboundary.test.jsx +++ b/test/unit/components/errorboundary.test.jsx @@ -1,76 +1,24 @@ import React from 'react'; const {mountWithIntl} = require('../../helpers/intl-helpers.jsx'); -jest.mock('@sentry/browser', () => { - const setExtra = jest.fn(); - const setTag = jest.fn(); - - const makeScope = (setExtraParam, setTagParam) => { - const thisScope = { - setExtra: setExtraParam, - setTag: setTagParam - }; - return thisScope; - }; - const Sentry = { - captureException: jest.fn(), - lastEventId: function () { - return 0; - }, - setExtra: setExtra, - setTag: setTag, - withScope: jest.fn(cb => { - cb(makeScope(setExtra, setTag)); - }) - }; - return Sentry; -}); - -const Sentry = require('@sentry/browser'); +import CrashMessageComponent from '../../../src/components/crashmessage/crashmessage.jsx'; import ErrorBoundary from '../../../src/components/errorboundary/errorboundary.jsx'; +const ChildComponent = () =>
hello
; + describe('ErrorBoundary', () => { - let errorBoundaryWrapper; - const ChildClass = () => ( -
- Children here -
- ); + test('ErrorBoundary shows children before error and CrashMessageComponent after', () => { + const child = ; + const wrapper = mountWithIntl({child}); + const childWrapper = wrapper.childAt(0); - beforeEach(() => { - errorBoundaryWrapper = mountWithIntl( - - - - ); - }); + expect(wrapper.containsMatchingElement(child)).toBeTruthy(); + expect(wrapper.containsMatchingElement()).toBeFalsy(); - test('calling ErrorBoundary\'s componentDidCatch() calls Sentry.withScope()', () => { - const errorBoundaryInstance = errorBoundaryWrapper.instance(); - errorBoundaryInstance.componentDidCatch('error', {}); - expect(Sentry.withScope).toHaveBeenCalled(); - }); + childWrapper.simulateError(new Error('fake error for testing purposes')); - test('calling ErrorBoundary\'s componentDidCatch() calls Sentry.captureException()', () => { - const errorBoundaryInstance = errorBoundaryWrapper.instance(); - errorBoundaryInstance.componentDidCatch('error', {}); - expect(Sentry.captureException).toHaveBeenCalledWith('error'); - }); - - test('throwing error under ErrorBoundary calls Sentry.withScope()', () => { - const child = errorBoundaryWrapper.find('#childClass'); - expect(child.exists()).toEqual(true); - child.simulateError({}, {}); - expect(Sentry.withScope).toHaveBeenCalled(); - }); - - test('ErrorBoundary with name prop causes Sentry to setTag with that name', () => { - const child = errorBoundaryWrapper.find('#childClass'); - expect(child.exists()).toEqual(true); - child.simulateError({}); - expect(Sentry.setTag).toHaveBeenCalledWith('component', 'TestEBName'); + expect(wrapper.containsMatchingElement(child)).toBeFalsy(); + expect(wrapper.containsMatchingElement()).toBeTruthy(); }); }); diff --git a/webpack.config.js b/webpack.config.js index d4a6ab31a..c31b9aa69 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -230,8 +230,7 @@ module.exports = { 'process.env.CLOUDDATA_HOST': '"' + (process.env.CLOUDDATA_HOST || 'clouddata.scratch.mit.edu') + '"', 'process.env.PROJECT_HOST': '"' + (process.env.PROJECT_HOST || 'https://projects.scratch.mit.edu') + '"', 'process.env.STATIC_HOST': '"' + (process.env.STATIC_HOST || 'https://uploads.scratch.mit.edu') + '"', - 'process.env.SCRATCH_ENV': '"' + (process.env.SCRATCH_ENV || 'development') + '"', - 'process.env.SENTRY_DSN': '"' + (process.env.SENTRY_DSN || '') + '"' + 'process.env.SCRATCH_ENV': '"' + (process.env.SCRATCH_ENV || 'development') + '"' }) ]) .concat(process.env.ANALYZE_BUNDLE === 'true' ? [ From 7c89ae765731ea2683d4a15da81d8e4941f9878a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Jan 2023 05:10:08 +0000 Subject: [PATCH 16/21] fix(deps): update dependency scratch-l10n to v3.15.20230129032202 --- 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 0ecee2a94..b97c16864 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230127032214", + "scratch-l10n": "3.15.20230129032202", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230127032214", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230127032214.tgz", - "integrity": "sha512-NlCcuPE1qYkiqlwRVdXp0CpAdb4dX7mSN0RN5Jsza/skMlx+2m7cUsDw1FwHgZkAuzxRVIusQBQlzdWUj0x7bQ==", + "version": "3.15.20230129032202", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230129032202.tgz", + "integrity": "sha512-wfQ1p0+EFP1rELjTJ6ai9nSDqIGJ+eRnGqFb2o2JaO/NOBrpo1gSY/Nt+wtcFwwFbRIoqiXS8BPdc6UY4m0NIQ==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230127032214", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230127032214.tgz", - "integrity": "sha512-NlCcuPE1qYkiqlwRVdXp0CpAdb4dX7mSN0RN5Jsza/skMlx+2m7cUsDw1FwHgZkAuzxRVIusQBQlzdWUj0x7bQ==", + "version": "3.15.20230129032202", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230129032202.tgz", + "integrity": "sha512-wfQ1p0+EFP1rELjTJ6ai9nSDqIGJ+eRnGqFb2o2JaO/NOBrpo1gSY/Nt+wtcFwwFbRIoqiXS8BPdc6UY4m0NIQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 8ca5a0af9..d6f2cc7fb 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230127032214", + "scratch-l10n": "3.15.20230129032202", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From bb4288d49cb61f91abcfb288e5f9260e066b9a87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 06:06:47 +0000 Subject: [PATCH 17/21] fix(deps): update dependency scratch-l10n to v3.15.20230130032254 --- 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 b97c16864..3db44c126 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230129032202", + "scratch-l10n": "3.15.20230130032254", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23551,9 +23551,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230129032202", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230129032202.tgz", - "integrity": "sha512-wfQ1p0+EFP1rELjTJ6ai9nSDqIGJ+eRnGqFb2o2JaO/NOBrpo1gSY/Nt+wtcFwwFbRIoqiXS8BPdc6UY4m0NIQ==", + "version": "3.15.20230130032254", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230130032254.tgz", + "integrity": "sha512-VplV2dRwy5kvL49Nl5m2pPqpRipZpHwy9d+aCyc/Od5uhgYO7uofGhXy3pWq5FcLnlanJUMoZd8qQcpjv0h+lg==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51522,9 +51522,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230129032202", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230129032202.tgz", - "integrity": "sha512-wfQ1p0+EFP1rELjTJ6ai9nSDqIGJ+eRnGqFb2o2JaO/NOBrpo1gSY/Nt+wtcFwwFbRIoqiXS8BPdc6UY4m0NIQ==", + "version": "3.15.20230130032254", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230130032254.tgz", + "integrity": "sha512-VplV2dRwy5kvL49Nl5m2pPqpRipZpHwy9d+aCyc/Od5uhgYO7uofGhXy3pWq5FcLnlanJUMoZd8qQcpjv0h+lg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d6f2cc7fb..191dc8b86 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.9", - "scratch-l10n": "3.15.20230129032202", + "scratch-l10n": "3.15.20230130032254", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 650da4c74fae0d645f256cfdf68334d5c1292b36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:08:24 +0000 Subject: [PATCH 18/21] fix(deps): update dependency scratch-gui to v1.3.10 --- 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 1e08824ad..1ee9f1dc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.9", + "scratch-gui": "1.3.10", "scratch-l10n": "3.15.20230130032254", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23030,9 +23030,9 @@ } }, "node_modules/scratch-gui": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.9.tgz", - "integrity": "sha512-MJe2ywjrMt/nZAAuUkzj2pcC7yv8ciBrSNz6XjSVR4uSqRNKOKP0pQYO7Id3PgTl0+xSs9F4WtTBgim3lcaH1g==", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.10.tgz", + "integrity": "sha512-mtPpJ8PP1M0uuLqA0SU+7hTP21uYm/mK7ixuqNPeaFgLjVTxLm7q9w8PKIetmYeRr6hiQXrqZOQ8YSAPp2NH3A==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -51011,9 +51011,9 @@ } }, "scratch-gui": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.9.tgz", - "integrity": "sha512-MJe2ywjrMt/nZAAuUkzj2pcC7yv8ciBrSNz6XjSVR4uSqRNKOKP0pQYO7Id3PgTl0+xSs9F4WtTBgim3lcaH1g==", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.10.tgz", + "integrity": "sha512-mtPpJ8PP1M0uuLqA0SU+7hTP21uYm/mK7ixuqNPeaFgLjVTxLm7q9w8PKIetmYeRr6hiQXrqZOQ8YSAPp2NH3A==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index 9869c91b1..f17e311fe 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.3.9", + "scratch-gui": "1.3.10", "scratch-l10n": "3.15.20230130032254", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 32a48b3b50020282e80335bbff69d279db6473fd Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Mon, 30 Jan 2023 20:29:05 -0500 Subject: [PATCH 19/21] updated project page icons per new designs --- static/svgs/project/fav-gray.svg | 4 +--- static/svgs/project/love-gray.svg | 4 +--- static/svgs/project/remix-gray.svg | 11 +---------- static/svgs/project/views-gray.svg | 14 +------------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/static/svgs/project/fav-gray.svg b/static/svgs/project/fav-gray.svg index ebde608e8..3e64ce6d2 100644 --- a/static/svgs/project/fav-gray.svg +++ b/static/svgs/project/fav-gray.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/static/svgs/project/love-gray.svg b/static/svgs/project/love-gray.svg index 19f721512..c6fa2e0b2 100644 --- a/static/svgs/project/love-gray.svg +++ b/static/svgs/project/love-gray.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/static/svgs/project/remix-gray.svg b/static/svgs/project/remix-gray.svg index 0701630be..a92d28e8a 100644 --- a/static/svgs/project/remix-gray.svg +++ b/static/svgs/project/remix-gray.svg @@ -1,10 +1 @@ - - - - remix-gray - Created with Sketch. - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/static/svgs/project/views-gray.svg b/static/svgs/project/views-gray.svg index e159580e4..2cee40f8b 100644 --- a/static/svgs/project/views-gray.svg +++ b/static/svgs/project/views-gray.svg @@ -1,13 +1 @@ - - - - views-gray - Created with Sketch. - - - - - - - - \ No newline at end of file + \ No newline at end of file From ccf2e6ecb060ececfe74e379755d84919258e512 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Tue, 31 Jan 2023 16:44:58 -0500 Subject: [PATCH 20/21] made project stats icons always opaque --- src/views/preview/stats.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/views/preview/stats.scss b/src/views/preview/stats.scss index 3eb770008..c33e768c8 100644 --- a/src/views/preview/stats.scss +++ b/src/views/preview/stats.scss @@ -55,8 +55,6 @@ cursor: pointer; &:before { - - opacity: .5; background-image: url("/svgs/project/love-gray.svg"); } } @@ -64,7 +62,6 @@ .project-loves.loved { &:before { - opacity: 1; background-image: url("/svgs/project/love-red.svg"); } } @@ -74,7 +71,6 @@ cursor: pointer; &:before { - opacity: .5; background-image: url("/svgs/project/fav-gray.svg"); } } @@ -82,7 +78,6 @@ .project-favorites.favorited { &:before { - opacity: 1; background-image: url("/svgs/project/fav-yellow.svg"); } } @@ -90,7 +85,6 @@ .project-remixes { &:before { - opacity: .5; background-image: url("/svgs/project/remix-gray.svg"); } } @@ -98,7 +92,6 @@ .project-views { &:before { - opacity: .5; background-image: url("/svgs/project/views-gray.svg"); } } From 0b98286efceccd36e7baf98909a4b72f7ceae3d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 05:29:45 +0000 Subject: [PATCH 21/21] fix(deps): update dependency scratch-l10n to v3.15.20230202032115 --- 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 1ee9f1dc3..ab5dce6fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -100,7 +100,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.10", - "scratch-l10n": "3.15.20230130032254", + "scratch-l10n": "3.15.20230202032115", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23467,9 +23467,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230130032254", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230130032254.tgz", - "integrity": "sha512-VplV2dRwy5kvL49Nl5m2pPqpRipZpHwy9d+aCyc/Od5uhgYO7uofGhXy3pWq5FcLnlanJUMoZd8qQcpjv0h+lg==", + "version": "3.15.20230202032115", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230202032115.tgz", + "integrity": "sha512-NyCGmdYSFJAzGW8U03JQa/0dDg8VyvNh3+bNRxt2QG+gxJGK6mXB+8+h3uMMbvedDKMB28G8wEdU9pAFWc/cqA==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -51372,9 +51372,9 @@ } }, "scratch-l10n": { - "version": "3.15.20230130032254", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230130032254.tgz", - "integrity": "sha512-VplV2dRwy5kvL49Nl5m2pPqpRipZpHwy9d+aCyc/Od5uhgYO7uofGhXy3pWq5FcLnlanJUMoZd8qQcpjv0h+lg==", + "version": "3.15.20230202032115", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230202032115.tgz", + "integrity": "sha512-NyCGmdYSFJAzGW8U03JQa/0dDg8VyvNh3+bNRxt2QG+gxJGK6mXB+8+h3uMMbvedDKMB28G8wEdU9pAFWc/cqA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index f17e311fe..4e168b5ba 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "1.3.10", - "scratch-l10n": "3.15.20230130032254", + "scratch-l10n": "3.15.20230202032115", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3",