scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/develop' into release/2023-05-08

Browse source
This commit is contained in:
delasare 2023-05-08 14:13:08 +00:00
commit 1e9ca4b1d0
4 changed files with 49 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
package-lock.json generated
View file

@ -101,8 +101,8 @@
"regenerator-runtime": "0.13.9", "regenerator-runtime": "0.13.9",
"sass": "1.49.7", "sass": "1.49.7",
"sass-loader": "10.2.1", "sass-loader": "10.2.1",
"scratch-gui": "1.8.21", "scratch-gui": "1.8.53",
"scratch-l10n": "3.15.20230412032123", "scratch-l10n": "3.15.20230507032520",
"selenium-webdriver": "4.1.0", "selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",
"style-loader": "0.12.3", "style-loader": "0.12.3",
@ -23463,39 +23463,21 @@
} }
}, },
"node_modules/scratch-blocks": { "node_modules/scratch-blocks": {
"version": "0.1.0-prerelease.20230412165437", "version": "0.1.0-prerelease.20230507065123",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230412165437.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz",
"integrity": "sha512-sxdCHrKPUnQyigL8EX20AsztjOitVo5ruQCwUNwLQeCVS1HaBWo3LyE2E6E6QMsnPsS81Z5UeqM5z+9W2hjyeQ==", "integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"exports-loader": "0.7.0", "exports-loader": "0.7.0",
"google-closure-library": "20190301.0.0", "google-closure-library": "20190301.0.0",
"imports-loader": "0.8.0", "imports-loader": "0.8.0",
"scratch-l10n": "3.15.20230410032122" "scratch-l10n": "3.15.20230507032520"
}
},
"node_modules/scratch-blocks/node_modules/scratch-l10n": {
"version": "3.15.20230410032122",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230410032122.tgz",
"integrity": "sha512-XUJZIG9GAh5ePB+xszRpdzqAD3nPaAxNwOdM+bnxALq/2rk9mieFF4/6vaE3+t8Yigbt0/CPsy5Y2weLTrKVOQ==",
"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-gui": {
"version": "1.8.21", "version": "1.8.53",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.21.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.53.tgz",
"integrity": "sha512-/XF1V1zt9D3EDw1Po6WIRXEDunbatHoK4hDoRJN+VMh0F+4MCCBsmdNOUecsESAp6H4NeAWv5iXxfInpCU8WWg==", "integrity": "sha512-zqrSRAUhuODR0Qe2cFnQiXpDkIfFF9iEofRIswHSaP/MHj/oiEMINrpEDP+66ep+HivWRpwUumdUt8dOyUIw0A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -23547,14 +23529,14 @@
"redux": "3.7.2", "redux": "3.7.2",
"redux-throttle": "0.1.1", "redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128", "scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230412165437", "scratch-blocks": "0.1.0-prerelease.20230507065123",
"scratch-l10n": "3.15.20230412032123", "scratch-l10n": "3.15.20230507032520",
"scratch-paint": "1.1.46", "scratch-paint": "1.1.54",
"scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.2.1", "scratch-storage": "2.2.1",
"scratch-svg-renderer": "0.2.0-prerelease.20230224194137", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137",
"scratch-vm": "1.5.29", "scratch-vm": "1.5.48",
"startaudiocontext": "1.2.1", "startaudiocontext": "1.2.1",
"style-loader": "^0.23.0", "style-loader": "^0.23.0",
"text-encoding": "0.7.0", "text-encoding": "0.7.0",
@ -23881,9 +23863,9 @@
} }
}, },
"node_modules/scratch-gui/node_modules/scratch-paint": { "node_modules/scratch-gui/node_modules/scratch-paint": {
"version": "1.1.46", "version": "1.1.54",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.46.tgz", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz",
"integrity": "sha512-uklJlBvb9dGt1A50kEp1TZ3hWS1dZWWoL7+l7gIR6eILSglmcO0iqPCfDoy9lB4AybaMIDs9goDOqmq+mAZ2Sg==", "integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@scratch/paper": "0.11.20200728195508", "@scratch/paper": "0.11.20200728195508",
@ -23962,9 +23944,9 @@
} }
}, },
"node_modules/scratch-l10n": { "node_modules/scratch-l10n": {
"version": "3.15.20230412032123", "version": "3.15.20230507032520",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230412032123.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz",
"integrity": "sha512-k0X6Xf0u7CBUMMvzryhlcpL96Lhqx4qkot7A6gyLcOJ6WmfmfeM/xHvThA5AI3QT7tB2HMBeAKUx/ST4p2z5eg==", "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -24164,9 +24146,9 @@
"dev": true "dev": true
}, },
"node_modules/scratch-vm": { "node_modules/scratch-vm": {
"version": "1.5.29", "version": "1.5.48",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.29.tgz", "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.48.tgz",
"integrity": "sha512-vTDTPa8meaa8Nnz2VxA9rsQ6+avIcDVKQLTJocTxXy0C+ucrQkXBqpzSf5nObqwWSDKsZEpD4TtcReIx8b6BvQ==", "integrity": "sha512-xvIxNRruVTdDbgow1tjkM51+DYEfsE39oGrwG0hfKdLTTcF517gz30U3G3EK6vURivzlu+XvaO0RCHwxskSeeg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@vernier/godirect": "1.5.0", "@vernier/godirect": "1.5.0",
@ -51945,37 +51927,21 @@
} }
}, },
"scratch-blocks": { "scratch-blocks": {
"version": "0.1.0-prerelease.20230412165437", "version": "0.1.0-prerelease.20230507065123",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230412165437.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz",
"integrity": "sha512-sxdCHrKPUnQyigL8EX20AsztjOitVo5ruQCwUNwLQeCVS1HaBWo3LyE2E6E6QMsnPsS81Z5UeqM5z+9W2hjyeQ==", "integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==",
"dev": true, "dev": true,
"requires": { "requires": {
"exports-loader": "0.7.0", "exports-loader": "0.7.0",
"google-closure-library": "20190301.0.0", "google-closure-library": "20190301.0.0",
"imports-loader": "0.8.0", "imports-loader": "0.8.0",
"scratch-l10n": "3.15.20230410032122" "scratch-l10n": "3.15.20230507032520"
},
"dependencies": {
"scratch-l10n": {
"version": "3.15.20230410032122",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230410032122.tgz",
"integrity": "sha512-XUJZIG9GAh5ePB+xszRpdzqAD3nPaAxNwOdM+bnxALq/2rk9mieFF4/6vaE3+t8Yigbt0/CPsy5Y2weLTrKVOQ==",
"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": { "scratch-gui": {
"version": "1.8.21", "version": "1.8.53",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.21.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.8.53.tgz",
"integrity": "sha512-/XF1V1zt9D3EDw1Po6WIRXEDunbatHoK4hDoRJN+VMh0F+4MCCBsmdNOUecsESAp6H4NeAWv5iXxfInpCU8WWg==", "integrity": "sha512-zqrSRAUhuODR0Qe2cFnQiXpDkIfFF9iEofRIswHSaP/MHj/oiEMINrpEDP+66ep+HivWRpwUumdUt8dOyUIw0A==",
"dev": true, "dev": true,
"requires": { "requires": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -52027,14 +51993,14 @@
"redux": "3.7.2", "redux": "3.7.2",
"redux-throttle": "0.1.1", "redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128", "scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230412165437", "scratch-blocks": "0.1.0-prerelease.20230507065123",
"scratch-l10n": "3.15.20230412032123", "scratch-l10n": "3.15.20230507032520",
"scratch-paint": "1.1.46", "scratch-paint": "1.1.54",
"scratch-render": "0.1.0-prerelease.20230318150639", "scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.2.1", "scratch-storage": "2.2.1",
"scratch-svg-renderer": "0.2.0-prerelease.20230224194137", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137",
"scratch-vm": "1.5.29", "scratch-vm": "1.5.48",
"startaudiocontext": "1.2.1", "startaudiocontext": "1.2.1",
"style-loader": "^0.23.0", "style-loader": "^0.23.0",
"text-encoding": "0.7.0", "text-encoding": "0.7.0",
@ -52299,9 +52265,9 @@
} }
}, },
"scratch-paint": { "scratch-paint": {
"version": "1.1.46", "version": "1.1.54",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.46.tgz", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz",
"integrity": "sha512-uklJlBvb9dGt1A50kEp1TZ3hWS1dZWWoL7+l7gIR6eILSglmcO0iqPCfDoy9lB4AybaMIDs9goDOqmq+mAZ2Sg==", "integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@scratch/paper": "0.11.20200728195508", "@scratch/paper": "0.11.20200728195508",
@ -52362,9 +52328,9 @@
} }
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.15.20230412032123", "version": "3.15.20230507032520",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230412032123.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230507032520.tgz",
"integrity": "sha512-k0X6Xf0u7CBUMMvzryhlcpL96Lhqx4qkot7A6gyLcOJ6WmfmfeM/xHvThA5AI3QT7tB2HMBeAKUx/ST4p2z5eg==", "integrity": "sha512-WpAXxJ6hZIXIvHiLCbReXq9FCGXojX+2uMBs+yWvUNDfTmg2jpuWkbRw0+Ovnzll6lZYc5D2ErUtyD90BI38JA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -52561,9 +52527,9 @@
"dev": true "dev": true
}, },
"scratch-vm": { "scratch-vm": {
"version": "1.5.29", "version": "1.5.48",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.29.tgz", "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.5.48.tgz",
"integrity": "sha512-vTDTPa8meaa8Nnz2VxA9rsQ6+avIcDVKQLTJocTxXy0C+ucrQkXBqpzSf5nObqwWSDKsZEpD4TtcReIx8b6BvQ==", "integrity": "sha512-xvIxNRruVTdDbgow1tjkM51+DYEfsE39oGrwG0hfKdLTTcF517gz30U3G3EK6vURivzlu+XvaO0RCHwxskSeeg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@vernier/godirect": "1.5.0", "@vernier/godirect": "1.5.0",

4
package.json
View file

@ -136,8 +136,8 @@
"regenerator-runtime": "0.13.9", "regenerator-runtime": "0.13.9",
"sass": "1.49.7", "sass": "1.49.7",
"sass-loader": "10.2.1", "sass-loader": "10.2.1",
"scratch-gui": "1.8.21", "scratch-gui": "1.8.53",
"scratch-l10n": "3.15.20230412032123", "scratch-l10n": "3.15.20230507032520",
"selenium-webdriver": "4.1.0", "selenium-webdriver": "4.1.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",
"style-loader": "0.12.3", "style-loader": "0.12.3",

4
test/integration/footer-links.test.js
View file

@ -4,7 +4,8 @@ const SeleniumHelper = require('./selenium-helpers.js');
const { const {
clickText, clickText,
buildDriver buildDriver,
findText
} = new SeleniumHelper(); } = new SeleniumHelper();
let rootUrl = process.env.ROOT_URL || 'https://scratch.ly'; let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
@ -20,6 +21,7 @@ describe('www-integration footer links', () => {
beforeEach(async () => { beforeEach(async () => {
await driver.get(rootUrl); await driver.get(rootUrl);
await findText('Create stories, games, and animations');
}); });
afterAll(async () => await driver.quit()); afterAll(async () => await driver.quit());

2
test/integration/selenium-helpers.js
View file

@ -1,4 +1,5 @@
const webdriver = require('selenium-webdriver'); const webdriver = require('selenium-webdriver');
const {PageLoadStrategy} = require('selenium-webdriver/lib/capabilities');
const bindAll = require('lodash.bindall'); const bindAll = require('lodash.bindall');
require('chromedriver'); require('chromedriver');
const chromedriverVersion = require('chromedriver').version; const chromedriverVersion = require('chromedriver').version;
@ -60,6 +61,7 @@ class SeleniumHelper {
args.push('--no-sandbox'); args.push('--no-sandbox');
} }
chromeCapabilities.set('chromeOptions', {args}); chromeCapabilities.set('chromeOptions', {args});
chromeCapabilities.setPageLoadStrategy(PageLoadStrategy.EAGER);
let driver = new webdriver.Builder() let driver = new webdriver.Builder()
.forBrowser('chrome') .forBrowser('chrome')
.withCapabilities(chromeCapabilities) .withCapabilities(chromeCapabilities)