From ac670f7749836083983eebc516efa2c4010250b7 Mon Sep 17 00:00:00 2001 From: Joel Gritter Date: Wed, 17 Nov 2021 06:39:29 -0500 Subject: [PATCH 001/134] fix(gh-5989): adjust comment load batch size - adjust the studio reply comment load batch size to 25 instead of 20 --- src/redux/studio-comment-actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redux/studio-comment-actions.js b/src/redux/studio-comment-actions.js index e652893aa..f9758d99b 100644 --- a/src/redux/studio-comment-actions.js +++ b/src/redux/studio-comment-actions.js @@ -3,7 +3,7 @@ const eachLimit = require('async/eachLimit'); const api = require('../lib/api'); const log = require('../lib/log'); -const COMMENT_LIMIT = 20; +const COMMENT_LIMIT = 25; const { addNewComment, From ebb975d94890384ee256bb56f30c3f4a59fb61c2 Mon Sep 17 00:00:00 2001 From: Joel Gritter Date: Wed, 17 Nov 2021 06:50:21 -0500 Subject: [PATCH 002/134] fix(gh-5989): use separate limit values - use separate COMMENT_LIMIT and REPLY_LIMIT values - use 25 as REPLY_LIMIT value - restore original COMMENT_LIMIT value of 20 --- src/redux/studio-comment-actions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/redux/studio-comment-actions.js b/src/redux/studio-comment-actions.js index f9758d99b..c22896012 100644 --- a/src/redux/studio-comment-actions.js +++ b/src/redux/studio-comment-actions.js @@ -3,7 +3,8 @@ const eachLimit = require('async/eachLimit'); const api = require('../lib/api'); const log = require('../lib/log'); -const COMMENT_LIMIT = 25; +const COMMENT_LIMIT = 20; +const REPLY_LIMIT = 25; const { addNewComment, @@ -44,7 +45,7 @@ const getReplies = (commentIds, offset) => ((dispatch, getState) => { api({ uri: `${isAdmin ? '/admin' : ''}/studios/${studioId}/comments/${parentId}/replies`, authentication: token ? token : null, - params: {offset: offset || 0, limit: COMMENT_LIMIT} + params: {offset: offset || 0, limit: REPLY_LIMIT} }, (err, body, res) => { if (err) { return callback(`Error fetching comment replies: ${err}`); From e1b79b4fea099c440d44f4e1799a500fdd5cd75d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 18 Nov 2021 03:59:33 +0000 Subject: [PATCH 003/134] chore(deps): update dependency scratch-l10n to v3.14.20211118031553 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c665b4ff0..0a362f7a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211117031600", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211117031600.tgz", + "integrity": "sha512-ekVIL9BLg6ZISYYbd3ID35rg0NcCyYvrrmgtIwUl0y7bgc+DSFBaZZoQN0rBahIM6tsEDpbc278nMDHKMhs0VA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211117031600", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211117031600.tgz", - "integrity": "sha512-ekVIL9BLg6ZISYYbd3ID35rg0NcCyYvrrmgtIwUl0y7bgc+DSFBaZZoQN0rBahIM6tsEDpbc278nMDHKMhs0VA==", + "version": "3.14.20211118031553", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211118031553.tgz", + "integrity": "sha512-KMV8L/15u/ge3UXoNi7+njcAsloDLdN0Gw9OUETD7tvKfqN86pcwlrrD7rjrMj4sOokI9o2e5LpH/RvoeisCwQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 79837d649..9f78760fe 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211117061326", - "scratch-l10n": "3.14.20211117031600", + "scratch-l10n": "3.14.20211118031553", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 259c71f5f3bac59635fb3cb3b448c2e38d36991b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 18 Nov 2021 09:54:02 +0000 Subject: [PATCH 004/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211118091149 --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a362f7a2..bc8d075c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211117061326", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211117061326.tgz", - "integrity": "sha512-+JF0VztQWTtbVFnsRWpINXCU0HpbmV79or80Ho3akOvYkrJtGdMZt1lyEqYUflBAGRrLthZsefl/wiTLay6wfw==", + "version": "0.1.0-prerelease.20211118091149", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211118091149.tgz", + "integrity": "sha512-S9Iow5Cg7I/AuYiR7jtRx71fGwYpKCJj+xnBzZbFm0nAdUC5c6zNE/qsc/q7FdPc/0xTY3RNlE63zL7tqfiJ7A==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,13 +20632,13 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211117031600", + "scratch-l10n": "3.14.20211118031553", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211110140254", + "scratch-vm": "0.2.0-prerelease.20211118061701", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.900", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.900.tgz", - "integrity": "sha512-SuXbQD8D4EjsaBaJJxySHbC+zq8JrFfxtb4GIr4E9n1BcROyMcRrJCYQNpJ9N+Wjf5mFp7Wp0OHykd14JNEzzQ==", + "version": "1.3.901", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.901.tgz", + "integrity": "sha512-ToJdV2vzwT2jeAsw8zIggTFllJ4Kxvwghk39AhJEHHlIxor10wsFI3wo69p8nFc0s/ATWBqugPv/k3nW4Y9Mww==", "dev": true }, "has-flag": { @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211117031600", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211117031600.tgz", - "integrity": "sha512-ekVIL9BLg6ZISYYbd3ID35rg0NcCyYvrrmgtIwUl0y7bgc+DSFBaZZoQN0rBahIM6tsEDpbc278nMDHKMhs0VA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21297,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211110140254", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211110140254.tgz", - "integrity": "sha512-6gNNDXJg3WagT/tA7bjLJcQeDqhvu/FZVdIAlS3A96C/6sT3jiWljDeRpzl/EbJWAxwzbQ6CBiZ3ZDf9eLgQ2Q==", + "version": "0.2.0-prerelease.20211118061701", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211118061701.tgz", + "integrity": "sha512-8zzhq0GwH4ZL4UCzgsvs5MhwrnRtBxxsWmOEAtKRDkoHfsIffHotLZI4l73YF8ikmwzck00kWE8If2w61DeJAw==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 9f78760fe..ef0d20259 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211117061326", + "scratch-gui": "0.1.0-prerelease.20211118091149", "scratch-l10n": "3.14.20211118031553", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 8630f5d0da0a620244c570757623187b6098b618 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 19 Nov 2021 03:27:42 +0000 Subject: [PATCH 005/134] chore(deps): update dependency scratch-l10n to v3.14.20211119031548 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc8d075c4..815b87d29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211118031553", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211118031553.tgz", + "integrity": "sha512-KMV8L/15u/ge3UXoNi7+njcAsloDLdN0Gw9OUETD7tvKfqN86pcwlrrD7rjrMj4sOokI9o2e5LpH/RvoeisCwQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211118031553", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211118031553.tgz", - "integrity": "sha512-KMV8L/15u/ge3UXoNi7+njcAsloDLdN0Gw9OUETD7tvKfqN86pcwlrrD7rjrMj4sOokI9o2e5LpH/RvoeisCwQ==", + "version": "3.14.20211119031548", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211119031548.tgz", + "integrity": "sha512-UnUJOBBRjgkfUVn9alhYqyEodCbbYywzSGr5v/FY87nH1WDSQoyPAcJep8powZUny62hgi9ZqEaD0mGqVX7ubA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index ef0d20259..10162460f 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211118091149", - "scratch-l10n": "3.14.20211118031553", + "scratch-l10n": "3.14.20211119031548", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 8f6006ede063ed660fe4d8e48815808a1a1a3018 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 19 Nov 2021 11:00:23 +0000 Subject: [PATCH 006/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211119084451 --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 815b87d29..60ab04517 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211118091149", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211118091149.tgz", - "integrity": "sha512-S9Iow5Cg7I/AuYiR7jtRx71fGwYpKCJj+xnBzZbFm0nAdUC5c6zNE/qsc/q7FdPc/0xTY3RNlE63zL7tqfiJ7A==", + "version": "0.1.0-prerelease.20211119084451", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211119084451.tgz", + "integrity": "sha512-pVEK3u98/rvTDh71doismaqYMnWiZH1dXFiatSvzK7N8qh/eVU/Lol0vtDoZG4P7P4CEn7mXj7k0hqHRg/2MKg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,13 +20632,13 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211118031553", + "scratch-l10n": "3.14.20211119031548", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211118061701", + "scratch-vm": "0.2.0-prerelease.20211119052147", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.901", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.901.tgz", - "integrity": "sha512-ToJdV2vzwT2jeAsw8zIggTFllJ4Kxvwghk39AhJEHHlIxor10wsFI3wo69p8nFc0s/ATWBqugPv/k3nW4Y9Mww==", + "version": "1.3.903", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.903.tgz", + "integrity": "sha512-+PnYAyniRRTkNq56cqYDLq9LyklZYk0hqoDy9GpcU11H5QjRmFZVDbxtgHUMK/YzdNTcn1XWP5gb+hFlSCr20g==", "dev": true }, "has-flag": { @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211118031553", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211118031553.tgz", - "integrity": "sha512-KMV8L/15u/ge3UXoNi7+njcAsloDLdN0Gw9OUETD7tvKfqN86pcwlrrD7rjrMj4sOokI9o2e5LpH/RvoeisCwQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21297,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211118061701", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211118061701.tgz", - "integrity": "sha512-8zzhq0GwH4ZL4UCzgsvs5MhwrnRtBxxsWmOEAtKRDkoHfsIffHotLZI4l73YF8ikmwzck00kWE8If2w61DeJAw==", + "version": "0.2.0-prerelease.20211119052147", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211119052147.tgz", + "integrity": "sha512-xlOoW0LR9PQ2KeT1fJidYy2CDBYJ95tcAlWvkU1vVNoX2ZFiEAJCfmBOM7Ib+21iOpjz1c0hbz63ZvK1GSd9dA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 10162460f..1ed1952db 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211118091149", + "scratch-gui": "0.1.0-prerelease.20211119084451", "scratch-l10n": "3.14.20211119031548", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From ed8606d3f22f36b5d712ccddc07ad8926ace7acc Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:31:03 -0500 Subject: [PATCH 007/134] Update Chromedriver to version 96 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7b139a6a..a261f430a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4655,9 +4655,9 @@ } }, "chromedriver": { - "version": "95.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-95.0.0.tgz", - "integrity": "sha512-HwSg7S0ZZYsHTjULwxFHrrUqEpz1+ljDudJM3eOquvqD5QKnR5pSe/GlBTY9UU2tVFRYz8bEHYC4Y8qxciQiLQ==", + "version": "96.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-96.0.0.tgz", + "integrity": "sha512-4g6Hn5RHGsbaBmOrJbDlz/hdVPOc22eRsbvoAAMqkZxR2NJCcddHzCw2FAQeW8lX/C7xWVz3nyDsKX3fE9lIIw==", "dev": true, "requires": { "@testim/chrome-version": "^1.0.7", diff --git a/package.json b/package.json index c081d179f..9d56df94c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "babel-preset-es2015": "6.22.0", "babel-preset-react": "6.22.0", "bowser": "1.9.4", - "chromedriver": "95.0.0", + "chromedriver": "96.0.0", "classnames": "2.2.5", "cookie": "0.4.1", "copy-webpack-plugin": "4.6.0", From 6520a5f4341c4b8833812a1255edf40e05f021ce Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:38:23 -0500 Subject: [PATCH 008/134] Integration tests use updated Sign In function from Selenium Helpers --- test/integration/comments.test.js | 4 ++-- test/integration/my-stuff.test.js | 14 ++++---------- test/integration/selenium-helpers.js | 8 +++----- test/integration/sign-in-and-out.test.js | 2 +- test/integration/studios-page.test.js | 10 +++++----- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/test/integration/comments.test.js b/test/integration/comments.test.js index 81b9d5626..03f35f71c 100644 --- a/test/integration/comments.test.js +++ b/test/integration/comments.test.js @@ -61,7 +61,7 @@ describe('comment tests', async () => { describe('leave comments', async () => { beforeAll(async () => { - await signIn(username1, password, driver); + await signIn(username1, password); await findByXpath('//span[contains(@class, "profile-name")]'); }); @@ -137,7 +137,7 @@ describe('comment tests', async () => { describe('second user tests', async () => { beforeAll(async () => { - await signIn(username2, password, driver); + await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); }); diff --git a/test/integration/my-stuff.test.js b/test/integration/my-stuff.test.js index 1bc650dd1..035a363b8 100644 --- a/test/integration/my-stuff.test.js +++ b/test/integration/my-stuff.test.js @@ -3,10 +3,11 @@ const SeleniumHelper = require('./selenium-helpers.js'); const { + buildDriver, clickText, - findByXpath, clickXpath, - buildDriver + findByXpath, + signIn } = new SeleniumHelper(); let username = process.env.SMOKE_USERNAME + '1'; @@ -30,14 +31,7 @@ describe('www-integration my_stuff', () => { driver = await buildDriver('www-integration my_stuff'); await driver.get(rootUrl); await driver.sleep(1000); - await clickXpath('//li[@class="link right login-item"]/a'); - let name = await findByXpath('//input[@id="frc-username-1088"]'); - await name.sendKeys(username); - let word = await findByXpath('//input[@id="frc-password-1088"]'); - await word.sendKeys(password); - await driver.sleep(500); - await clickXpath('//button[contains(@class, "button") and ' + - 'contains(@class, "submit-button") and contains(@class, "white")]'); + await signIn(username, password); await findByXpath('//span[contains(@class, "profile-name")]'); }); diff --git a/test/integration/selenium-helpers.js b/test/integration/selenium-helpers.js index fbefe1799..9d94f8698 100644 --- a/test/integration/selenium-helpers.js +++ b/test/integration/selenium-helpers.js @@ -151,15 +151,13 @@ class SeleniumHelper { } // must be used on a www page - async signIn (username, password, driver) { + async signIn (username, password) { await this.clickXpath('//li[@class="link right login-item"]/a'); let name = await this.findByXpath('//input[@id="frc-username-1088"]'); await name.sendKeys(username); let word = await this.findByXpath('//input[@id="frc-password-1088"]'); - await word.sendKeys(password); - await driver.sleep(500); - await this.clickXpath('//button[contains(@class, "button") and ' + - 'contains(@class, "submit-button") and contains(@class, "white")]'); + await word.sendKeys(password + this.getKey('ENTER')); + await this.findByXpath('//span[contains(@class, "profile-name")]'); } urlMatches (regex) { diff --git a/test/integration/sign-in-and-out.test.js b/test/integration/sign-in-and-out.test.js index 34534d052..8d8ce2129 100644 --- a/test/integration/sign-in-and-out.test.js +++ b/test/integration/sign-in-and-out.test.js @@ -77,7 +77,7 @@ describe('www-integration sign-in-and-out', () => { describe('sign out', () => { beforeEach(async () => { await driver.get(wwwURL); - await signIn(username, password, driver); + await signIn(username, password); await driver.sleep(500); }); diff --git a/test/integration/studios-page.test.js b/test/integration/studios-page.test.js index 2ca9586e2..9fb1d8da6 100644 --- a/test/integration/studios-page.test.js +++ b/test/integration/studios-page.test.js @@ -78,7 +78,7 @@ describe('studio management', () => { await driver.get(rootUrl); // create a studio for tests - await signIn(username2, password, driver); + await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); await driver.get(rateLimitCheck); await driver.get(myStuffURL); @@ -99,7 +99,7 @@ describe('studio management', () => { test('invite a curator', async () => { // sign in as user2 - await signIn(username2, password, driver); + await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); // invite user3 to curate @@ -114,7 +114,7 @@ describe('studio management', () => { test('accept curator invite', async () => { // Sign in user3 - await signIn(username3, password, driver); + await signIn(username3, password); await findByXpath('//span[contains(@class, "profile-name")]'); // accept the curator invite @@ -126,7 +126,7 @@ describe('studio management', () => { test('promote to manager', async () => { // sign in as user2 - await signIn(username2, password, driver); + await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); // for some reason the user isn't showing up without reloading the page await driver.get(curatorTab); @@ -150,7 +150,7 @@ describe('studio management', () => { test('transfer studio host', async () => { // sign in as user2 - await signIn(username2, password, driver); + await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); // for some reason the user isn't showing up without reloading the page await driver.get(curatorTab); From ec60e53be2edf45580a384de5d3bca10afb832e7 Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:43:02 -0500 Subject: [PATCH 009/134] Integration tests sign in by sending enter key --- test/integration/sign-in-and-out.test.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/test/integration/sign-in-and-out.test.js b/test/integration/sign-in-and-out.test.js index 8d8ce2129..d93db876a 100644 --- a/test/integration/sign-in-and-out.test.js +++ b/test/integration/sign-in-and-out.test.js @@ -3,11 +3,12 @@ const SeleniumHelper = require('./selenium-helpers.js'); const { - clickText, - findByXpath, - clickXpath, - clickButton, buildDriver, + clickButton, + clickText, + clickXpath, + findByXpath, + getKey, signIn, waitUntilVisible } = new SeleniumHelper(); @@ -108,8 +109,7 @@ describe('www-integration sign-in-and-out', () => { await driver.get(scratchr2url); await clickXpath('//li[@class="sign-in dropdown"]/span'); let name = await findByXpath('//input[@id="login_dropdown_username"]'); - await name.sendKeys(nonsenseUsername); - await clickButton('Sign in'); + await name.sendKeys(nonsenseUsername + getKey('ENTER')); // find error let error = await findByXpath('//form[@id="login"]//div[@class="error"]'); @@ -126,8 +126,7 @@ describe('www-integration sign-in-and-out', () => { let name = await findByXpath('//input[@id="login_dropdown_username"]'); await name.sendKeys(nonsenseUsername); let word = await findByXpath('//input[@name="password"]'); - await word.sendKeys(password); - await clickButton('Sign in'); + await word.sendKeys(password + getKey('ENTER')); // find error let error = await findByXpath('//form[@id="login"]//div[@class="error"]'); @@ -145,8 +144,7 @@ describe('www-integration sign-in-and-out', () => { let name = await findByXpath('//input[@id="login_dropdown_username"]'); await name.sendKeys(username); let word = await findByXpath('//input[@name="password"]'); - await word.sendKeys(nonsensePassword); - await clickButton('Sign in'); + await word.sendKeys(nonsensePassword + getKey('ENTER')); // find error let error = await findByXpath('//form[@id="login"]//div[@class="error"]'); From d899d72ef4d0bebf6920bdd3928693c6eabd09fd Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:44:43 -0500 Subject: [PATCH 010/134] integration tests use waitUntilVisible in more places --- test/integration/project-page.test.js | 7 ++++--- test/integration/sign-in-and-out.test.js | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/integration/project-page.test.js b/test/integration/project-page.test.js index ba70d9631..03ba37811 100644 --- a/test/integration/project-page.test.js +++ b/test/integration/project-page.test.js @@ -3,9 +3,10 @@ const SeleniumHelper = require('./selenium-helpers.js'); const { - findByXpath, + buildDriver, clickXpath, - buildDriver + findByXpath, + waitUntilVisible } = new SeleniumHelper(); let remote = process.env.SMOKE_REMOTE || false; @@ -31,7 +32,7 @@ describe('www-integration project-page signed out', () => { beforeEach(async () => { await driver.get(projectUrl); let gfOverlay = await findByXpath('//div[@class="stage-wrapper_stage-wrapper_2bejr box_box_2jjDp"]'); - await gfOverlay.isDisplayed(); + await waitUntilVisible(gfOverlay, driver); }); afterAll(async () => await driver.quit()); diff --git a/test/integration/sign-in-and-out.test.js b/test/integration/sign-in-and-out.test.js index d93db876a..648be82ac 100644 --- a/test/integration/sign-in-and-out.test.js +++ b/test/integration/sign-in-and-out.test.js @@ -113,6 +113,7 @@ describe('www-integration sign-in-and-out', () => { // find error let error = await findByXpath('//form[@id="login"]//div[@class="error"]'); + await waitUntilVisible(error, driver); let errorText = await error.getText(); await expect(errorText).toEqual('This field is required.'); }); From a3acec48fdeb5105e26c7e086732bbd48ea3f336 Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:45:44 -0500 Subject: [PATCH 011/134] Integration tests fix awaits --- test/integration/my-stuff.test.js | 2 +- test/integration/studios-page.test.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/my-stuff.test.js b/test/integration/my-stuff.test.js index 035a363b8..b3e4775f9 100644 --- a/test/integration/my-stuff.test.js +++ b/test/integration/my-stuff.test.js @@ -99,7 +99,7 @@ describe('www-integration my_stuff', () => { await clickXpath('//form[@id="new_studio"]/button[@type="submit"]'); let tabs = await findByXpath('//div[@class="studio-tabs"]'); let tabsVisible = await tabs.isDisplayed(); - expect(tabsVisible).toBe(true); + await expect(tabsVisible).toBe(true); }); test('New studio rate limited to five', async () =>{ diff --git a/test/integration/studios-page.test.js b/test/integration/studios-page.test.js index 9fb1d8da6..7981afe71 100644 --- a/test/integration/studios-page.test.js +++ b/test/integration/studios-page.test.js @@ -85,7 +85,7 @@ describe('studio management', () => { await clickXpath('//form[@id="new_studio"]/button[@type="submit"]'); await findByXpath('//div[@class="studio-tabs"]'); promoteStudioURL = await driver.getCurrentUrl(); - curatorTab = promoteStudioURL + 'curators'; + curatorTab = await promoteStudioURL + 'curators'; }); beforeEach(async () => { @@ -108,7 +108,7 @@ describe('studio management', () => { await clickXpath('//div[@class="studio-adder-row"]/button'); let inviteAlert = await findByXpath('//div[@class="alert-msg"]'); // the confirm alert let alertText = await inviteAlert.getText(); - let successText = `Curator invite sent to "${username3}"`; + let successText = await `Curator invite sent to "${username3}"`; await expect(alertText).toMatch(successText); }); @@ -132,9 +132,9 @@ describe('studio management', () => { await driver.get(curatorTab); // promote user3 - let user3href = '/users/' + username3; + let user3href = await '/users/' + username3; // click kebab menu on the user tile - let kebabMenuXpath = `//a[@href = "${user3href}"]/` + + let kebabMenuXpath = await `//a[@href = "${user3href}"]/` + 'following-sibling::div[@class="overflow-menu-container"]'; await clickXpath(kebabMenuXpath + '/button[@class="overflow-menu-trigger"]'); // click promote @@ -156,9 +156,9 @@ describe('studio management', () => { await driver.get(curatorTab); // open kebab menu - let user2href = '/users/' + username2; + let user2href = await '/users/' + username2; // click kebab menu on the user tile - let kebabMenuXpath = `//a[@href = "${user2href}"]/` + + let kebabMenuXpath = await `//a[@href = "${user2href}"]/` + 'following-sibling::div[@class="overflow-menu-container"]'; await clickXpath(kebabMenuXpath + '/button[@class="overflow-menu-trigger"]'); From 391c0070ba94928c2e7a98a8441f9ef21ccf5bdb Mon Sep 17 00:00:00 2001 From: BryceLTaylor Date: Fri, 19 Nov 2021 09:52:41 -0500 Subject: [PATCH 012/134] add wait to studios int. test to avoid flakyness --- test/integration/studios-page.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/studios-page.test.js b/test/integration/studios-page.test.js index 7981afe71..a477151a9 100644 --- a/test/integration/studios-page.test.js +++ b/test/integration/studios-page.test.js @@ -128,7 +128,8 @@ describe('studio management', () => { // sign in as user2 await signIn(username2, password); await findByXpath('//span[contains(@class, "profile-name")]'); - // for some reason the user isn't showing up without reloading the page + // for some reason the user isn't showing up without waiting and reloading the page + await driver.sleep(2000); await driver.get(curatorTab); // promote user3 From b84dae9b31cc65a3d9e2f52997a48254576d5f05 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Nov 2021 04:13:51 +0000 Subject: [PATCH 013/134] chore(deps): update dependency scratch-l10n to v3.14.20211120031708 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60ab04517..39ef25c8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211119031548", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211119031548.tgz", + "integrity": "sha512-UnUJOBBRjgkfUVn9alhYqyEodCbbYywzSGr5v/FY87nH1WDSQoyPAcJep8powZUny62hgi9ZqEaD0mGqVX7ubA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211119031548", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211119031548.tgz", - "integrity": "sha512-UnUJOBBRjgkfUVn9alhYqyEodCbbYywzSGr5v/FY87nH1WDSQoyPAcJep8powZUny62hgi9ZqEaD0mGqVX7ubA==", + "version": "3.14.20211120031708", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211120031708.tgz", + "integrity": "sha512-7X8/bkd2ubkhCx+GUfbe0r+Xpod9QWXjerhzsAupQv8sV048kppOzD5ug+/1kih+HDRbml5Kps9D7axT+8JZeg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 1ed1952db..cbbb2f7e6 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211119084451", - "scratch-l10n": "3.14.20211119031548", + "scratch-l10n": "3.14.20211120031708", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 2b5f99b789a3990cc6eded261e7fd4eb2544427d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Nov 2021 10:18:34 +0000 Subject: [PATCH 014/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211120090504 --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39ef25c8d..a9eb53600 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211119084451", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211119084451.tgz", - "integrity": "sha512-pVEK3u98/rvTDh71doismaqYMnWiZH1dXFiatSvzK7N8qh/eVU/Lol0vtDoZG4P7P4CEn7mXj7k0hqHRg/2MKg==", + "version": "0.1.0-prerelease.20211120090504", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211120090504.tgz", + "integrity": "sha512-1h2HJ0FS7hCQ9offal6k7caMY0LEEc2cLCYuUJL6ShvKN657PNSbMawkpoEDW1LDh7ixrnhTUiYVVO9M63W3eg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,13 +20632,13 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211119031548", + "scratch-l10n": "3.14.20211120031708", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211119052147", + "scratch-vm": "0.2.0-prerelease.20211120080427", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.903", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.903.tgz", - "integrity": "sha512-+PnYAyniRRTkNq56cqYDLq9LyklZYk0hqoDy9GpcU11H5QjRmFZVDbxtgHUMK/YzdNTcn1XWP5gb+hFlSCr20g==", + "version": "1.3.904", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz", + "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==", "dev": true }, "has-flag": { @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211119031548", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211119031548.tgz", - "integrity": "sha512-UnUJOBBRjgkfUVn9alhYqyEodCbbYywzSGr5v/FY87nH1WDSQoyPAcJep8powZUny62hgi9ZqEaD0mGqVX7ubA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21297,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211119052147", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211119052147.tgz", - "integrity": "sha512-xlOoW0LR9PQ2KeT1fJidYy2CDBYJ95tcAlWvkU1vVNoX2ZFiEAJCfmBOM7Ib+21iOpjz1c0hbz63ZvK1GSd9dA==", + "version": "0.2.0-prerelease.20211120080427", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211120080427.tgz", + "integrity": "sha512-xuTkcN+zCAhIkCQvhgs2HLL3f51gb/xiEk/W3yfMKqKU/pLywKXzb9NF9mU7KFLfZrf7XtuQu7Ijg1i/P7SIuA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index cbbb2f7e6..0dc8a06f6 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211119084451", + "scratch-gui": "0.1.0-prerelease.20211120090504", "scratch-l10n": "3.14.20211120031708", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From f012721e4c8489c50b4d3e248dba46e05e8b75bb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Nov 2021 04:05:20 +0000 Subject: [PATCH 015/134] chore(deps): update dependency scratch-l10n to v3.14.20211121031602 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9eb53600..50374a228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211120031708", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211120031708.tgz", + "integrity": "sha512-7X8/bkd2ubkhCx+GUfbe0r+Xpod9QWXjerhzsAupQv8sV048kppOzD5ug+/1kih+HDRbml5Kps9D7axT+8JZeg==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211120031708", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211120031708.tgz", - "integrity": "sha512-7X8/bkd2ubkhCx+GUfbe0r+Xpod9QWXjerhzsAupQv8sV048kppOzD5ug+/1kih+HDRbml5Kps9D7axT+8JZeg==", + "version": "3.14.20211121031602", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211121031602.tgz", + "integrity": "sha512-m7WSpwu7niWTe2Db5l4IYL5rVfSysOgtWlBaRLoLq04wZBUhkMYrVyL/lMFcRryWeOrgJwwOL37mWjv/D/sBPA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 0dc8a06f6..10b75e3a9 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211120090504", - "scratch-l10n": "3.14.20211120031708", + "scratch-l10n": "3.14.20211121031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From b0e010958a9ab304c7e45d12b7c2c1b17146fc38 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Nov 2021 11:35:04 +0000 Subject: [PATCH 016/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211121092537 --- package-lock.json | 20 ++++---------------- package.json | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50374a228..3708e94ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211120090504", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211120090504.tgz", - "integrity": "sha512-1h2HJ0FS7hCQ9offal6k7caMY0LEEc2cLCYuUJL6ShvKN657PNSbMawkpoEDW1LDh7ixrnhTUiYVVO9M63W3eg==", + "version": "0.1.0-prerelease.20211121092537", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211121092537.tgz", + "integrity": "sha512-SHO2nCcGo8Tw2kRPSylWrtmGDADuma+rze33AsHR86kMIgAcweZntrGeVLtkk1lbIoWw11o1JgJvbyr9QlLFtA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,7 +20632,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211120031708", + "scratch-l10n": "3.14.20211121031602", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211120031708", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211120031708.tgz", - "integrity": "sha512-7X8/bkd2ubkhCx+GUfbe0r+Xpod9QWXjerhzsAupQv8sV048kppOzD5ug+/1kih+HDRbml5Kps9D7axT+8JZeg==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 10b75e3a9..df3b30fd3 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211120090504", + "scratch-gui": "0.1.0-prerelease.20211121092537", "scratch-l10n": "3.14.20211121031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 1928a6b08105eae53423e535df0e75b1f0f5fa7a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Nov 2021 17:42:02 +0000 Subject: [PATCH 017/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211121150504 --- 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 3708e94ee..a72db82c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211121092537", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211121092537.tgz", - "integrity": "sha512-SHO2nCcGo8Tw2kRPSylWrtmGDADuma+rze33AsHR86kMIgAcweZntrGeVLtkk1lbIoWw11o1JgJvbyr9QlLFtA==", + "version": "0.1.0-prerelease.20211121150504", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211121150504.tgz", + "integrity": "sha512-2hBOnGBJerlzZ6IdtNnp9AA30wmUZusSRfuNBzbrMbIRXZC5WdR+nom5pLWl2GCI4ZnfvTQlgCQrgA5hpdMlNw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20638,7 +20638,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211120080427", + "scratch-vm": "0.2.0-prerelease.20211121093847", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21285,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211120080427", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211120080427.tgz", - "integrity": "sha512-xuTkcN+zCAhIkCQvhgs2HLL3f51gb/xiEk/W3yfMKqKU/pLywKXzb9NF9mU7KFLfZrf7XtuQu7Ijg1i/P7SIuA==", + "version": "0.2.0-prerelease.20211121093847", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211121093847.tgz", + "integrity": "sha512-IQUBwd3isSmMrZFLSFt7zGgSxitzdelEjH6UQB2SbFyVgLOVz46YRJKAQqsYcN5SBdPU2oTS3FPVPE1E7OkoDA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index df3b30fd3..ced980250 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211121092537", + "scratch-gui": "0.1.0-prerelease.20211121150504", "scratch-l10n": "3.14.20211121031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From c28755ecdb7273d5ebcf6613ce7bc67dcb08101e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 22 Nov 2021 03:24:17 +0000 Subject: [PATCH 018/134] chore(deps): update dependency scratch-l10n to v3.14.20211122031614 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a72db82c3..967d5916d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211121031602", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211121031602.tgz", + "integrity": "sha512-m7WSpwu7niWTe2Db5l4IYL5rVfSysOgtWlBaRLoLq04wZBUhkMYrVyL/lMFcRryWeOrgJwwOL37mWjv/D/sBPA==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211121031602", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211121031602.tgz", - "integrity": "sha512-m7WSpwu7niWTe2Db5l4IYL5rVfSysOgtWlBaRLoLq04wZBUhkMYrVyL/lMFcRryWeOrgJwwOL37mWjv/D/sBPA==", + "version": "3.14.20211122031614", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211122031614.tgz", + "integrity": "sha512-TgJXCIkBS+hjOsy9pXUQaBUxtEt0An192Ako5no/hi+vchSlT7Zxo3GdU3c90ft8iNlDposkpSSeLGRVzOsDbQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index ced980250..23b53867c 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211121150504", - "scratch-l10n": "3.14.20211121031602", + "scratch-l10n": "3.14.20211122031614", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 48f2ed9f96516401506fb02ea9c349aaab0b6ecc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 22 Nov 2021 11:16:37 +0000 Subject: [PATCH 019/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211122093635 --- package-lock.json | 20 ++++---------------- package.json | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 967d5916d..8c6104dc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211121150504", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211121150504.tgz", - "integrity": "sha512-2hBOnGBJerlzZ6IdtNnp9AA30wmUZusSRfuNBzbrMbIRXZC5WdR+nom5pLWl2GCI4ZnfvTQlgCQrgA5hpdMlNw==", + "version": "0.1.0-prerelease.20211122093635", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211122093635.tgz", + "integrity": "sha512-SGbJ769wlVBWuYlUx0nYpUvlGkadt19zRcfqQOwrdWS0etnVBRC24AIVRCEbTojUGxhYkBoLO8C92+QgZabWmQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,7 +20632,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211121031602", + "scratch-l10n": "3.14.20211122031614", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211121031602", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211121031602.tgz", - "integrity": "sha512-m7WSpwu7niWTe2Db5l4IYL5rVfSysOgtWlBaRLoLq04wZBUhkMYrVyL/lMFcRryWeOrgJwwOL37mWjv/D/sBPA==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 23b53867c..202f38c2c 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211121150504", + "scratch-gui": "0.1.0-prerelease.20211122093635", "scratch-l10n": "3.14.20211122031614", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From efee791ef974fa147d6b0bab560f11288df536df Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 22 Nov 2021 15:23:27 +0000 Subject: [PATCH 020/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211122140429 --- 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 8c6104dc7..c337a2a08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211122093635", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211122093635.tgz", - "integrity": "sha512-SGbJ769wlVBWuYlUx0nYpUvlGkadt19zRcfqQOwrdWS0etnVBRC24AIVRCEbTojUGxhYkBoLO8C92+QgZabWmQ==", + "version": "0.1.0-prerelease.20211122140429", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211122140429.tgz", + "integrity": "sha512-3YqVBr1PfinwIqBMm/Hc8sj+b6fVC3HT8HsHKe4nNqtUT5rXmMX7u4AzZeQ0vpxCd8OiABF0o5UluLq6CZ2quw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20638,7 +20638,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211121093847", + "scratch-vm": "0.2.0-prerelease.20211122104443", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21285,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211121093847", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211121093847.tgz", - "integrity": "sha512-IQUBwd3isSmMrZFLSFt7zGgSxitzdelEjH6UQB2SbFyVgLOVz46YRJKAQqsYcN5SBdPU2oTS3FPVPE1E7OkoDA==", + "version": "0.2.0-prerelease.20211122104443", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211122104443.tgz", + "integrity": "sha512-ZrrSJSJNgpmJT84j4TMm0qXKcURTDgYZinxOQ3eiaX0YpEktlKzcX7rG2eBtCj3Wk/Aq5dYI1bYrEr07lkW1ag==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 202f38c2c..1978aa4ed 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211122093635", + "scratch-gui": "0.1.0-prerelease.20211122140429", "scratch-l10n": "3.14.20211122031614", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 89350ebfa34a749a117982f4456eab4a4704cb56 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 23 Nov 2021 03:26:32 +0000 Subject: [PATCH 021/134] chore(deps): update dependency scratch-l10n to v3.14.20211123031536 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c337a2a08..51e1220b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211122031614", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211122031614.tgz", + "integrity": "sha512-TgJXCIkBS+hjOsy9pXUQaBUxtEt0An192Ako5no/hi+vchSlT7Zxo3GdU3c90ft8iNlDposkpSSeLGRVzOsDbQ==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211122031614", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211122031614.tgz", - "integrity": "sha512-TgJXCIkBS+hjOsy9pXUQaBUxtEt0An192Ako5no/hi+vchSlT7Zxo3GdU3c90ft8iNlDposkpSSeLGRVzOsDbQ==", + "version": "3.14.20211123031536", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211123031536.tgz", + "integrity": "sha512-oEuOiPskueDWrl/lsJTJMLF9n8DQcOG/iTx6hn5iIa2XddIU+DwuMmROzwhlzjCc/qPu3WgaW/0XXTmF1EbGqw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 1978aa4ed..9965c9ea4 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211122140429", - "scratch-l10n": "3.14.20211122031614", + "scratch-l10n": "3.14.20211123031536", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 606ae73b1e3f7d8796b0e0236040323f4b64971e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 23 Nov 2021 09:20:22 +0000 Subject: [PATCH 022/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211123085005 --- package-lock.json | 26 +++++++------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51e1220b6..c1b415ed7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211122140429", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211122140429.tgz", - "integrity": "sha512-3YqVBr1PfinwIqBMm/Hc8sj+b6fVC3HT8HsHKe4nNqtUT5rXmMX7u4AzZeQ0vpxCd8OiABF0o5UluLq6CZ2quw==", + "version": "0.1.0-prerelease.20211123085005", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211123085005.tgz", + "integrity": "sha512-hTDKSTfT9omrSfvGidWJC1s4e4ugz63gmGwNKm1LSE2/fjL/pp8BGFPD7y74DzezfNaYqYz+543sIHVBWxDKbA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,7 +20632,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211122031614", + "scratch-l10n": "3.14.20211123031536", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.904", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.904.tgz", - "integrity": "sha512-x5uZWXcVNYkTh4JubD7KSC1VMKz0vZwJUqVwY3ihsW0bst1BXDe494Uqbg3Y0fDGVjJqA8vEeGuvO5foyH2+qw==", + "version": "1.3.906", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.906.tgz", + "integrity": "sha512-UjoECdcOYIVzWmrbtNnYpPrDuu+RtiO5W08Vdbid9ydGQMSdnqtJUtvOqQEAVQqpoXN9kSW9YnQufvzLQMYQOw==", "dev": true }, "has-flag": { @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211122031614", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211122031614.tgz", - "integrity": "sha512-TgJXCIkBS+hjOsy9pXUQaBUxtEt0An192Ako5no/hi+vchSlT7Zxo3GdU3c90ft8iNlDposkpSSeLGRVzOsDbQ==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 9965c9ea4..7c1105e0d 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211122140429", + "scratch-gui": "0.1.0-prerelease.20211123085005", "scratch-l10n": "3.14.20211123031536", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 4b14317c1f07383ad882fca8dc5893c8eceb911f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 23 Nov 2021 20:47:39 +0000 Subject: [PATCH 023/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211123123842 --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index c1b415ed7..52cd4cb92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211123085005", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211123085005.tgz", - "integrity": "sha512-hTDKSTfT9omrSfvGidWJC1s4e4ugz63gmGwNKm1LSE2/fjL/pp8BGFPD7y74DzezfNaYqYz+543sIHVBWxDKbA==", + "version": "0.1.0-prerelease.20211123123842", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211123123842.tgz", + "integrity": "sha512-HY/yrHaU1TBfmocVrJbhknmG+/x7oIErbeRurVfjKXFlRye/GcMcDYSS8FdnUaLPRrbzDvCnOZviRGQ3MYTrTA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20638,7 +20638,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211122104443", + "scratch-vm": "0.2.0-prerelease.20211123084552", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20789,9 +20789,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.906", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.906.tgz", - "integrity": "sha512-UjoECdcOYIVzWmrbtNnYpPrDuu+RtiO5W08Vdbid9ydGQMSdnqtJUtvOqQEAVQqpoXN9kSW9YnQufvzLQMYQOw==", + "version": "1.3.907", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.907.tgz", + "integrity": "sha512-xoUPSkjimw51d9ryeH38XUwmR3HmCA+eky4hk0YEgsWeBWGyhb35OCvT3lWAdmvIkcGYCRNOB8LvtO00dJQpOA==", "dev": true }, "has-flag": { @@ -21285,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211122104443", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211122104443.tgz", - "integrity": "sha512-ZrrSJSJNgpmJT84j4TMm0qXKcURTDgYZinxOQ3eiaX0YpEktlKzcX7rG2eBtCj3Wk/Aq5dYI1bYrEr07lkW1ag==", + "version": "0.2.0-prerelease.20211123084552", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211123084552.tgz", + "integrity": "sha512-hp35iS8tGDgNSCRrHQdCHjonfcMst6XZ8KAdrgHNm0ff2Oc3SaHh1OQEAhUyUQt+hDHlzemA1SKOruatUybLPA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 7c1105e0d..16bcb9368 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211123085005", + "scratch-gui": "0.1.0-prerelease.20211123123842", "scratch-l10n": "3.14.20211123031536", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 751f574f0fdfddf899a9f4309ae4a708128b48ce Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 24 Nov 2021 04:05:42 +0000 Subject: [PATCH 024/134] chore(deps): update dependency scratch-l10n to v3.14.20211124031542 --- package-lock.json | 18 +++++++++++++++--- package.json | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52cd4cb92..8ad19e01a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20988,6 +20988,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20211123031536", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211123031536.tgz", + "integrity": "sha512-oEuOiPskueDWrl/lsJTJMLF9n8DQcOG/iTx6hn5iIa2XddIU+DwuMmROzwhlzjCc/qPu3WgaW/0XXTmF1EbGqw==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21054,9 +21066,9 @@ } }, "scratch-l10n": { - "version": "3.14.20211123031536", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211123031536.tgz", - "integrity": "sha512-oEuOiPskueDWrl/lsJTJMLF9n8DQcOG/iTx6hn5iIa2XddIU+DwuMmROzwhlzjCc/qPu3WgaW/0XXTmF1EbGqw==", + "version": "3.14.20211124031542", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211124031542.tgz", + "integrity": "sha512-ixweb1gLyQRzLHyq9sdtMNP0Wn6XYKw182/AT2TeWCR1uLuMllbQL+xli+M3Ufqm3sirbgxlXqejKQCjcn341g==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 16bcb9368..1b9351277 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20211123123842", - "scratch-l10n": "3.14.20211123031536", + "scratch-l10n": "3.14.20211124031542", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From a5c69266c85f7f3085ca8b9d83ece105707d0f4b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 24 Nov 2021 09:13:16 +0000 Subject: [PATCH 025/134] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211124081222 --- package-lock.json | 28 ++++++++-------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ad19e01a..5358e346a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20578,9 +20578,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20211123123842", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211123123842.tgz", - "integrity": "sha512-HY/yrHaU1TBfmocVrJbhknmG+/x7oIErbeRurVfjKXFlRye/GcMcDYSS8FdnUaLPRrbzDvCnOZviRGQ3MYTrTA==", + "version": "0.1.0-prerelease.20211124081222", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211124081222.tgz", + "integrity": "sha512-H6o5kfjFGyGSF+QmEcbMiRUtWGMDV6u36ODx+GTA7hI4doNQzKVuCNvzOKEAJH3G7+x6XMzX8vTiBwwCyb6BYw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20632,13 +20632,13 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20211110095305", - "scratch-l10n": "3.14.20211123031536", + "scratch-l10n": "3.14.20211124031542", "scratch-paint": "0.2.0-prerelease.20211027080909", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20211123084552", + "scratch-vm": "0.2.0-prerelease.20211124050429", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -20988,18 +20988,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20211123031536", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211123031536.tgz", - "integrity": "sha512-oEuOiPskueDWrl/lsJTJMLF9n8DQcOG/iTx6hn5iIa2XddIU+DwuMmROzwhlzjCc/qPu3WgaW/0XXTmF1EbGqw==", - "dev": true, - "requires": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "babel-plugin-react-intl": "^3.0.1", - "transifex": "1.6.6" - } - }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21297,9 +21285,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20211123084552", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211123084552.tgz", - "integrity": "sha512-hp35iS8tGDgNSCRrHQdCHjonfcMst6XZ8KAdrgHNm0ff2Oc3SaHh1OQEAhUyUQt+hDHlzemA1SKOruatUybLPA==", + "version": "0.2.0-prerelease.20211124050429", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211124050429.tgz", + "integrity": "sha512-obNRG0UigJGSINWjCYhs5jhii9yoCZ1aRVf3dYkkbDMcg/NPgdm8KDyJZXKxGDPhPyyaZT1E6xb32YR4ya2jVw==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 1b9351277..2b0e4d5b7 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "redux-thunk": "2.0.1", "regenerator-runtime": "0.13.9", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20211123123842", + "scratch-gui": "0.1.0-prerelease.20211124081222", "scratch-l10n": "3.14.20211124031542", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 2f9e2905cbb05697f14190a998df5e7973cf7138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Bentley?= Date: Wed, 24 Nov 2021 10:38:40 -0500 Subject: [PATCH 026/134] updated parents page with information about scratch foundation --- src/views/parents/l10n.json | 7 ++++--- src/views/parents/parents.jsx | 13 ++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/views/parents/l10n.json b/src/views/parents/l10n.json index 438a6046f..78b53db8f 100644 --- a/src/views/parents/l10n.json +++ b/src/views/parents/l10n.json @@ -1,6 +1,7 @@ { "parents.title": "For Parents", - "parents.intro": "Scratch is a programming language and an online community where children\n can program and share interactive media such as stories, games, and \nanimation with people from all over the world. As children create with \nScratch, they learn to think creatively, work collaboratively, and \nreason systematically. Scratch is designed and maintained by the \nLifelong Kindergarten group at the MIT Media Lab. ", + "parents.intro": "Scratch is a programming language and an online community where children\n can program and share interactive media such as stories, games, and \nanimation with people from all over the world. As children create with \nScratch, they learn to think creatively, work collaboratively, and \nreason systematically. Scratch is designed, developed, and moderated by the {scratchFoundation}, a nonprofit organization. ", + "parents.scratchFoundationinkText": "Scratch Foundation", "parents.overview": "How it works", "parents.faq": "FAQ", "parents.overviewTitle": "How does Scratch work for children?", @@ -27,8 +28,8 @@ "parents.faqCommunityTitle": "What is the Scratch online community?", "parents.faqCommunityBody": "When participating in the Scratch online community, members can explore and experiment in an open learning community with other Scratch members from all backgrounds, ages, and interests. Members can share their work, get feedback, and learn from each other.", "parents.faqGuidelinesTitle": "What are the guidelines for the Scratch online community?", - "parents.faqGuidelinesBody": "The MIT Scratch Team works with the community to maintain a friendly and respectful environment for people of all ages, races, ethnicities, religions, sexual orientations, and gender identities. You can help your child learn how to participate by reviewing the {communityGuidelines} together. Members are asked to comment constructively and to help keep the website friendly by reporting any content that does not follow the community guidelines. The Scratch Team works each day to manage activity on the site and respond to reports, with the help of tools such as the {CleanSpeak} profanity filter.", - "parents.faqCommunityGuidelinesLinkText": "community guidelines", + "parents.faqGuidelinesBody": "The Scratch Team works with the community to maintain a friendly and respectful environment for people of all ages, races, ethnicities, religions, sexual orientations, and gender identities. You can help your child learn how to participate by reviewing the {communityGuidelines} together. Members are asked to comment constructively and to help keep the website friendly by reporting any content that does not follow the Community Guidelines. The Scratch Team works each day to manage activity on the site and respond to reports, with the help of tools such as the {CleanSpeak} profanity filter.", + "parents.faqCommunityGuidelinesLinkText": "Community Guidelines", "parents.faqPrivacyPolicyTitle": "What is your privacy policy?", "parents.faqPrivacyPolicyBody": "To protect children's online privacy, we limit what we collect during the signup process, and what we make public on the website. We don't sell or rent account information to anyone. You can find out more about our {privacyPolicy} page.", "parents.faqFAQLinkText": "frequently asked questions page", diff --git a/src/views/parents/parents.jsx b/src/views/parents/parents.jsx index 735b54107..68cd2f7be 100644 --- a/src/views/parents/parents.jsx +++ b/src/views/parents/parents.jsx @@ -19,7 +19,18 @@ const Landing = () => (

- + + + + ) + }} + />