From c996b1289f77abf4583a5f96bcb9741f2f773b09 Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Mon, 8 May 2023 12:48:22 -0400 Subject: [PATCH 01/22] feat: use purple accent color for accessibility --- .circleci/config.yml | 3 + package-lock.json | 115 +++++++++++++----- package.json | 2 +- src/_colors.scss | 9 +- src/components/card/card.scss | 2 +- src/components/dropdown-banner/banner.scss | 2 +- src/components/dropdown/dropdown.scss | 11 +- src/components/formik-forms/formik-input.scss | 8 +- .../formik-forms/formik-select.scss | 2 +- src/components/forms/button.scss | 4 +- src/components/forms/inplace-input.scss | 12 +- src/components/forms/input.scss | 4 +- src/components/forms/phone-input.scss | 1 + src/components/forms/select.scss | 2 +- src/components/forms/textarea.scss | 4 +- src/components/forms/validation-message.scss | 12 +- src/components/info-button/info-button.scss | 4 +- .../informationpage/informationpage.scss | 2 +- src/components/intro/intro.scss | 4 +- src/components/join-flow/join-flow-steps.scss | 2 +- .../join-flow/next-step-button.scss | 4 +- src/components/modal/addtostudio/modal.scss | 6 +- src/components/modal/comments/modal.scss | 4 +- src/components/modal/social/modal.scss | 4 +- .../navigation/base/navigation.scss | 9 +- src/components/navigation/www/navigation.scss | 21 ++-- src/components/news/news.scss | 2 +- src/components/os-chooser/os-chooser.scss | 2 +- .../social-message/social-message.scss | 2 +- src/components/steps/steps.scss | 2 +- .../teacher-banner/teacher-banner.scss | 2 +- src/components/tooltip/tooltip.scss | 4 +- src/components/ttt-tile/ttt-tile.scss | 16 --- src/main.scss | 12 +- src/views/about/about.scss | 2 +- .../annual-report/2021/annual-report.scss | 2 +- src/views/boost/boost.scss | 2 +- src/views/components/components.jsx | 3 +- src/views/components/components.scss | 13 +- src/views/developers/developers.scss | 2 +- src/views/download/download.scss | 4 +- src/views/download/scratch-link/download.scss | 2 +- src/views/ev3/ev3.scss | 2 +- src/views/explore/explore.scss | 17 +-- src/views/gdxfor/gdxfor.scss | 2 +- src/views/ideas/ideas.scss | 5 +- src/views/messages/messages.scss | 6 +- src/views/microbit/microbit.scss | 2 +- src/views/parents/parents.scss | 2 +- src/views/preview/comment/comment.scss | 2 +- src/views/preview/subactions.scss | 2 +- src/views/preview/unsupported-browser.scss | 6 +- src/views/splash/hoc/hoc-banner.scss | 4 +- src/views/studio/icons/edit-icon.svg | 2 +- src/views/studio/modals/promote-modal.scss | 6 +- .../studio/modals/studio-report-modal.scss | 4 +- .../studio/modals/transfer-host-modal.scss | 8 +- .../studio/modals/user-projects-modal.scss | 14 +-- src/views/studio/studio.scss | 25 ++-- src/views/teachers/landing/landing.scss | 2 +- src/views/wedo2/wedo2.scss | 2 +- static/svgs/project/comment-reply.svg | 4 +- static/svgs/studio/activity-curator.svg | 4 +- static/svgs/studio/activity-edit.svg | 2 +- static/svgs/studio/activity-project.svg | 4 +- static/svgs/tutorials.svg | 6 +- 66 files changed, 258 insertions(+), 200 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b32b076bc..c51aa41b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,6 +128,7 @@ workflows: branches: only: - develop + - beta - /^hotfix\/.*/ - /^release\/.*/ - integration-tests: @@ -141,6 +142,7 @@ workflows: branches: only: - develop + - beta - /^hotfix\/.*/ - /^release\/.*/ - build-and-deploy-production: @@ -190,5 +192,6 @@ workflows: ignore: - develop - master + - beta - /^hotfix\/.*/ - /^release\/.*/ diff --git a/package-lock.json b/package-lock.json index de555f5a8..a5d6601e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.8.53", + "scratch-gui": "2.0.0-beta.2", "scratch-l10n": "3.15.20230507032520", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -9682,6 +9682,8 @@ "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz", "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "loader-utils": "^1.0.2", "schema-utils": "^1.0.0" @@ -23463,9 +23465,9 @@ } }, "node_modules/scratch-blocks": { - "version": "0.1.0-prerelease.20230507065123", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz", - "integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==", + "version": "0.2.0-prerelease.20230509131059", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230509131059.tgz", + "integrity": "sha512-TPrMjmXhOh3AwlLJu3ggkMUwfHsUN8Y0tk7NnrLM02R0qtr32pgOHttBobXDya7R4Pu+HyfGSuxwtuJftb0MsQ==", "dev": true, "dependencies": { "exports-loader": "0.7.0", @@ -23474,10 +23476,28 @@ "scratch-l10n": "3.15.20230507032520" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230507032520", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz", + "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==", + "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.8.53", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.53.tgz", - "integrity": "sha512-zqrSRAUhuODR0Qe2cFnQiXpDkIfFF9iEofRIswHSaP/MHj/oiEMINrpEDP+66ep+HivWRpwUumdUt8dOyUIw0A==", + "version": "2.0.0-beta.2", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.2.tgz", + "integrity": "sha512-yAhQdj8nORDTdBvxWsYfsxRSL7zZdZlW3X5HKYN6GJCRZugk1GqS/hJ/7D+jwrmgjx6rtJGR3ljJY+1lZtmq8Q==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -23487,11 +23507,11 @@ "cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", "classnames": "2.2.6", "computed-style-to-inline-style": "3.0.0", + "cookie": "0.5.0", "copy-webpack-plugin": "6.4.1", "core-js": "2.5.7", "css-loader": "^1.0.0", "es6-object-assign": "1.1.0", - "file-loader": "2.0.0", "get-float-time-domain-data": "0.1.0", "get-user-media-promise": "1.1.4", "immutable": "3.8.2", @@ -23529,9 +23549,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230507065123", + "scratch-blocks": "0.2.0-prerelease.20230509131059", "scratch-l10n": "3.15.20230507032520", - "scratch-paint": "1.1.54", + "scratch-paint": "1.2.0-beta.1", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23603,6 +23623,15 @@ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==", "dev": true }, + "node_modules/scratch-gui/node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/scratch-gui/node_modules/core-js": { "version": "2.5.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", @@ -23863,9 +23892,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "1.1.54", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz", - "integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==", + "version": "1.2.0-beta.1", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.2.0-beta.1.tgz", + "integrity": "sha512-YyVBRv5+ahJA02N0KKjalHUyJXKZOvQmpq658gswePsyU/GkcHByJCRQjd0iYWN8nJZlDEZrOExLuh+noTHjuA==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -24212,9 +24241,9 @@ } }, "node_modules/scratch-vm/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -40377,6 +40406,8 @@ "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz", "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==", "dev": true, + "optional": true, + "peer": true, "requires": { "loader-utils": "^1.0.2", "schema-utils": "^1.0.0" @@ -51927,21 +51958,37 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20230507065123", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz", - "integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==", + "version": "0.2.0-prerelease.20230509131059", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230509131059.tgz", + "integrity": "sha512-TPrMjmXhOh3AwlLJu3ggkMUwfHsUN8Y0tk7NnrLM02R0qtr32pgOHttBobXDya7R4Pu+HyfGSuxwtuJftb0MsQ==", "dev": true, "requires": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", "scratch-l10n": "3.15.20230507032520" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.15.20230507032520", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz", + "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==", + "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": { - "version": "1.8.53", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.53.tgz", - "integrity": "sha512-zqrSRAUhuODR0Qe2cFnQiXpDkIfFF9iEofRIswHSaP/MHj/oiEMINrpEDP+66ep+HivWRpwUumdUt8dOyUIw0A==", + "version": "2.0.0-beta.2", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.2.tgz", + "integrity": "sha512-yAhQdj8nORDTdBvxWsYfsxRSL7zZdZlW3X5HKYN6GJCRZugk1GqS/hJ/7D+jwrmgjx6rtJGR3ljJY+1lZtmq8Q==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -51951,11 +51998,11 @@ "cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", "classnames": "2.2.6", "computed-style-to-inline-style": "3.0.0", + "cookie": "0.5.0", "copy-webpack-plugin": "6.4.1", "core-js": "2.5.7", "css-loader": "^1.0.0", "es6-object-assign": "1.1.0", - "file-loader": "2.0.0", "get-float-time-domain-data": "0.1.0", "get-user-media-promise": "1.1.4", "immutable": "3.8.2", @@ -51993,9 +52040,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.1.0-prerelease.20230507065123", + "scratch-blocks": "0.2.0-prerelease.20230509131059", "scratch-l10n": "3.15.20230507032520", - "scratch-paint": "1.1.54", + "scratch-paint": "1.2.0-beta.1", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -52050,6 +52097,12 @@ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==", "dev": true }, + "cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true + }, "core-js": { "version": "2.5.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", @@ -52265,9 +52318,9 @@ } }, "scratch-paint": { - "version": "1.1.54", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz", - "integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==", + "version": "1.2.0-beta.1", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.2.0-beta.1.tgz", + "integrity": "sha512-YyVBRv5+ahJA02N0KKjalHUyJXKZOvQmpq658gswePsyU/GkcHByJCRQjd0iYWN8nJZlDEZrOExLuh+noTHjuA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -52587,9 +52640,9 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { "inherits": "^2.0.3", diff --git a/package.json b/package.json index 2c0695a85..1a4adfefd 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.8.53", + "scratch-gui": "2.0.0-beta.2", "scratch-l10n": "3.15.20230507032520", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", diff --git a/src/_colors.scss b/src/_colors.scss index ca3295c34..ad8b3a916 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -13,6 +13,7 @@ $ui-orange-90percent: hsla(38, 100%, 55%, .9); $ui-dark-orange: hsla(30, 100%, 55%, 1); // ##FF8C1A Variables Primary $ui-red: hsla(20, 100%, 55%, 1); /* #FF661A */ +$ui-red-dark: hsla(20, 100%, 40%, 1); /* #CC4400 */ $ui-red-25percent: hsla(20, 100%, 55%, .25); $ui-green-35percent: rgba(126, 225, 195, .35); @@ -30,8 +31,12 @@ $motion-blue-3: hsla(215, 60%, 50%, 1);//#3373CC $ui-aqua: hsla(144, 45%, 36%, 1); $ui-aqua-dark: darken($ui-aqua, 10%); $ui-purple: hsla(260, 100%, 70%, 1); // #9966FF Looks Primary -$ui-purple-dark: hsla(260, 60%, 60%, 1); // #774DCB Looks Secondary +$ui-purple-dark: hsla(260, 60%, 60%, 1); // #855CD6 Looks Secondary +$ui-purple-darker: hsla(260, 46%, 54%, 1); +$ui-purple-10percent: hsla(260, 60%, 60%, .1); +$ui-purple-25percent: hsla(260, 60%, 60%, .25); $ui-magenta: hsla(300, 53%, 60%, 1); /* #CF63CF Sounds Primary */ +$ui-magenta-dark: hsla(300, 48%, 50%, 1); /* #BD42BD Sounds Tertiary */ $ui-yellow: hsla(45, 100%, 50%, 1); // #FFBF00 Events Primary $ui-coral: hsla(350, 100%, 70%, 1); // #FF6680 More Blocks Primary @@ -64,7 +69,7 @@ $type-gray-75percent: hsla(225, 15%, 40%, .75); $type-gray-60percent: hsla(225, 15%, 40%, .6); $type-white: hsla(0, 100%, 100%, 1); //#FFF -$link-blue: $ui-blue; +$link-purple: $ui-purple-dark; /* Down Deep */ $dd-darkblue: hsla(195, 72.4%, 17.1%, 1); diff --git a/src/components/card/card.scss b/src/components/card/card.scss index 96dfb824d..9f8c48ff2 100644 --- a/src/components/card/card.scss +++ b/src/components/card/card.scss @@ -35,7 +35,7 @@ &.has-error { .input { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; } } diff --git a/src/components/dropdown-banner/banner.scss b/src/components/dropdown-banner/banner.scss index c5094eae0..c2d13f25a 100644 --- a/src/components/dropdown-banner/banner.scss +++ b/src/components/dropdown-banner/banner.scss @@ -37,6 +37,6 @@ $navigation-height: 50px; } &.warning { - background-color: $ui-orange; + background-color: $ui-red-dark; } } diff --git a/src/components/dropdown/dropdown.scss b/src/components/dropdown/dropdown.scss index 5ac55e87d..441750759 100644 --- a/src/components/dropdown/dropdown.scss +++ b/src/components/dropdown/dropdown.scss @@ -7,7 +7,7 @@ right: 0; border: 1px solid $active-gray; border-radius: 0 0 5px 5px; - background-color: $ui-blue; + background-color: $ui-purple-dark; padding: 10px; min-width: 9rem; max-width: 16.25rem; @@ -16,9 +16,10 @@ font-size: .8125rem; font-weight: normal; - &.staging { - background-color: $ui-orange; - } + // Temporary removal of staging styling for testing purposes + // &.staging { + // background-color: $ui-orange; + // } &.open { display: block; @@ -82,7 +83,7 @@ border-left: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-blue; + background-color: $ui-purple-dark; width: $arrow-border-width; height: $arrow-border-width; diff --git a/src/components/formik-forms/formik-input.scss b/src/components/formik-forms/formik-input.scss index bf62e57a1..49f5fa6b3 100644 --- a/src/components/formik-forms/formik-input.scss +++ b/src/components/formik-forms/formik-input.scss @@ -12,17 +12,17 @@ font-size: .875rem; &:focus { - box-shadow: 0 0 0 .25rem $ui-blue-25percent; + box-shadow: 0 0 0 .25rem $ui-purple-25percent; outline: none; - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; transition: all .5s ease, font-size 0s; } &.fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; &:focus { - box-shadow: 0 0 0 .25rem $ui-orange-25percent; + box-shadow: 0 0 0 .25rem $ui-red-25percent; outline: none; } } diff --git a/src/components/formik-forms/formik-select.scss b/src/components/formik-forms/formik-select.scss index 40ec008f9..e5a675e82 100644 --- a/src/components/formik-forms/formik-select.scss +++ b/src/components/formik-forms/formik-select.scss @@ -2,7 +2,7 @@ .select { .fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-purple-dark; &:focus { box-shadow: 0 0 0 .25rem $ui-orange-25percent; diff --git a/src/components/forms/button.scss b/src/components/forms/button.scss index bc5ae82c6..db7be8f33 100644 --- a/src/components/forms/button.scss +++ b/src/components/forms/button.scss @@ -9,7 +9,7 @@ $pass-bg: $ui-aqua; margin: .5em 0; border: 0; border-radius: .5rem; - background-color: $ui-blue; + background-color: $ui-purple-dark; cursor: pointer; padding: 1em 1.25em; color: $type-white; @@ -24,7 +24,7 @@ $pass-bg: $ui-aqua; /* DATA BUTTON STATES */ &.white { background-color: $base-bg; - color: $ui-blue; + color: $ui-purple-dark; } &.pass { diff --git a/src/components/forms/inplace-input.scss b/src/components/forms/inplace-input.scss index 65b3094e1..0dd9ffe40 100644 --- a/src/components/forms/inplace-input.scss +++ b/src/components/forms/inplace-input.scss @@ -13,12 +13,12 @@ &:focus { transition: all .5s ease; outline: none; - border: 2px solid $ui-blue; - box-shadow: 0 0 0 4px $ui-blue-25percent; + border: 2px solid $ui-purple-dark; + box-shadow: 0 0 0 4px $ui-purple-25percent; } &.fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; } &.pass { @@ -51,12 +51,12 @@ &:focus { transition: all .2s ease; outline: none; - border: 2px solid $ui-blue; - box-shadow: 0 0 0 4px $ui-blue-25percent; + border: 2px solid $ui-purple-dark; + box-shadow: 0 0 0 4px $ui-purple-25percent; } &.fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; } &::placeholder { diff --git a/src/components/forms/input.scss b/src/components/forms/input.scss index 3fd202c3e..3a2edd578 100644 --- a/src/components/forms/input.scss +++ b/src/components/forms/input.scss @@ -23,11 +23,11 @@ $base-bg: $ui-light-gray; &:focus { transition: all .5s ease; outline: none; - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; } &.fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; } &.pass { diff --git a/src/components/forms/phone-input.scss b/src/components/forms/phone-input.scss index 99baf386b..2b2f52acc 100644 --- a/src/components/forms/phone-input.scss +++ b/src/components/forms/phone-input.scss @@ -15,6 +15,7 @@ &:focus { outline: none; + border-color: $ui-purple-dark; } } } diff --git a/src/components/forms/select.scss b/src/components/forms/select.scss index 409e19f72..795c0a58d 100644 --- a/src/components/forms/select.scss +++ b/src/components/forms/select.scss @@ -33,7 +33,7 @@ &:focus { outline: none; - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; } &:-moz-focusring { diff --git a/src/components/forms/textarea.scss b/src/components/forms/textarea.scss index 69556f361..1dba2f381 100644 --- a/src/components/forms/textarea.scss +++ b/src/components/forms/textarea.scss @@ -16,11 +16,11 @@ &:focus { transition: all 1s ease; outline: none; - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; } &.fail { - border: 1px solid $ui-orange; + border: 1px solid $ui-red-dark; } &::placeholder { diff --git a/src/components/forms/validation-message.scss b/src/components/forms/validation-message.scss index 0a5620f91..d05006622 100644 --- a/src/components/forms/validation-message.scss +++ b/src/components/forms/validation-message.scss @@ -11,7 +11,7 @@ margin-left: $arrow-border-width; border: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-orange; + background-color: $ui-red-dark; padding: 1rem; max-width: 18.75rem; min-height: 1rem; @@ -32,7 +32,7 @@ border-left: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-orange; + background-color: $ui-red-dark; width: $arrow-border-width; height: $arrow-border-width; @@ -73,18 +73,18 @@ } .validation-error { - background-color: $ui-orange; + background-color: $ui-red-dark; &:before { - background-color: $ui-orange; + background-color: $ui-red-dark; } } .validation-info { - background-color: $ui-blue; + background-color: $ui-blue-dark; box-shadow: 0 0 4px 2px rgba(0, 0, 0, .15); &:before { - background-color: $ui-blue; + background-color: $ui-blue-dark; } } diff --git a/src/components/info-button/info-button.scss b/src/components/info-button/info-button.scss index 0723f8e55..fa95aab23 100644 --- a/src/components/info-button/info-button.scss +++ b/src/components/info-button/info-button.scss @@ -28,7 +28,7 @@ box-shadow: 0 0 4px 2px rgba(0, 0, 0, .15); padding: .75rem; overflow: visible; - background-color: $ui-blue; + background-color: $ui-blue-dark; color: $type-white; line-height: 1.25rem; text-align: left; @@ -48,7 +48,7 @@ border-left: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-blue; + background-color: $ui-blue-dark; width: $arrow-border-width; height: $arrow-border-width; diff --git a/src/components/informationpage/informationpage.scss b/src/components/informationpage/informationpage.scss index 877a3c4be..bedb49d6f 100644 --- a/src/components/informationpage/informationpage.scss +++ b/src/components/informationpage/informationpage.scss @@ -8,7 +8,7 @@ .title-banner { &.masthead { - background-color: $ui-blue-dark; + background-color: $ui-purple-dark; padding-bottom: .5rem; h1 { diff --git a/src/components/intro/intro.scss b/src/components/intro/intro.scss index 52e7454c7..d0b08a4c1 100644 --- a/src/components/intro/intro.scss +++ b/src/components/intro/intro.scss @@ -12,7 +12,7 @@ .intro-container { min-height: 24rem; justify-content: space-between; - background-color: $ui-blue; + background-color: $ui-purple-dark; background-size: 624px 325px; background-repeat: no-repeat; background-position: right; @@ -80,7 +80,7 @@ .intro-button { border-radius: 4px; background-color: $ui-white; - color: $ui-blue; + color: $ui-purple-dark; padding: .625rem .75rem; font-size: 1rem; margin-right: .75rem; diff --git a/src/components/join-flow/join-flow-steps.scss b/src/components/join-flow/join-flow-steps.scss index 6caa86d50..5703f7760 100644 --- a/src/components/join-flow/join-flow-steps.scss +++ b/src/components/join-flow/join-flow-steps.scss @@ -9,7 +9,7 @@ margin-bottom: .5rem; &:focus { - box-shadow: 0 0 0 .25rem $ui-blue-25percent; + box-shadow: 0 0 0 .25rem $ui-purple-25percent; } } diff --git a/src/components/join-flow/next-step-button.scss b/src/components/join-flow/next-step-button.scss index 2747dc178..daecb4e39 100644 --- a/src/components/join-flow/next-step-button.scss +++ b/src/components/join-flow/next-step-button.scss @@ -8,11 +8,11 @@ border-bottom-left-radius: 1rem; border-bottom-right-radius: 1rem; height: 5.1875rem; - background-color: $ui-orange; + background-color: $ui-purple-dark; &:hover { transition: background-color .25s ease; - background-color: $ui-orange-90percent; + background-color: $ui-purple-darker; } /* match the small window setting for modal as a whole */ diff --git a/src/components/modal/addtostudio/modal.scss b/src/components/modal/addtostudio/modal.scss index 25a496b08..18a7368ff 100644 --- a/src/components/modal/addtostudio/modal.scss +++ b/src/components/modal/addtostudio/modal.scss @@ -160,15 +160,15 @@ are not obscured by gradient overlay */ } .studio-status-icon-unselected { - background-color: $ui-blue; + background-color: $ui-purple-dark; } .submit-button { - background-color: $ui-blue; + background-color: $ui-purple-dark; } .submit-button-waiting { - background-color: $ui-blue; + background-color: $ui-purple-dark; } .studio-status-icon-plus-img, diff --git a/src/components/modal/comments/modal.scss b/src/components/modal/comments/modal.scss index 2659b5d37..00514c7ca 100644 --- a/src/components/modal/comments/modal.scss +++ b/src/components/modal/comments/modal.scss @@ -17,8 +17,8 @@ $medium-and-small: "screen and (max-width : #{$mobileIntermediate}-1)"; .report-modal-header { border-radius: 1rem 1rem 0 0; - box-shadow: inset 0 -1px 0 0 $ui-coral-dark; - background-color: $ui-coral; + box-shadow: inset 0 -1px 0 0 $ui-red-dark; + background-color: $ui-red-dark; padding-top: .75rem; width: 100%; height: 3rem; diff --git a/src/components/modal/social/modal.scss b/src/components/modal/social/modal.scss index be290d21e..229b9660f 100644 --- a/src/components/modal/social/modal.scss +++ b/src/components/modal/social/modal.scss @@ -110,8 +110,8 @@ &:focus { transition: all .2s ease; outline: none; - border: 2px solid $ui-blue; - box-shadow: 0 0 0 4px $ui-blue-25percent; + border: 2px solid $ui-purple-dark; + box-shadow: 0 0 0 4px $ui-purple-25percent; } &.social-textarea { diff --git a/src/components/navigation/base/navigation.scss b/src/components/navigation/base/navigation.scss index abcc7937a..482402f18 100644 --- a/src/components/navigation/base/navigation.scss +++ b/src/components/navigation/base/navigation.scss @@ -9,11 +9,12 @@ border-bottom: 1px solid $active-gray; box-shadow: 0 0 3px $box-shadow-gray; - background-color: $ui-blue; + background-color: $ui-purple-dark; - &.staging { - background-color: $ui-orange; - } + // Temporary removal of staging styling for testing purposes + // &.staging { + // background-color: $ui-orange; + // } width: 100%; diff --git a/src/components/navigation/www/navigation.scss b/src/components/navigation/www/navigation.scss index b07300010..48a05732e 100644 --- a/src/components/navigation/www/navigation.scss +++ b/src/components/navigation/www/navigation.scss @@ -2,17 +2,18 @@ @import "../../../frameless"; #navigation { - &.staging { - .messages { - .message-count { - display: none; + // Temporary removal of staging styling for testing purposes + // &.staging { + // .messages { + // .message-count { + // display: none; - &.show { - background-color: $ui-blue; - } - } - } - } + // &.show { + // background-color: $ui-blue; + // } + // } + // } + // } .logo { margin-right: 10px; diff --git a/src/components/news/news.scss b/src/components/news/news.scss index 4bc9c3ed4..8798d3839 100644 --- a/src/components/news/news.scss +++ b/src/components/news/news.scss @@ -35,7 +35,7 @@ h4 { display: block; - color: $link-blue; + color: $link-purple; font-size: .85rem; } diff --git a/src/components/os-chooser/os-chooser.scss b/src/components/os-chooser/os-chooser.scss index 7c0c8e11c..5f69aebbc 100644 --- a/src/components/os-chooser/os-chooser.scss +++ b/src/components/os-chooser/os-chooser.scss @@ -34,7 +34,7 @@ } &.active { - background-color: $ui-blue; + background-color: $ui-purple-dark; } } } diff --git a/src/components/social-message/social-message.scss b/src/components/social-message/social-message.scss index a7afbb18c..24eff2a57 100644 --- a/src/components/social-message/social-message.scss +++ b/src/components/social-message/social-message.scss @@ -41,7 +41,7 @@ a.social-messages-profile-link { color: $type-gray; &:hover { - color: $link-blue; + color: $link-purple; } } diff --git a/src/components/steps/steps.scss b/src/components/steps/steps.scss index 0f15ee0c3..0fdecd159 100644 --- a/src/components/steps/steps.scss +++ b/src/components/steps/steps.scss @@ -29,7 +29,7 @@ .step-number { display: inline-flex; border-radius: 2rem; - background-color: $ui-blue; + background-color: $ui-purple-dark; width: 2rem; height: 2rem; color: $ui-white; diff --git a/src/components/teacher-banner/teacher-banner.scss b/src/components/teacher-banner/teacher-banner.scss index f2564eed8..da2609332 100644 --- a/src/components/teacher-banner/teacher-banner.scss +++ b/src/components/teacher-banner/teacher-banner.scss @@ -33,6 +33,6 @@ margin-left: 10px; background-color: $ui-white; padding: 13px 20px; - color: $ui-blue; + color: $ui-purple-dark; } } diff --git a/src/components/tooltip/tooltip.scss b/src/components/tooltip/tooltip.scss index 55ef06313..f8192df59 100644 --- a/src/components/tooltip/tooltip.scss +++ b/src/components/tooltip/tooltip.scss @@ -25,7 +25,7 @@ margin-top: $arrow-border-width * 0.5; border: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-blue; + background-color: $ui-blue-dark; padding: 1rem; width: 13.75rem; text-align: left; @@ -43,7 +43,7 @@ border-left: 1px solid $active-gray; border-radius: 5px; - background-color: $ui-blue; + background-color: $ui-blue-dark; width: $arrow-border-width; height: $arrow-border-width; diff --git a/src/components/ttt-tile/ttt-tile.scss b/src/components/ttt-tile/ttt-tile.scss index 12c8ba58c..a472f689e 100644 --- a/src/components/ttt-tile/ttt-tile.scss +++ b/src/components/ttt-tile/ttt-tile.scss @@ -82,22 +82,6 @@ font-size: .875rem; } -.ttt-tile-guides { - margin: auto; - border-top: 1px dashed $ui-border; - border-radius: 0 0 1rem 1rem; - cursor: pointer; - padding: 1.25rem 0; - color: $link-blue; - - font-size: .75rem; - font-weight: 500; - - &:hover { - background-color: $ui-blue-10percent; - } -} - .ttt-tile-open-modal { display: inline-block; padding: 0 .25rem; diff --git a/src/main.scss b/src/main.scss index 1936a85d4..470bc61e2 100644 --- a/src/main.scss +++ b/src/main.scss @@ -6,7 +6,7 @@ html, body { display: block; margin: 0; - background-color: $ui-blue-dark; + background-color: $ui-purple-dark; padding: 0; color: $type-gray; font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; @@ -91,19 +91,19 @@ strong { /* Links */ a { cursor: pointer; - color: $ui-blue; + color: $ui-purple-dark; font-weight: bold; &:link, &:visited, &:active { text-decoration: none; - color: $link-blue; + color: $link-purple; } &:hover { text-decoration: none; - color: $ui-blue-dark; + color: $ui-purple-darker; } } @@ -137,6 +137,10 @@ p { font-weight: normal; } +input { + outline-color: $ui-purple-dark; +} + ::selection { background-color: $ui-blue-25percent; } diff --git a/src/views/about/about.scss b/src/views/about/about.scss index 3251d08f3..3c4a80110 100644 --- a/src/views/about/about.scss +++ b/src/views/about/about.scss @@ -79,7 +79,7 @@ .about-button { margin-right: .75rem; - background-color: $ui-blue; + background-color: $ui-purple-dark; color: $ui-white; font-size: 1rem; diff --git a/src/views/annual-report/2021/annual-report.scss b/src/views/annual-report/2021/annual-report.scss index 67e5fd730..3e485d34a 100644 --- a/src/views/annual-report/2021/annual-report.scss +++ b/src/views/annual-report/2021/annual-report.scss @@ -75,7 +75,7 @@ p a { a, a:link, a:visited, a:active{ cursor: pointer; - color: $motion-blue-3; + color: $ui-purple-dark; } .bold { diff --git a/src/views/boost/boost.scss b/src/views/boost/boost.scss index f919d6531..61889a998 100644 --- a/src/views/boost/boost.scss +++ b/src/views/boost/boost.scss @@ -3,7 +3,7 @@ .boost { .extension-header { - background-color: $ui-orange; + background-color: $ui-magenta-dark; background-image: url("/images/boost/boost-pattern.svg"); } } diff --git a/src/views/components/components.jsx b/src/views/components/components.jsx index 18f8dbb20..5fa21290a 100644 --- a/src/views/components/components.jsx +++ b/src/views/components/components.jsx @@ -150,6 +150,7 @@ const Components = () => ( />

Colors

+ $ui-purple-dark $ui-blue $ui-orange $ui-light-gray @@ -167,7 +168,7 @@ const Components = () => ( $header-gray $type-gray $type-white - $link-blue + $link-purple $ui-aqua $ui-purple $ui-blue diff --git a/src/views/components/components.scss b/src/views/components/components.scss index b4a272f95..096088244 100644 --- a/src/views/components/components.scss +++ b/src/views/components/components.scss @@ -9,7 +9,7 @@ li { background-color: $active-gray; &.active { - background-color: $ui-blue; + background-color: $ui-purple-dark; } } } @@ -38,6 +38,7 @@ font-weight: bold; } + .ui-purple-dark, .ui-blue, .ui-orange, .ui-dark-gray, @@ -45,13 +46,17 @@ .overlay-gray, .header-gray, .type-gray, - .link-blue, + .link-purple, .splash-green, .splash-pink, .splash-blue { color: $ui-white; } + .ui-purple-dark { + background-color: $ui-purple-dark; + } + .ui-blue { background-color: $ui-blue; } @@ -120,8 +125,8 @@ background-color: $type-white; } - .link-blue { - background-color: $link-blue; + .link-purple { + background-color: $link-purple; } .splash-green { diff --git a/src/views/developers/developers.scss b/src/views/developers/developers.scss index ab814f7cd..c029609df 100644 --- a/src/views/developers/developers.scss +++ b/src/views/developers/developers.scss @@ -32,7 +32,7 @@ $developer-spot: $ui-aqua; } .band { - $band-color: hsla(360, 100%, 100%, .15); + $band-color: $box-shadow-light-gray; margin-top: 2rem; background-color: $band-color; diff --git a/src/views/download/download.scss b/src/views/download/download.scss index 5c5a64225..6efb2cca0 100644 --- a/src/views/download/download.scss +++ b/src/views/download/download.scss @@ -42,7 +42,7 @@ } .download-header { - background-color: $ui-blue; + background-color: $ui-purple-dark; padding: 4rem 0; color: $ui-white; @@ -168,7 +168,7 @@ p { line-height: normal; - color: $link-blue; + color: $link-purple; font-weight: 600; } diff --git a/src/views/download/scratch-link/download.scss b/src/views/download/scratch-link/download.scss index 1f87f12b8..72983a1dd 100644 --- a/src/views/download/scratch-link/download.scss +++ b/src/views/download/scratch-link/download.scss @@ -2,7 +2,7 @@ .link { .extension-header { - background-color: $ui-aqua; + background-color: $ui-purple-dark; .inner { flex-direction: row; diff --git a/src/views/ev3/ev3.scss b/src/views/ev3/ev3.scss index 6a38054f2..62373c011 100644 --- a/src/views/ev3/ev3.scss +++ b/src/views/ev3/ev3.scss @@ -2,7 +2,7 @@ .ev3 { .extension-header { - background-color: $ui-orange; + background-color: $ui-magenta-dark; background-image: url("/images/ev3/ev3-pattern.svg"); } .headline-icon { diff --git a/src/views/explore/explore.scss b/src/views/explore/explore.scss index 1a151c4bc..d6689fcaf 100644 --- a/src/views/explore/explore.scss +++ b/src/views/explore/explore.scss @@ -12,7 +12,7 @@ $base-bg: $ui-white; .title-banner { &.masthead { margin-bottom: 0; - background-color: $ui-yellow; + background-color: $ui-aqua; padding: 0; h1 { @@ -84,13 +84,13 @@ $base-bg: $ui-white; justify-content: flex-start; li { - border: 1px solid $type-dark-gray; - background-color: $active-gray; - color: $header-gray; + border: 1px solid $ui-purple-dark; + background-color: $ui-white; + color: $link-purple; &.active { opacity: 1; - background-color: $ui-aqua; + background-color: $ui-purple-dark; color: $ui-white; } @@ -99,8 +99,11 @@ $base-bg: $ui-white; } &:hover { - background-color: $active-dark-gray; - color: $type-dark-gray; + background-color: $ui-purple-25percent; + } + + &.active:hover { + background-color: $ui-purple-darker; } } } diff --git a/src/views/gdxfor/gdxfor.scss b/src/views/gdxfor/gdxfor.scss index bfa48f61f..3b451ff86 100644 --- a/src/views/gdxfor/gdxfor.scss +++ b/src/views/gdxfor/gdxfor.scss @@ -3,7 +3,7 @@ .gdxfor { .extension-header { - background-color: $ui-blue; + background-color: $ui-blue-dark; background-image: url("/images/gdxfor/gdxfor-pattern.svg"); } } diff --git a/src/views/ideas/ideas.scss b/src/views/ideas/ideas.scss index 4eba2f81b..96ed3e509 100644 --- a/src/views/ideas/ideas.scss +++ b/src/views/ideas/ideas.scss @@ -9,7 +9,7 @@ $base-bg: $ui-white; } .banner-wrapper { - background: $ui-yellow bottom right url("/images/ideas/right-juice.png") no-repeat; + background: $ui-aqua bottom right url("/images/ideas/right-juice.png") no-repeat; } .ideas-banner { @@ -37,7 +37,8 @@ $base-bg: $ui-white; .ideas-button { margin-right: .75rem; - background-color: $ui-blue; + background-color: $ui-purple-dark; + border: 1px solid $ui-white; color: $ui-white; font-size: 1rem; diff --git a/src/views/messages/messages.scss b/src/views/messages/messages.scss index 1884d0af1..62422428e 100644 --- a/src/views/messages/messages.scss +++ b/src/views/messages/messages.scss @@ -7,7 +7,7 @@ } .title-banner.mod-messages { - background-color: $ui-blue; + background-color: $ui-purple-dark; color: $type-white; } @@ -51,7 +51,7 @@ .messages-header-unread { margin-left: 1rem; border-radius: 1rem; - background-color: $ui-orange; + background-color: $ui-red-dark; padding: .25rem .5rem; line-height: 1rem; color: $type-white; @@ -60,7 +60,7 @@ .admin-message { border: 1px solid $active-dark-gray; border-radius: 5px; - background-color: $ui-blue-25percent; + background-color: $ui-purple-25percent; padding: 1rem; } diff --git a/src/views/microbit/microbit.scss b/src/views/microbit/microbit.scss index 356ffd5f4..0eee4bca5 100644 --- a/src/views/microbit/microbit.scss +++ b/src/views/microbit/microbit.scss @@ -3,7 +3,7 @@ .microbit { .extension-header { - background-color: $ui-mint-green; + background-color: #318131; background-image: url("/images/microbit/mbit-pattern.svg"); } diff --git a/src/views/parents/parents.scss b/src/views/parents/parents.scss index efd06db2d..6f94e2c5f 100644 --- a/src/views/parents/parents.scss +++ b/src/views/parents/parents.scss @@ -67,7 +67,7 @@ $story-width: $cols3; } .band { - $band-color: hsla(360, 100%, 100%, .15); + $band-color: $box-shadow-light-gray; margin-top: 2rem; background-color: $band-color; diff --git a/src/views/preview/comment/comment.scss b/src/views/preview/comment/comment.scss index d90200a76..5485301b6 100644 --- a/src/views/preview/comment/comment.scss +++ b/src/views/preview/comment/comment.scss @@ -249,7 +249,7 @@ .comment-reply { display: inline-flex; cursor: pointer; - color: $ui-blue; + color: $link-purple; font-weight: bold; &:after { diff --git a/src/views/preview/subactions.scss b/src/views/preview/subactions.scss index d70791d94..c5bc54f52 100644 --- a/src/views/preview/subactions.scss +++ b/src/views/preview/subactions.scss @@ -48,7 +48,7 @@ .action-button { margin: 0 0 0 .5rem; border-radius: 19px; - background-color: $ui-blue; + background-color: $ui-purple-dark; padding: 0 .75rem; height: 2rem; text-decoration: none; diff --git a/src/views/preview/unsupported-browser.scss b/src/views/preview/unsupported-browser.scss index 9f400927c..870b8cc49 100644 --- a/src/views/preview/unsupported-browser.scss +++ b/src/views/preview/unsupported-browser.scss @@ -56,9 +56,9 @@ } .back-button { - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; border-radius: .25rem; - background: $ui-blue; + background: $ui-purple-dark; cursor: pointer; padding: .5rem 2rem; color: $ui-white; @@ -74,7 +74,7 @@ .faq-link { text-decoration: none; - color: $ui-blue; + color: $link-purple; } } diff --git a/src/views/splash/hoc/hoc-banner.scss b/src/views/splash/hoc/hoc-banner.scss index 951ccfbc7..abc9f5906 100644 --- a/src/views/splash/hoc/hoc-banner.scss +++ b/src/views/splash/hoc/hoc-banner.scss @@ -59,7 +59,7 @@ $tile-height: 244px; .hoc-image-text { margin: auto auto; - color: $ui-blue; + color: $ui-purple-dark; font-size: 1rem; font-weight: bold; } @@ -77,7 +77,7 @@ $tile-height: 244px; border-radius: 10px; background-color: $ui-white; padding: .5rem 1rem .75rem 1rem; - color: $ui-blue; + color: $ui-purple-dark; font-size: .75rem; font-weight: bold; diff --git a/src/views/studio/icons/edit-icon.svg b/src/views/studio/icons/edit-icon.svg index 376c4c01d..482d527d5 100644 --- a/src/views/studio/icons/edit-icon.svg +++ b/src/views/studio/icons/edit-icon.svg @@ -1,3 +1,3 @@ - + diff --git a/src/views/studio/modals/promote-modal.scss b/src/views/studio/modals/promote-modal.scss index 8f216e50b..d6d6a5084 100644 --- a/src/views/studio/modals/promote-modal.scss +++ b/src/views/studio/modals/promote-modal.scss @@ -4,7 +4,7 @@ width: 680px; .promote-title { - background: $ui-blue; + background: $ui-purple-dark; border-top-left-radius: 12px; border-top-right-radius: 12px; padding-top: .75rem; @@ -61,7 +61,7 @@ .cancel-button { background-color: $ui-white; - color: $ui-blue; - box-shadow: 0px 0px 0 1px $ui-blue; + color: $ui-purple-dark; + box-shadow: 0px 0px 0 1px $ui-purple-dark; } } diff --git a/src/views/studio/modals/studio-report-modal.scss b/src/views/studio/modals/studio-report-modal.scss index bf0b5dd8b..adfa9ac10 100644 --- a/src/views/studio/modals/studio-report-modal.scss +++ b/src/views/studio/modals/studio-report-modal.scss @@ -3,8 +3,8 @@ .studio-report-modal { .studio-report-title { - box-shadow: inset 0 -1px 0 0 $ui-aqua-dark; - background: $ui-aqua; + box-shadow: inset 0 -1px 0 0 $ui-red-dark; + background: $ui-red-dark; border-top-left-radius: 12px; border-top-right-radius: 12px; padding-top: .75rem; diff --git a/src/views/studio/modals/transfer-host-modal.scss b/src/views/studio/modals/transfer-host-modal.scss index 86651a36c..219852f36 100644 --- a/src/views/studio/modals/transfer-host-modal.scss +++ b/src/views/studio/modals/transfer-host-modal.scss @@ -3,7 +3,7 @@ .transfer-host-modal { .transfer-host-title { - background: $ui-blue; + background: $ui-purple-dark; border-top-left-radius: 12px; border-top-right-radius: 12px; padding-top: .75rem; @@ -81,8 +81,8 @@ .cancel-button { background-color: $ui-white; - color: $ui-blue; - box-shadow: 0px 0px 0 1px $ui-blue; + color: $ui-purple-dark; + box-shadow: 0px 0px 0 1px $ui-purple-dark; margin-right: 1rem; } @@ -210,4 +210,4 @@ margin: auto 1.5rem 1rem 1.5rem; } } -} \ No newline at end of file +} diff --git a/src/views/studio/modals/user-projects-modal.scss b/src/views/studio/modals/user-projects-modal.scss index e077e5c90..c0daba361 100644 --- a/src/views/studio/modals/user-projects-modal.scss +++ b/src/views/studio/modals/user-projects-modal.scss @@ -3,8 +3,8 @@ .user-projects-modal { .user-projects-modal-title { - box-shadow: inset 0 -1px 0 0 $ui-blue-dark; - background-color: $ui-blue; + box-shadow: inset 0 -1px 0 0 $box-shadow-light-gray; + background-color: $ui-purple-dark; border-top-left-radius: 12px; border-top-right-radius: 12px; padding-top: .75rem; @@ -21,7 +21,7 @@ border: 1px solid rgba(0, 0, 0, 0.15); color: #575e75; &.active { - background: $ui-blue; + background: $ui-purple-dark; color: white; } &:active { @@ -29,8 +29,8 @@ } } button:hover { - background: $ui-blue-25percent; - border: 1px solid $ui-blue-10percent; + background: $ui-purple-25percent; + border: 1px solid $ui-purple-10percent; } } .user-projects-modal-content { @@ -73,8 +73,8 @@ } .studio-tile-added { - border: 1px solid $ui-blue !important; // Override the tile border set in studio.scss .studio-project-tile - box-shadow: 0 0 0 4px $ui-blue-25percent; + border: 1px solid $ui-purple-dark !important; // Override the tile border set in studio.scss .studio-project-tile + box-shadow: 0 0 0 4px $ui-purple-25percent; } .studio-project-add-remove-image { diff --git a/src/views/studio/studio.scss b/src/views/studio/studio.scss index 2e9c16e4d..301606e24 100644 --- a/src/views/studio/studio.scss +++ b/src/views/studio/studio.scss @@ -97,7 +97,7 @@ $radius: 8px; button { font-size: smaller; - background-color: $ui-blue; + background-color: $ui-purple-dark; border: 1px solid transparent; border-radius: 999em; color: $ui-white; @@ -107,7 +107,7 @@ $radius: 8px; padding-right: 0.75em; &:hover { - background-color: $ui-blue-dark; + background-color: $ui-purple-darker; } img { @@ -212,7 +212,7 @@ $radius: 8px; } } .active > li { - background: $ui-blue; + background: $ui-purple-dark; color: white; img { filter: invert(0); @@ -223,7 +223,7 @@ $radius: 8px; border: 1px solid $active-gray; } a.active.nav_link:hover > li { - background: $ui-blue-dark; + background: $ui-purple-darker; color: white; img { filter: invert(0); @@ -240,11 +240,11 @@ $radius: 8px; width: 4.875rem; height: 2rem; - border: 1px solid $ui-blue; + border: 1px solid $ui-purple-dark; border-radius: 1rem; font-weight: bold; - color: $ui-blue; + color: $ui-purple-dark; font-size: 12px; display: flex; justify-content: center; @@ -318,7 +318,7 @@ $radius: 8px; min-width: 0; /* Prevents within from expanding beyond bounds */ } .studio-project-title { - color: #4C97FF; + color: $link-purple; font-weight: 700; font-size: 14px; white-space: nowrap; @@ -380,7 +380,7 @@ $radius: 8px; min-width: 0; /* Prevents within from expanding beyond bounds */ } .studio-member-name { - color: #4C97FF; + color: $link-purple; font-weight: 700; font-size: 14px; white-space: nowrap; @@ -395,11 +395,6 @@ $radius: 8px; overflow: hidden; text-overflow: ellipsis; } - .studio-member-remove, .studio-member-promote { - color: $ui-blue; - background: transparent; - border: none; - } .studio-member-tile-menu-wide { white-space: nowrap; @@ -415,7 +410,7 @@ $radius: 8px; margin-top: 20px; h3 { - color: #4C97FF; + color: $ui-purple-dark; } .studio-adder-row { @@ -585,7 +580,7 @@ $radius: 8px; } .studio-thumb-edit-button { - color: #4C97FF; + color: $link-purple; font-size: 1rem; font-weight: bold; height: 40px; diff --git a/src/views/teachers/landing/landing.scss b/src/views/teachers/landing/landing.scss index 7e9e30656..81899b318 100644 --- a/src/views/teachers/landing/landing.scss +++ b/src/views/teachers/landing/landing.scss @@ -68,7 +68,7 @@ $story-width: $cols3; } .band { - $band-color: hsla(360, 100%, 100%, .15); + $band-color: $box-shadow-light-gray; margin-top: 2rem; background-color: $band-color; diff --git a/src/views/wedo2/wedo2.scss b/src/views/wedo2/wedo2.scss index bcac4ab5c..f4343dbb0 100644 --- a/src/views/wedo2/wedo2.scss +++ b/src/views/wedo2/wedo2.scss @@ -2,7 +2,7 @@ .wedo2 { .extension-header { - background-color: $ui-coral; + background-color: $ui-magenta-dark; background-image: url("/images/wedo2/wedo2-pattern.svg"); } } diff --git a/static/svgs/project/comment-reply.svg b/static/svgs/project/comment-reply.svg index b0edaf79c..575081d5d 100644 --- a/static/svgs/project/comment-reply.svg +++ b/static/svgs/project/comment-reply.svg @@ -5,6 +5,6 @@ Created with Sketch. - + - \ No newline at end of file + diff --git a/static/svgs/studio/activity-curator.svg b/static/svgs/studio/activity-curator.svg index 291a22e3a..a56a01c13 100644 --- a/static/svgs/studio/activity-curator.svg +++ b/static/svgs/studio/activity-curator.svg @@ -1,4 +1,4 @@ - - + + diff --git a/static/svgs/studio/activity-edit.svg b/static/svgs/studio/activity-edit.svg index 74d899763..06023b709 100644 --- a/static/svgs/studio/activity-edit.svg +++ b/static/svgs/studio/activity-edit.svg @@ -1,3 +1,3 @@ - + diff --git a/static/svgs/studio/activity-project.svg b/static/svgs/studio/activity-project.svg index 464a7f6bc..d99c72772 100644 --- a/static/svgs/studio/activity-project.svg +++ b/static/svgs/studio/activity-project.svg @@ -1,4 +1,4 @@ - - + + diff --git a/static/svgs/tutorials.svg b/static/svgs/tutorials.svg index 6028966a4..c78a34703 100644 --- a/static/svgs/tutorials.svg +++ b/static/svgs/tutorials.svg @@ -10,8 +10,8 @@ - - + + @@ -19,4 +19,4 @@ - \ No newline at end of file + From 29a828487aa188fc447946d7edd06b8c54c350a7 Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Wed, 24 May 2023 13:16:01 -0400 Subject: [PATCH 02/22] fix: correct integration tests and update scratch-gui --- package-lock.json | 14 +++++++------- package.json | 2 +- test/integration/project-page.test.js | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5d6601e4..03eedc654 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.2", + "scratch-gui": "2.0.0-beta.3", "scratch-l10n": "3.15.20230507032520", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23495,9 +23495,9 @@ } }, "node_modules/scratch-gui": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.2.tgz", - "integrity": "sha512-yAhQdj8nORDTdBvxWsYfsxRSL7zZdZlW3X5HKYN6GJCRZugk1GqS/hJ/7D+jwrmgjx6rtJGR3ljJY+1lZtmq8Q==", + "version": "2.0.0-beta.3", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.3.tgz", + "integrity": "sha512-y8v0d5vVvZnuz3szayHEfioNazDzHDXQFYWU92DA7crx1ZgrsOyoOrSa9k3Q/0u948+WLikPbCeFsq0Wm5CVsQ==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -51986,9 +51986,9 @@ } }, "scratch-gui": { - "version": "2.0.0-beta.2", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.2.tgz", - "integrity": "sha512-yAhQdj8nORDTdBvxWsYfsxRSL7zZdZlW3X5HKYN6GJCRZugk1GqS/hJ/7D+jwrmgjx6rtJGR3ljJY+1lZtmq8Q==", + "version": "2.0.0-beta.3", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.3.tgz", + "integrity": "sha512-y8v0d5vVvZnuz3szayHEfioNazDzHDXQFYWU92DA7crx1ZgrsOyoOrSa9k3Q/0u948+WLikPbCeFsq0Wm5CVsQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index 1a4adfefd..faa26bfe6 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.2", + "scratch-gui": "2.0.0-beta.3", "scratch-l10n": "3.15.20230507032520", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", diff --git a/test/integration/project-page.test.js b/test/integration/project-page.test.js index 676e1de7b..8d0c2d5f4 100644 --- a/test/integration/project-page.test.js +++ b/test/integration/project-page.test.js @@ -41,6 +41,9 @@ let password = process.env.SMOKE_PASSWORD; const remote = process.env.SMOKE_REMOTE || false; +const FILE_MENU_XPATH = '//div[contains(@class, "menu-bar_menu-bar-item")]' + + '[*[contains(@class, "menu-bar_collapsible-label")]//*[text()="File"]]'; + jest.setTimeout(60000); let driver; @@ -211,7 +214,7 @@ describe('www-integration project-creation signed in', () => { await driver.get(ownedUnsharedUrl + '/editor'); let gf = await findByXpath('//img[@class="green-flag_green-flag_1kiAo"]'); await gf.isDisplayed(); - await clickText('File'); + await clickXpath(FILE_MENU_XPATH); await clickText('Save as a copy'); let successAlert = await findText('Project saved as a copy.'); let alertVisible = await successAlert.isDisplayed(); @@ -246,7 +249,7 @@ describe('www-integration project-creation signed in', () => { await clickXpath('//li[@class="link create"]'); let gf = await findByXpath('//img[@class="green-flag_green-flag_1kiAo"]'); await gf.isDisplayed(); - await clickText('File'); + await clickXpath(FILE_MENU_XPATH); await clickText('Load from your computer'); await driver.sleep(1000); const input = await findByXpath('//input[@accept=".sb,.sb2,.sb3"]'); From 179e4beaa3278645e11036931155e8b38272a5bb Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Fri, 26 May 2023 09:45:56 -0400 Subject: [PATCH 03/22] fix: update privacy policy banner color --- src/components/privacy-banner/privacy-banner.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/privacy-banner/privacy-banner.scss b/src/components/privacy-banner/privacy-banner.scss index 56a9ce35c..0236c915a 100644 --- a/src/components/privacy-banner/privacy-banner.scss +++ b/src/components/privacy-banner/privacy-banner.scss @@ -5,7 +5,7 @@ .privacy-banner { display: flex; z-index: 8; - background-color: $ui-blue-dark; + background-color: $ui-purple-darker; padding: 0; overflow: hidden; align-items: center; @@ -69,4 +69,4 @@ .privacy-banner .donate-close-button { top: 1rem; } -} \ No newline at end of file +} From 8e5b6032101dd63c184b002e08dd77035eb285f4 Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Thu, 1 Jun 2023 09:30:57 -0400 Subject: [PATCH 04/22] fix: update styling for ideas button --- package-lock.json | 30 ++++++++++++------------ package.json | 2 +- src/views/ideas/ideas.jsx | 4 ++-- src/views/ideas/ideas.scss | 21 ++++++++++++++++- static/images/ideas/bulb-yellow-icon.svg | 3 +++ 5 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 static/images/ideas/bulb-yellow-icon.svg diff --git a/package-lock.json b/package-lock.json index 9ec5ce958..d3865b58b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.3", + "scratch-gui": "2.0.0-beta.4", "scratch-l10n": "3.15.20230524032205", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23495,9 +23495,9 @@ } }, "node_modules/scratch-gui": { - "version": "2.0.0-beta.3", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.3.tgz", - "integrity": "sha512-y8v0d5vVvZnuz3szayHEfioNazDzHDXQFYWU92DA7crx1ZgrsOyoOrSa9k3Q/0u948+WLikPbCeFsq0Wm5CVsQ==", + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.4.tgz", + "integrity": "sha512-kEMKniFEHG+RAKJx+0hTYal+gAFUwWvdVmB/q+QeGXBpEUg27MrgSm+ECqMnEA0Rvbt4/PHtoStdKtZcLn4Phw==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -23556,7 +23556,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137", - "scratch-vm": "1.5.70", + "scratch-vm": "1.5.48", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -24193,9 +24193,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "1.5.70", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.70.tgz", - "integrity": "sha512-ybmtPK+1nDNxeUpbAxTZTPwmRzksNo5X7eF+2E0L8NgHZXekHoamUmJYe2FGewK5Fx7LIkkhmczWAIo7fF4Qlw==", + "version": "1.5.48", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.48.tgz", + "integrity": "sha512-xvIxNRruVTdDbgow1tjkM51+DYEfsE39oGrwG0hfKdLTTcF517gz30U3G3EK6vURivzlu+XvaO0RCHwxskSeeg==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", @@ -52004,9 +52004,9 @@ } }, "scratch-gui": { - "version": "2.0.0-beta.3", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.3.tgz", - "integrity": "sha512-y8v0d5vVvZnuz3szayHEfioNazDzHDXQFYWU92DA7crx1ZgrsOyoOrSa9k3Q/0u948+WLikPbCeFsq0Wm5CVsQ==", + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.4.tgz", + "integrity": "sha512-kEMKniFEHG+RAKJx+0hTYal+gAFUwWvdVmB/q+QeGXBpEUg27MrgSm+ECqMnEA0Rvbt4/PHtoStdKtZcLn4Phw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -52065,7 +52065,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137", - "scratch-vm": "1.5.70", + "scratch-vm": "1.5.48", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -52612,9 +52612,9 @@ "dev": true }, "scratch-vm": { - "version": "1.5.70", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.70.tgz", - "integrity": "sha512-ybmtPK+1nDNxeUpbAxTZTPwmRzksNo5X7eF+2E0L8NgHZXekHoamUmJYe2FGewK5Fx7LIkkhmczWAIo7fF4Qlw==", + "version": "1.5.48", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.48.tgz", + "integrity": "sha512-xvIxNRruVTdDbgow1tjkM51+DYEfsE39oGrwG0hfKdLTTcF517gz30U3G3EK6vURivzlu+XvaO0RCHwxskSeeg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 91b4a9557..813d2ef42 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.3", + "scratch-gui": "2.0.0-beta.4", "scratch-l10n": "3.15.20230524032205", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", diff --git a/src/views/ideas/ideas.jsx b/src/views/ideas/ideas.jsx index af88e4a15..a93579351 100644 --- a/src/views/ideas/ideas.jsx +++ b/src/views/ideas/ideas.jsx @@ -81,10 +81,10 @@ class Ideas extends React.Component { - diff --git a/src/views/ideas/ideas.scss b/src/views/ideas/ideas.scss index 96ed3e509..317c23d0a 100644 --- a/src/views/ideas/ideas.scss +++ b/src/views/ideas/ideas.scss @@ -35,10 +35,29 @@ $base-bg: $ui-white; max-width: calc(100% - 2rem); } +.banner-button { + background-color: $ui-white; + color: $ui-aqua; + font-size: 1rem; + + img { + margin-right: 1rem; + height: 1.5rem; + vertical-align: middle; + } + + a { + color: $ui-white; + } + + span { + vertical-align: middle; + } +} + .ideas-button { margin-right: .75rem; background-color: $ui-purple-dark; - border: 1px solid $ui-white; color: $ui-white; font-size: 1rem; diff --git a/static/images/ideas/bulb-yellow-icon.svg b/static/images/ideas/bulb-yellow-icon.svg new file mode 100644 index 000000000..cf57a7529 --- /dev/null +++ b/static/images/ideas/bulb-yellow-icon.svg @@ -0,0 +1,3 @@ + + + From f2f9e74a3917beefea7a61f534fa61a826f31ecf Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Mon, 5 Jun 2023 09:00:19 -0400 Subject: [PATCH 05/22] feat: update cookies page with scratchtheme info --- src/views/cookies/cookies.jsx | 13 ++++++++++++- src/views/cookies/l10n.json | 5 +++-- test/integration/footer-links.test.js | 12 ++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/views/cookies/cookies.jsx b/src/views/cookies/cookies.jsx index d498725f1..8a8fc11df 100644 --- a/src/views/cookies/cookies.jsx +++ b/src/views/cookies/cookies.jsx @@ -12,6 +12,8 @@ const privacyPolicyLink = chunks => {chunks}; const manageLink = chunks => {chunks}; const googlePoliciesLink = chunks => {chunks}; const optOutLink = chunks => {chunks}; +// When this page was last updated. See 'click Cookies link' in footer-links.test.js if you update this value. +const updated = new Date('2023-06-28T12:00:00.000-04:00'); require('./cookies.scss'); @@ -25,7 +27,10 @@ const Cookies = injectIntl(() => (

- +

@@ -121,6 +126,12 @@ const Cookies = injectIntl(() => ( + + scratchtheme + Scratch + + + wistia-video-progress-# Wistia diff --git a/src/views/cookies/l10n.json b/src/views/cookies/l10n.json index 815793005..e8c3905ba 100644 --- a/src/views/cookies/l10n.json +++ b/src/views/cookies/l10n.json @@ -3,7 +3,7 @@ "cookies.nav.types": "Types of Cookies", "cookies.nav.manage": "Manage Cookies", "cookies.nav.contact": "Contact Us", - "cookies.lastUpdated": "The Scratch Cookie Policy was last updated May 25, 2023", + "cookies.lastUpdatedFormat": "The Scratch Cookie Policy was last updated {updated, date, long}", "cookies.intro1": "This Cookie Policy (the “Cookie Policy”) is provided by Scratch Foundation (“Scratch”, “we” or “us”). It supplements the information and disclosures included in our Privacy Policy, and explains how Scratch uses Cookies on its website scratch.mit.edu (the “Scratch Website”) to its visitors (“you”, “user”). For the purpose of this Cookie Policy, “Personal Information” means any information relating to an identified or identifiable individual.", "cookies.intro2": "When you use the Scratch Website, we use cookies, beacons, invisible tags, unique IDs and similar technologies (collectively “Cookies”) to automatically record certain Personal Information from your browser or device.", "cookies.table.name": "Name", @@ -29,6 +29,7 @@ "cookies.functional.permissions": "Used to track which features of the service a logged in user is able to access.", "cookies.functional.exploreBy": "Used to save the user’s current search preference.", "cookies.functional.scratchLanguage": "Used to save information about the user’s preferred language.", + "cookies.functional.scratchTheme": "Used to save information about the user’s preferred color mode.", "cookies.functional.scratchPolicySeen": "Used to track if the user has seen a privacy policy update notification", "cookies.functional.wistia": "Contains a timestamp for the Scratch Website’s video-content. This allows the user to resume watching without having to start over, if the user leaves the video or Scratch Website.", "cookies.functional.minilogSettings": "Unclassified", @@ -63,4 +64,4 @@ "cookies.manageBody": "If you do not want your Personal Information to be collected through the use of Cookies, most browsers allow you to manage your Cookie preferences. You can set your browser to automatically decline Cookies or to request you to accept or decline Cookies for each site. You can find more information about Cookies at http://www.allaboutcookies.org/manage-cookies.", "cookies.contactTitle": "Contact Us", "cookies.contactIntro": "If you have any questions about this Cookie Policy please contact us at privacy@scratch.mit.edu or via mail at:" -} \ No newline at end of file +} diff --git a/test/integration/footer-links.test.js b/test/integration/footer-links.test.js index cf9076976..fc6f2c01d 100644 --- a/test/integration/footer-links.test.js +++ b/test/integration/footer-links.test.js @@ -125,6 +125,18 @@ describe('www-integration footer links', () => { expect(pathname).toMatch(/^\/privacy_policy\/?$/); }); + test('click Cookies link', async () => { + await clickText('Cookies'); + let url = await driver.getCurrentUrl(); + let pathname = (new URL(url)).pathname; + expect(pathname).toMatch(/^\/cookies\/?$/); + + // Verify localization of last updated message + let lastUpdated = await findText('The Scratch Cookie Policy was last updated June 28, 2023'); + let lastUpdatedVisible = await lastUpdated.isDisplayed(); + await expect(lastUpdatedVisible).toBe(true); + }); + test('click DMCA link', async () => { await clickText('DMCA'); let url = await driver.getCurrentUrl(); From 40180b8e34a085222655581bc3ea2de738a740fb Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Thu, 8 Jun 2023 12:35:37 -0400 Subject: [PATCH 06/22] chore(deps): update scratch-gui --- 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 d3865b58b..b3d9b08bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.4", + "scratch-gui": "2.0.0-beta.5", "scratch-l10n": "3.15.20230524032205", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23495,9 +23495,9 @@ } }, "node_modules/scratch-gui": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.4.tgz", - "integrity": "sha512-kEMKniFEHG+RAKJx+0hTYal+gAFUwWvdVmB/q+QeGXBpEUg27MrgSm+ECqMnEA0Rvbt4/PHtoStdKtZcLn4Phw==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.5.tgz", + "integrity": "sha512-dPo66EwZwXIAutoGCrfxpJFX9ghV+WnNHHn0P6vRempOYw6e3MBnT6hEWjSoa7ZhYH3mQe5Bbpx/wosPJRdelg==", "dev": true, "dependencies": { "arraybuffer-loader": "^1.0.6", @@ -52004,9 +52004,9 @@ } }, "scratch-gui": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.4.tgz", - "integrity": "sha512-kEMKniFEHG+RAKJx+0hTYal+gAFUwWvdVmB/q+QeGXBpEUg27MrgSm+ECqMnEA0Rvbt4/PHtoStdKtZcLn4Phw==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.5.tgz", + "integrity": "sha512-dPo66EwZwXIAutoGCrfxpJFX9ghV+WnNHHn0P6vRempOYw6e3MBnT6hEWjSoa7ZhYH3mQe5Bbpx/wosPJRdelg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index 813d2ef42..dac83f970 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.4", + "scratch-gui": "2.0.0-beta.5", "scratch-l10n": "3.15.20230524032205", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From f2f2178e05569cad1298025487e519a21399e563 Mon Sep 17 00:00:00 2001 From: Andy O'Neill Date: Tue, 20 Jun 2023 13:49:06 -0400 Subject: [PATCH 07/22] chore(deps): update to release scratch-www version --- package-lock.json | 116 ++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 93 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3677b7015..8698a1450 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.5", + "scratch-gui": "2.0.0", "scratch-l10n": "3.15.20230612032227", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -2001,6 +2001,15 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.2.tgz", "integrity": "sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ==" }, + "node_modules/@types/node-hid": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@types/node-hid/-/node-hid-1.3.1.tgz", + "integrity": "sha512-VPxuGDCoDxOUKrTZPSok7IEmiK4cVLfj8Csu09FtG5uF+eqf1HETERHXQkO02Rk6j6YiiHxp0/DA9R4llvhEzQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", @@ -2030,6 +2039,21 @@ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", "dev": true }, + "node_modules/@types/usb": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/usb/-/usb-1.5.4.tgz", + "integrity": "sha512-NOUza/8yuswu6RoECQyPHEjA34qpDaeONQ72fm+bCnnN2DJjDePAY+NsmV17H88oIlq4JlJ2mD5Kh5d6R2MwTQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/w3c-web-usb": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz", + "integrity": "sha512-cSjhgrr8g4KbPnnijAr/KJDNKa/bBa+ixYkywFRvrhvi9n1WEl7yYbtRyzE6jqNQiSxxJxoAW3STaOQwJHndaw==", + "dev": true + }, "node_modules/@types/yauzl": { "version": "2.9.2", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", @@ -4007,6 +4031,12 @@ "babylon": "bin/babylon.js" } }, + "node_modules/balance-text": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/balance-text/-/balance-text-3.3.1.tgz", + "integrity": "sha512-tpnHvo1w0rJ5rbu+jZKf7NLKKg6XZ6eAwREP/9jEDJ+ZTBi6jQFqn/UGARL3/oqD8SgQbyTwBXBjhKDdTgoPRw==", + "dev": true + }, "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -7265,6 +7295,20 @@ "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==", "dev": true }, + "node_modules/dapjs": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/dapjs/-/dapjs-2.3.0.tgz", + "integrity": "sha512-quanzq7+2xnqgGqqYgARz9o3iBcZ3Ir5r5mTA7WPsjrp9ilEqqCToSFGTL+8HuGP35dUIL7O+yMBloYHhHgZDA==", + "dev": true, + "dependencies": { + "@types/node-hid": "^1.2.0", + "@types/usb": "^1.5.1", + "@types/w3c-web-usb": "^1.0.4" + }, + "engines": { + "node": ">=8.14.0" + } + }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -23465,21 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230509131059", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230509131059.tgz", - "integrity": "sha512-TPrMjmXhOh3AwlLJu3ggkMUwfHsUN8Y0tk7NnrLM02R0qtr32pgOHttBobXDya7R4Pu+HyfGSuxwtuJftb0MsQ==", + "version": "0.2.0-prerelease.20230620160847", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230620160847.tgz", + "integrity": "sha512-aROMp24w2Wk2Nz3LRHJ8HJhHjgZU5onn+vgXTIWu/wrHKeR8GSdo7NKXxd3e6YSWcsvlekTt3Gjvkm6yhPSlxw==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230507032520" + "scratch-l10n": "3.15.20230527032201" } }, "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230507032520", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz", - "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==", + "version": "3.15.20230527032201", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230527032201.tgz", + "integrity": "sha512-nUqHPQrG9Eal1M+AY/2gJlje7O5W9yZ9yaLsWWScgYPYGFm8rxFnVk8pcEmZCzghz+folsfuN0zS0bPKDopr/Q==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -23495,13 +23539,15 @@ } }, "node_modules/scratch-gui": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0-beta.5.tgz", - "integrity": "sha512-dPo66EwZwXIAutoGCrfxpJFX9ghV+WnNHHn0P6vRempOYw6e3MBnT6hEWjSoa7ZhYH3mQe5Bbpx/wosPJRdelg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0.tgz", + "integrity": "sha512-DJ1bEwZjb0QqTKamoKvzTdK1bpZ0weU/fBy9V4b4uwGHkSu5EnixSSzQ8YH09pGvyOLgQkotvDQdVNTyeDQdKA==", "dev": true, "dependencies": { + "@microbit/microbit-universal-hex": "0.2.2", "arraybuffer-loader": "^1.0.6", "autoprefixer": "^9.0.1", + "balance-text": "3.3.1", "base64-loader": "1.0.0", "bowser": "1.9.4", "cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", @@ -23511,6 +23557,7 @@ "copy-webpack-plugin": "6.4.1", "core-js": "2.5.7", "css-loader": "^1.0.0", + "dapjs": "2.3.0", "es6-object-assign": "1.1.0", "get-float-time-domain-data": "0.1.0", "get-user-media-promise": "1.1.4", @@ -23549,14 +23596,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230509131059", - "scratch-l10n": "3.15.20230507032520", - "scratch-paint": "1.2.0-beta.1", + "scratch-blocks": "0.2.0-prerelease.20230620160847", + "scratch-l10n": "3.15.20230620032154", + "scratch-paint": "2.0.0", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137", - "scratch-vm": "1.5.48", + "scratch-vm": "1.5.76", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -23569,6 +23616,20 @@ "react-dom": "^16.0.0" } }, + "node_modules/scratch-gui/node_modules/@microbit/microbit-universal-hex": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@microbit/microbit-universal-hex/-/microbit-universal-hex-0.2.2.tgz", + "integrity": "sha512-qyFt8ATgxAyPkNz9Yado4HXEeCctwP/8L1/v2hFLeVUqw/HFqVqV4piJbqRMmyOefMcQ9OyVPhLXjtbKn9063Q==", + "dev": true, + "engines": { + "node": ">=8.5", + "npm": ">=6.0", + "yarn": "^1.0" + }, + "peerDependencies": { + "tslib": ">=1.11.1" + } + }, "node_modules/scratch-gui/node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -23892,9 +23953,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.15.20230507032520", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz", - "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==", + "version": "3.15.20230620032154", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", + "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", @@ -23910,9 +23971,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "1.2.0-beta.1", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.2.0-beta.1.tgz", - "integrity": "sha512-YyVBRv5+ahJA02N0KKjalHUyJXKZOvQmpq658gswePsyU/GkcHByJCRQjd0iYWN8nJZlDEZrOExLuh+noTHjuA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.0.tgz", + "integrity": "sha512-z8Ie9AxkWycAI0SZ66NxvahOXBtQlFOEBtDi7wSn0Kn3ZC1J8mVxc/Wzq0JYDUpMUn8szjnFn4Wxw2FlW0y8eQ==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -23978,6 +24039,13 @@ "node": ">=4" } }, + "node_modules/scratch-gui/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "dev": true, + "peer": true + }, "node_modules/scratch-gui/node_modules/xhr": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", @@ -24193,9 +24261,9 @@ "dev": true }, "node_modules/scratch-vm": { - "version": "1.5.48", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.48.tgz", - "integrity": "sha512-xvIxNRruVTdDbgow1tjkM51+DYEfsE39oGrwG0hfKdLTTcF517gz30U3G3EK6vURivzlu+XvaO0RCHwxskSeeg==", + "version": "1.5.76", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.76.tgz", + "integrity": "sha512-GawQ+5eddw9YtOgxlIjlIPmD/NVmiCRmHJy9EJIXwZdK5oedbFaZQKxKUigmmreG4XPd5twXVFtPykYZGhemWw==", "dev": true, "dependencies": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 292988618..bbbc4e752 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0-beta.5", + "scratch-gui": "2.0.0", "scratch-l10n": "3.15.20230612032227", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 8463ef00eed40162cecef12d0c5423b2b710da60 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:54:56 +0000 Subject: [PATCH 08/22] fix(deps): update dependency scratch-gui to v1.9.11 --- 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 67b137fb7..cb8da78fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.9.10", + "scratch-gui": "1.9.11", "scratch-l10n": "3.15.20230620032154", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23537,9 +23537,9 @@ } }, "node_modules/scratch-gui": { - "version": "1.9.10", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.9.10.tgz", - "integrity": "sha512-6ukavYVw6Ok1OaVgvWNpWcn+Y0Vq71j9YNPOHH0Avv35vsLiv/a84uBGsioyvSMPUfhGnS1RDdhcFNA1v6qPBw==", + "version": "1.9.11", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.9.11.tgz", + "integrity": "sha512-0QIQOxNQz+YKnqMxCaZGaG3jxuswsYvR8tFDCXrxCSj8+EX5APhkequFvHv/0WVCCwnrSsxT0PaduH/ifls3PQ==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,7 +23596,7 @@ "scratch-audio": "0.1.0-prerelease.20221123180128", "scratch-blocks": "0.1.0-prerelease.20230527085947", "scratch-l10n": "3.15.20230620032154", - "scratch-paint": "1.1.72", + "scratch-paint": "1.1.73", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23942,9 +23942,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "1.1.72", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.72.tgz", - "integrity": "sha512-NvycAxd3Wwvc7VNJzgFYPIn/Fny+WVXsNttfR64ix8/llhLUJ0tAA472ThiNFlu899wjVeJg39uJ2ix0WubCfw==", + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.73.tgz", + "integrity": "sha512-OoG9Vq4SH9WT5JTRD4HdUiw0tzrCdms7svzQ2b/HzuQCjmNDpJE4Vve0isyj5/jbIyDfWzbpiHNyiJaMC+wu1Q==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -52082,9 +52082,9 @@ } }, "scratch-gui": { - "version": "1.9.10", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.9.10.tgz", - "integrity": "sha512-6ukavYVw6Ok1OaVgvWNpWcn+Y0Vq71j9YNPOHH0Avv35vsLiv/a84uBGsioyvSMPUfhGnS1RDdhcFNA1v6qPBw==", + "version": "1.9.11", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.9.11.tgz", + "integrity": "sha512-0QIQOxNQz+YKnqMxCaZGaG3jxuswsYvR8tFDCXrxCSj8+EX5APhkequFvHv/0WVCCwnrSsxT0PaduH/ifls3PQ==", "dev": true, "requires": { "@microbit/microbit-universal-hex": "0.2.2", @@ -52141,7 +52141,7 @@ "scratch-audio": "0.1.0-prerelease.20221123180128", "scratch-blocks": "0.1.0-prerelease.20230527085947", "scratch-l10n": "3.15.20230620032154", - "scratch-paint": "1.1.72", + "scratch-paint": "1.1.73", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -52418,9 +52418,9 @@ } }, "scratch-paint": { - "version": "1.1.72", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.72.tgz", - "integrity": "sha512-NvycAxd3Wwvc7VNJzgFYPIn/Fny+WVXsNttfR64ix8/llhLUJ0tAA472ThiNFlu899wjVeJg39uJ2ix0WubCfw==", + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.73.tgz", + "integrity": "sha512-OoG9Vq4SH9WT5JTRD4HdUiw0tzrCdms7svzQ2b/HzuQCjmNDpJE4Vve0isyj5/jbIyDfWzbpiHNyiJaMC+wu1Q==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 72bde6f65..c06091340 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "1.9.10", + "scratch-gui": "1.9.11", "scratch-l10n": "3.15.20230620032154", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 2a86b06e2b7278a3adadef6342ff338afcaf7f7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 03:07:42 +0000 Subject: [PATCH 09/22] fix(deps): update dependency scratch-gui to v2.0.1 --- package-lock.json | 54 ++++++++--------------------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8eda4b42f..a5ed2b6bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0", + "scratch-gui": "2.0.1", "scratch-l10n": "3.15.20230620032154", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230620160847", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230620160847.tgz", - "integrity": "sha512-aROMp24w2Wk2Nz3LRHJ8HJhHjgZU5onn+vgXTIWu/wrHKeR8GSdo7NKXxd3e6YSWcsvlekTt3Gjvkm6yhPSlxw==", + "version": "0.2.0-prerelease.20230620212954", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230620212954.tgz", + "integrity": "sha512-B+SJPlZczFNK1kxcHwsaq1wLNZy3g/CEyqlI0bBTesAv6uwCmFEplsaq2sNtHwwCF7JQPJbjBy4Xj01KrQGlfA==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230527032201" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230527032201", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230527032201.tgz", - "integrity": "sha512-nUqHPQrG9Eal1M+AY/2gJlje7O5W9yZ9yaLsWWScgYPYGFm8rxFnVk8pcEmZCzghz+folsfuN0zS0bPKDopr/Q==", - "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.20230620032154" } }, "node_modules/scratch-gui": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.0.tgz", - "integrity": "sha512-DJ1bEwZjb0QqTKamoKvzTdK1bpZ0weU/fBy9V4b4uwGHkSu5EnixSSzQ8YH09pGvyOLgQkotvDQdVNTyeDQdKA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.1.tgz", + "integrity": "sha512-Nbeq8lAD32JeAUk4B6U7paBnFDmxeYRSfosKjxsWZ3QXsHpp9i018bZEh/lhljTu0IiYtQv0Kmtu+QCTi8o0mQ==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,7 +23578,7 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230620160847", + "scratch-blocks": "0.2.0-prerelease.20230620212954", "scratch-l10n": "3.15.20230620032154", "scratch-paint": "2.0.0", "scratch-render": "0.1.0-prerelease.20230318150639", @@ -23952,24 +23934,6 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.15.20230620032154", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", - "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", - "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": "2.0.0", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.0.tgz", diff --git a/package.json b/package.json index 95c10d8db..0217c55ba 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.0", + "scratch-gui": "2.0.1", "scratch-l10n": "3.15.20230620032154", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 7a2c3449a7068fb62261abf9a860640f20e1300c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 06:22:01 +0000 Subject: [PATCH 10/22] fix(deps): update dependency scratch-l10n to v3.15.20230621032221 --- package-lock.json | 44 ++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5ed2b6bd..3585acd55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.1", - "scratch-l10n": "3.15.20230620032154", + "scratch-l10n": "3.15.20230621032221", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23520,6 +23520,24 @@ "scratch-l10n": "3.15.20230620032154" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230620032154", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", + "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", + "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": "2.0.1", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.1.tgz", @@ -23934,6 +23952,24 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.15.20230620032154", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", + "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", + "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": "2.0.0", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.0.tgz", @@ -24023,9 +24059,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230620032154", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", - "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", + "version": "3.15.20230621032221", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", + "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 0217c55ba..f01705caf 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.1", - "scratch-l10n": "3.15.20230620032154", + "scratch-l10n": "3.15.20230621032221", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From ab69a7a775566c3f2977f1fe3363c699c15633d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:24:29 +0000 Subject: [PATCH 11/22] fix(deps): update dependency scratch-gui to v2.0.4 --- package-lock.json | 64 +++++++++++------------------------------------ package.json | 2 +- 2 files changed, 15 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3585acd55..625bc5fd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.1", + "scratch-gui": "2.0.4", "scratch-l10n": "3.15.20230621032221", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230620212954", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230620212954.tgz", - "integrity": "sha512-B+SJPlZczFNK1kxcHwsaq1wLNZy3g/CEyqlI0bBTesAv6uwCmFEplsaq2sNtHwwCF7JQPJbjBy4Xj01KrQGlfA==", + "version": "0.2.0-prerelease.20230621061613", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230621061613.tgz", + "integrity": "sha512-sf++MFuQt2TsGsFLIv1VfQloZtIuPrnN8LPYXbUCP1vw6EmURLalkC1zExgITyXcIqOr4yGbILz0ehgVhzeLfg==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230620032154" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230620032154", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", - "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", - "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.20230621032221" } }, "node_modules/scratch-gui": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.1.tgz", - "integrity": "sha512-Nbeq8lAD32JeAUk4B6U7paBnFDmxeYRSfosKjxsWZ3QXsHpp9i018bZEh/lhljTu0IiYtQv0Kmtu+QCTi8o0mQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.4.tgz", + "integrity": "sha512-NJTq5Z8QggTaUR9nI4fk3nUwHMjDZ8W2AreGLd5qdYD/gPM7RcyetNMODNX487HUda01va5gRJabI0Fd8KCj4A==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,9 +23578,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230620212954", - "scratch-l10n": "3.15.20230620032154", - "scratch-paint": "2.0.0", + "scratch-blocks": "0.2.0-prerelease.20230621061613", + "scratch-l10n": "3.15.20230621032221", + "scratch-paint": "2.0.1", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23952,28 +23934,10 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.15.20230620032154", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230620032154.tgz", - "integrity": "sha512-fltlTjo19BO9EL7wCvZci3aFZzU5pt3GKESZ+HHJp7FuaW+gDGowYYVdKDi+rpi4x2hD6BsxXBEC7t3e4qYF8g==", - "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": "2.0.0", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.0.tgz", - "integrity": "sha512-z8Ie9AxkWycAI0SZ66NxvahOXBtQlFOEBtDi7wSn0Kn3ZC1J8mVxc/Wzq0JYDUpMUn8szjnFn4Wxw2FlW0y8eQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.1.tgz", + "integrity": "sha512-NFkHzdo3C7eC9rsbgnzkqQxIxEywRLmABm9Xka5AjCktFJ7EZNC5cNPK4voWCswF1vMNmtsTUuO0Cll0wDYkiA==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index f01705caf..d210403a1 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.1", + "scratch-gui": "2.0.4", "scratch-l10n": "3.15.20230621032221", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 42527c1f1e1a0c8e1e4461aef7220add3e5578b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 03:57:56 +0000 Subject: [PATCH 12/22] fix(deps): update dependency scratch-l10n to v3.15.20230622032210 --- package-lock.json | 44 ++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 625bc5fd1..7a6ae3478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.4", - "scratch-l10n": "3.15.20230621032221", + "scratch-l10n": "3.15.20230622032210", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23520,6 +23520,24 @@ "scratch-l10n": "3.15.20230621032221" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230621032221", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", + "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", + "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": "2.0.4", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.4.tgz", @@ -23934,6 +23952,24 @@ "symbol-observable": "^1.0.3" } }, + "node_modules/scratch-gui/node_modules/scratch-l10n": { + "version": "3.15.20230621032221", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", + "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", + "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": "2.0.1", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.1.tgz", @@ -24023,9 +24059,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230621032221", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", - "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", + "version": "3.15.20230622032210", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230622032210.tgz", + "integrity": "sha512-dvXEmJTms4+1fMSj8rUkbXyRLbZc7ggcCM/XFB2FA4iabCSZc+Hs6pKtIEfZrlyL1RnoH9fjiz2fCkjDS16T+Q==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index d210403a1..0d826cdf5 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.4", - "scratch-l10n": "3.15.20230621032221", + "scratch-l10n": "3.15.20230622032210", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From cbab0c6e5938f5eaaf96f84b947222669ab30467 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 17:04:35 +0000 Subject: [PATCH 13/22] fix(deps): update dependency scratch-gui to v2.0.6 --- package-lock.json | 44 +++++++++++++------------------------------- package.json | 2 +- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a6ae3478..4f33121cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.4", + "scratch-gui": "2.0.6", "scratch-l10n": "3.15.20230622032210", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230621061613", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230621061613.tgz", - "integrity": "sha512-sf++MFuQt2TsGsFLIv1VfQloZtIuPrnN8LPYXbUCP1vw6EmURLalkC1zExgITyXcIqOr4yGbILz0ehgVhzeLfg==", + "version": "0.2.0-prerelease.20230622090140", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230622090140.tgz", + "integrity": "sha512-ha8DbnYgCmj5sqhz3e+SPEImhU0AWkc34y/qr/K3xIncX6EfoOyeiwPKRPe6ReRt8d0ZX7V++W6czFjOrGm+kg==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230621032221" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230621032221", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", - "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", - "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.20230622032210" } }, "node_modules/scratch-gui": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.4.tgz", - "integrity": "sha512-NJTq5Z8QggTaUR9nI4fk3nUwHMjDZ8W2AreGLd5qdYD/gPM7RcyetNMODNX487HUda01va5gRJabI0Fd8KCj4A==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.6.tgz", + "integrity": "sha512-3R0ZOlv+w3VKlwJkxIK1uF8mRp4unVfjZwZX6F33Q6lmn9Yrxr+DGuy1CYbSCvEifAHXo9GMtiKNugiMvkXczA==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,9 +23578,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230621061613", + "scratch-blocks": "0.2.0-prerelease.20230622090140", "scratch-l10n": "3.15.20230621032221", - "scratch-paint": "2.0.1", + "scratch-paint": "2.0.2", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23971,9 +23953,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.1.tgz", - "integrity": "sha512-NFkHzdo3C7eC9rsbgnzkqQxIxEywRLmABm9Xka5AjCktFJ7EZNC5cNPK4voWCswF1vMNmtsTUuO0Cll0wDYkiA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.2.tgz", + "integrity": "sha512-UnruLi9uSEf97jxCHLbIJg2nhBBWbM0abs2pbK/evpev6/nVkIp1wLJk2+EKL004+w7wCYn2RK9RVc5oEDyT/A==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 0d826cdf5..9fa0bbba8 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.4", + "scratch-gui": "2.0.6", "scratch-l10n": "3.15.20230622032210", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From db6ae394e1d4713234d7d8fc0fb62e535ea7db01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 07:43:49 +0000 Subject: [PATCH 14/22] fix(deps): update dependency scratch-l10n to v3.15.20230623032228 --- package-lock.json | 26 ++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f33121cf..1c1509ed5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.6", - "scratch-l10n": "3.15.20230622032210", + "scratch-l10n": "3.15.20230623032228", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23520,6 +23520,24 @@ "scratch-l10n": "3.15.20230622032210" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230622032210", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230622032210.tgz", + "integrity": "sha512-dvXEmJTms4+1fMSj8rUkbXyRLbZc7ggcCM/XFB2FA4iabCSZc+Hs6pKtIEfZrlyL1RnoH9fjiz2fCkjDS16T+Q==", + "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": "2.0.6", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.6.tgz", @@ -24041,9 +24059,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230622032210", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230622032210.tgz", - "integrity": "sha512-dvXEmJTms4+1fMSj8rUkbXyRLbZc7ggcCM/XFB2FA4iabCSZc+Hs6pKtIEfZrlyL1RnoH9fjiz2fCkjDS16T+Q==", + "version": "3.15.20230623032228", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230623032228.tgz", + "integrity": "sha512-C3jI9Cc49eiiW1TjIC5xxJtrY5s3RMp7P+eqivzRS2yT5eQBaeJAaMB36rVyvjWAZZkuZzQYaiDAvzscgCz0sA==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 9fa0bbba8..4534bacd7 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.6", - "scratch-l10n": "3.15.20230622032210", + "scratch-l10n": "3.15.20230623032228", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 5174da661aab51e0be49e7ca3d9537218564bcd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 21:44:16 +0000 Subject: [PATCH 15/22] fix(deps): update dependency scratch-gui to v2.0.8 --- package-lock.json | 44 +++++++++++++------------------------------- package.json | 2 +- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c1509ed5..82c365701 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.6", + "scratch-gui": "2.0.8", "scratch-l10n": "3.15.20230623032228", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230622090140", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230622090140.tgz", - "integrity": "sha512-ha8DbnYgCmj5sqhz3e+SPEImhU0AWkc34y/qr/K3xIncX6EfoOyeiwPKRPe6ReRt8d0ZX7V++W6czFjOrGm+kg==", + "version": "0.2.0-prerelease.20230623102553", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230623102553.tgz", + "integrity": "sha512-V2GZFI19DADuAyVC8p4THJvGhW0N+JbO+UZvPzp8+XiD4m/WDNywv/1pTzyNPOc1nw0n9V4ZMZByArhuuo+GVQ==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230622032210" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230622032210", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230622032210.tgz", - "integrity": "sha512-dvXEmJTms4+1fMSj8rUkbXyRLbZc7ggcCM/XFB2FA4iabCSZc+Hs6pKtIEfZrlyL1RnoH9fjiz2fCkjDS16T+Q==", - "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.20230623032228" } }, "node_modules/scratch-gui": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.6.tgz", - "integrity": "sha512-3R0ZOlv+w3VKlwJkxIK1uF8mRp4unVfjZwZX6F33Q6lmn9Yrxr+DGuy1CYbSCvEifAHXo9GMtiKNugiMvkXczA==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.8.tgz", + "integrity": "sha512-1T3n9IPM1cfVieK18FYWL1zMp8SuirvQwaXeUpLgTXUHPGYEOZcH+HJQJo7DJAyJ2lGr4VfisGOW6m0/Zj9lIg==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,9 +23578,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230622090140", + "scratch-blocks": "0.2.0-prerelease.20230623102553", "scratch-l10n": "3.15.20230621032221", - "scratch-paint": "2.0.2", + "scratch-paint": "2.0.3", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23971,9 +23953,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.2.tgz", - "integrity": "sha512-UnruLi9uSEf97jxCHLbIJg2nhBBWbM0abs2pbK/evpev6/nVkIp1wLJk2+EKL004+w7wCYn2RK9RVc5oEDyT/A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.3.tgz", + "integrity": "sha512-19NeEeEjI1l5tbia6MwCtgQbHBmQIBUP3/WQujqMMxJpOgGXPSwpZRRQdvRsCyacO7TNuFti4RWRCkGIcxvMng==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 4534bacd7..fa87d1c4e 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.6", + "scratch-gui": "2.0.8", "scratch-l10n": "3.15.20230623032228", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 9fc0e66a46d91c2703138390baa7c2054532363c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 04:20:47 +0000 Subject: [PATCH 16/22] fix(deps): update dependency scratch-l10n to v3.15.20230626032211 --- package-lock.json | 26 ++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82c365701..ec5fad4d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.8", - "scratch-l10n": "3.15.20230623032228", + "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23520,6 +23520,24 @@ "scratch-l10n": "3.15.20230623032228" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230623032228", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230623032228.tgz", + "integrity": "sha512-C3jI9Cc49eiiW1TjIC5xxJtrY5s3RMp7P+eqivzRS2yT5eQBaeJAaMB36rVyvjWAZZkuZzQYaiDAvzscgCz0sA==", + "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": "2.0.8", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.8.tgz", @@ -24041,9 +24059,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230623032228", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230623032228.tgz", - "integrity": "sha512-C3jI9Cc49eiiW1TjIC5xxJtrY5s3RMp7P+eqivzRS2yT5eQBaeJAaMB36rVyvjWAZZkuZzQYaiDAvzscgCz0sA==", + "version": "3.15.20230626032211", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230626032211.tgz", + "integrity": "sha512-YeqBPZZRuP7lGqQpRrmI/PLjhv+GjF65m/YL8nUAEp4cnXnam2n1d5h0iHXOpqZ5FK97VZFxXTT2LVITmQB80Q==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index fa87d1c4e..ccfdd6e10 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.8", - "scratch-l10n": "3.15.20230623032228", + "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 88b9dbb9d0b017400409ea57776aa626d4fb77f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 11:31:00 +0000 Subject: [PATCH 17/22] fix(deps): update dependency scratch-gui to v2.0.9 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec5fad4d4..abe9d46b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.8", + "scratch-gui": "2.0.9", "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23539,9 +23539,9 @@ } }, "node_modules/scratch-gui": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.8.tgz", - "integrity": "sha512-1T3n9IPM1cfVieK18FYWL1zMp8SuirvQwaXeUpLgTXUHPGYEOZcH+HJQJo7DJAyJ2lGr4VfisGOW6m0/Zj9lIg==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.9.tgz", + "integrity": "sha512-/BzCS5V0UjSNg9fK7B7Y1X5+wOSo/urpeEc0anq9SZzOVhMxySHz9XiAh2ITjhoWbgm1c8RVJCwvKoGaQrGmxQ==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23598,7 +23598,7 @@ "scratch-audio": "0.1.0-prerelease.20221123180128", "scratch-blocks": "0.2.0-prerelease.20230623102553", "scratch-l10n": "3.15.20230621032221", - "scratch-paint": "2.0.3", + "scratch-paint": "2.0.4", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23971,9 +23971,9 @@ } }, "node_modules/scratch-gui/node_modules/scratch-paint": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.3.tgz", - "integrity": "sha512-19NeEeEjI1l5tbia6MwCtgQbHBmQIBUP3/WQujqMMxJpOgGXPSwpZRRQdvRsCyacO7TNuFti4RWRCkGIcxvMng==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.4.tgz", + "integrity": "sha512-P+aXOxCT2fJMvqoju3OsTPS72QSY9PEVKg85yqP8Sr6v8p6ljvHlZHi636NmC+YLCPgqKr+q453SEnKx+UxnMw==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index ccfdd6e10..39890cc3e 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.8", + "scratch-gui": "2.0.9", "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 8dc793ffa5604f9488d261b5c9237775d24f5a68 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 26 Jun 2023 09:12:05 -0700 Subject: [PATCH 18/22] refactor: consolidate CopyWebpackPlugin instances --- webpack.config.js | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index c31b9aa69..1945f061b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -179,41 +179,21 @@ module.exports = { new CopyWebpackPlugin({ patterns: [ {from: 'static'}, - {from: 'intl', to: 'js'} - ] - }), - new CopyWebpackPlugin({ - patterns: [ + {from: 'intl', to: 'js'}, { from: 'node_modules/scratch-gui/dist/static/blocks-media', to: 'static/blocks-media' - } - ] - }), - new CopyWebpackPlugin({ - patterns: [ + }, { from: 'node_modules/scratch-gui/dist/chunks', to: 'static/chunks' - } - ] - }), - new CopyWebpackPlugin({ - patterns: [ + }, { from: 'node_modules/scratch-gui/dist/extension-worker.js' - } - ] - }), - new CopyWebpackPlugin({ - patterns: [ + }, { from: 'node_modules/scratch-gui/dist/extension-worker.js.map' - } - ] - }), - new CopyWebpackPlugin({ - patterns: [ + }, { from: 'node_modules/scratch-gui/dist/static/assets', to: 'static/assets' From 5b43dc0be537ebe63eb54dd7e93bb9c46854befe Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 26 Jun 2023 09:12:46 -0700 Subject: [PATCH 19/22] fix: copy micro:bit hex file into the right place --- webpack.config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index 1945f061b..497cceda8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -197,6 +197,11 @@ module.exports = { { from: 'node_modules/scratch-gui/dist/static/assets', to: 'static/assets' + }, + { + from: 'node_modules/scratch-gui/dist/*.hex', + to: 'static', + flatten: true } ] }), From 60c4405744edf951511fc81f3ab6f2cf2b59b7bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 17:39:32 +0000 Subject: [PATCH 20/22] fix(deps): update dependency scratch-gui to v2.0.10 --- package-lock.json | 36 +++++++++--------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index abe9d46b9..6237bcfde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.9", + "scratch-gui": "2.0.10", "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230623102553", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230623102553.tgz", - "integrity": "sha512-V2GZFI19DADuAyVC8p4THJvGhW0N+JbO+UZvPzp8+XiD4m/WDNywv/1pTzyNPOc1nw0n9V4ZMZByArhuuo+GVQ==", + "version": "0.2.0-prerelease.20230626121902", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230626121902.tgz", + "integrity": "sha512-gHAuBMuf8BZeQ5+iKkZVJYSdapbdFIZQwv35qYaM9qeUIkIv4Y7h91lzEl9rjQi3Wz82t78k90FVCQPCBcflZA==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230623032228" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230623032228", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230623032228.tgz", - "integrity": "sha512-C3jI9Cc49eiiW1TjIC5xxJtrY5s3RMp7P+eqivzRS2yT5eQBaeJAaMB36rVyvjWAZZkuZzQYaiDAvzscgCz0sA==", - "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.20230626032211" } }, "node_modules/scratch-gui": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.9.tgz", - "integrity": "sha512-/BzCS5V0UjSNg9fK7B7Y1X5+wOSo/urpeEc0anq9SZzOVhMxySHz9XiAh2ITjhoWbgm1c8RVJCwvKoGaQrGmxQ==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.10.tgz", + "integrity": "sha512-9pfKK5Vnt9sZi/TkyDmzrBTRHZ4DDuCTWEJhJ9xbILCwPnGTplMKypEAHE0yG4LNxpONqml5zEUGSKm1/0DstA==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,7 +23578,7 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230623102553", + "scratch-blocks": "0.2.0-prerelease.20230626121902", "scratch-l10n": "3.15.20230621032221", "scratch-paint": "2.0.4", "scratch-render": "0.1.0-prerelease.20230318150639", diff --git a/package.json b/package.json index 39890cc3e..5959ae4fb 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.9", + "scratch-gui": "2.0.10", "scratch-l10n": "3.15.20230626032211", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From 5746644e3a2934191791d1663a68eb121e965c01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 04:40:53 +0000 Subject: [PATCH 21/22] fix(deps): update dependency scratch-l10n to v3.15.20230627032203 --- package-lock.json | 26 ++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6237bcfde..b02695f63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.10", - "scratch-l10n": "3.15.20230626032211", + "scratch-l10n": "3.15.20230627032203", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", @@ -23520,6 +23520,24 @@ "scratch-l10n": "3.15.20230626032211" } }, + "node_modules/scratch-blocks/node_modules/scratch-l10n": { + "version": "3.15.20230626032211", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230626032211.tgz", + "integrity": "sha512-YeqBPZZRuP7lGqQpRrmI/PLjhv+GjF65m/YL8nUAEp4cnXnam2n1d5h0iHXOpqZ5FK97VZFxXTT2LVITmQB80Q==", + "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": "2.0.10", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.10.tgz", @@ -24041,9 +24059,9 @@ } }, "node_modules/scratch-l10n": { - "version": "3.15.20230626032211", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230626032211.tgz", - "integrity": "sha512-YeqBPZZRuP7lGqQpRrmI/PLjhv+GjF65m/YL8nUAEp4cnXnam2n1d5h0iHXOpqZ5FK97VZFxXTT2LVITmQB80Q==", + "version": "3.15.20230627032203", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230627032203.tgz", + "integrity": "sha512-b2Rp4U11uXedYkH1T2zGOVI8w2itzpFBLOzXy209Wi+sTAQnLCCxNuy+OVRmKyFf6wHHSedDOUahGdSex1vfBA==", "dev": true, "dependencies": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 5959ae4fb..3f8a74b35 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "sass": "1.49.7", "sass-loader": "10.2.1", "scratch-gui": "2.0.10", - "scratch-l10n": "3.15.20230626032211", + "scratch-l10n": "3.15.20230627032203", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 351323ebdc513a77614cbbacb89e69e5650d9f79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 18:26:37 +0000 Subject: [PATCH 22/22] fix(deps): update dependency scratch-gui to v2.0.13 --- package-lock.json | 70 ++++++++++++----------------------------------- package.json | 2 +- 2 files changed, 18 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index b02695f63..7a8700f8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -101,7 +101,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.10", + "scratch-gui": "2.0.13", "scratch-l10n": "3.15.20230627032203", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -23509,39 +23509,21 @@ } }, "node_modules/scratch-blocks": { - "version": "0.2.0-prerelease.20230626121902", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230626121902.tgz", - "integrity": "sha512-gHAuBMuf8BZeQ5+iKkZVJYSdapbdFIZQwv35qYaM9qeUIkIv4Y7h91lzEl9rjQi3Wz82t78k90FVCQPCBcflZA==", + "version": "0.2.0-prerelease.20230627082243", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230627082243.tgz", + "integrity": "sha512-16APzKKSe7xxJ7p9sPO5u2Ffy6CPGhf6p4iugSnjkxqQEZHZAzlY84Uobuw8V37+tQG1bnmCCwbgaBbQUKU2gA==", "dev": true, "dependencies": { "exports-loader": "0.7.0", "google-closure-library": "20190301.0.0", "imports-loader": "0.8.0", - "scratch-l10n": "3.15.20230626032211" - } - }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.15.20230626032211", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230626032211.tgz", - "integrity": "sha512-YeqBPZZRuP7lGqQpRrmI/PLjhv+GjF65m/YL8nUAEp4cnXnam2n1d5h0iHXOpqZ5FK97VZFxXTT2LVITmQB80Q==", - "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.20230627032203" } }, "node_modules/scratch-gui": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.10.tgz", - "integrity": "sha512-9pfKK5Vnt9sZi/TkyDmzrBTRHZ4DDuCTWEJhJ9xbILCwPnGTplMKypEAHE0yG4LNxpONqml5zEUGSKm1/0DstA==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-2.0.13.tgz", + "integrity": "sha512-6OyhrDaGY6aUqgo8Z+IIQMGJcRWk21j5ORkJubww+YfXAWMTGZmTxYPW6PhOAc0XEsqOST4jyBX2EXV//cKcEA==", "dev": true, "dependencies": { "@microbit/microbit-universal-hex": "0.2.2", @@ -23596,9 +23578,9 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20221123180128", - "scratch-blocks": "0.2.0-prerelease.20230626121902", - "scratch-l10n": "3.15.20230621032221", - "scratch-paint": "2.0.4", + "scratch-blocks": "0.2.0-prerelease.20230627082243", + "scratch-l10n": "3.15.20230627032203", + "scratch-paint": "2.0.5", "scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-storage": "2.2.1", @@ -23952,28 +23934,10 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.15.20230621032221", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230621032221.tgz", - "integrity": "sha512-0Q7LcYoJFRIf2BLSfoU8534E8mZm8X6wclTOOyzL/FXO6HnbvTtt4ZM4QVTWQ505awGZH5iVf6ASGEFhONp5ew==", - "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": "2.0.4", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.4.tgz", - "integrity": "sha512-P+aXOxCT2fJMvqoju3OsTPS72QSY9PEVKg85yqP8Sr6v8p6ljvHlZHi636NmC+YLCPgqKr+q453SEnKx+UxnMw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.0.5.tgz", + "integrity": "sha512-BLphIZ3e09Q90ISJltz+UM8+r3SazH2zyrI96OK7Z0Zw63su0dNO0vgUqgGA60T37wgV7VjBy3knYDIOb6WxJw==", "dev": true, "dependencies": { "@scratch/paper": "0.11.20200728195508", @@ -24040,9 +24004,9 @@ } }, "node_modules/scratch-gui/node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", "dev": true, "peer": true }, diff --git a/package.json b/package.json index 3f8a74b35..231eae5ee 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "2.0.10", + "scratch-gui": "2.0.13", "scratch-l10n": "3.15.20230627032203", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0",