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

Merge remote-tracking branch 'origin/develop' into release/2023-03-13

Browse source
This commit is contained in:
aoneill01 2023-03-13 14:22:46 +00:00
commit 61d2d2b73c
5 changed files with 90 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
package-lock.json generated
View file

@ -21,7 +21,7 @@
"react-twitter-embed": "^3.0.3", "react-twitter-embed": "^3.0.3",
"react-use": "^17.3.1", "react-use": "^17.3.1",
"scratch-parser": "5.1.1", "scratch-parser": "5.1.1",
"scratch-storage": "2.0.2" "scratch-storage": "2.1.0"
}, },
"devDependencies": { "devDependencies": {
"@formatjs/intl-datetimeformat": "6.4.3", "@formatjs/intl-datetimeformat": "6.4.3",
@ -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.3.21", "scratch-gui": "1.5.3",
"scratch-l10n": "3.15.20230227032200", "scratch-l10n": "3.15.20230313032122",
"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",
@ -23318,21 +23318,39 @@
} }
}, },
"node_modules/scratch-blocks": { "node_modules/scratch-blocks": {
"version": "0.1.0-prerelease.20230227082058", "version": "0.1.0-prerelease.20230312094058",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230227082058.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230312094058.tgz",
"integrity": "sha512-D2XElzziBZc6SWOzDgDE2c3kG0EWtSOxhPq5h2drSKsPIxncx1RcK7D5XC23vhgsMiaUQ3NgIFqMQ9RPIJxwKw==", "integrity": "sha512-G58oYfEfrEvyi4K471Lkj5GQ/gAHtwS1zB3Jbt0AqIdS+8jm25rvc4tD6qw+ip+yDS6b3wULI7f8rzYCa0W4Zw==",
"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.20230227032200" "scratch-l10n": "3.15.20230312032149"
}
},
"node_modules/scratch-blocks/node_modules/scratch-l10n": {
"version": "3.15.20230312032149",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230312032149.tgz",
"integrity": "sha512-fpQiYj3/reI5A5nEcGfYfUDCSDMCRKdpdnjWWnFugAW4Cg2bLA0u8Z/Yj0iZlCJPuxFRknhz63N7OTOruZeU7g==",
"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.3.21", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.21.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.5.3.tgz",
"integrity": "sha512-epUR5vTmTj756LYZyB4zlnOSOPe3UHq9KYBJoeL/MPwBptXnWrBqxT/Wyxl45hPMXzGzvuNPUgWCwaqu+hEIlg==", "integrity": "sha512-xaO6HjYoXL4jvRBHEV52EEMrQP/n4eZpPtRdnP/T85zEWhoxO9CPrjAeIgmuaiMqsmOO4y0fxeEz6QiUvVD1Sg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -23383,14 +23401,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.20230227082058", "scratch-blocks": "0.1.0-prerelease.20230312094058",
"scratch-l10n": "3.15.20230223032131", "scratch-l10n": "3.15.20230312032149",
"scratch-paint": "1.1.31", "scratch-paint": "1.1.31",
"scratch-render": "0.1.0-prerelease.20230221152523", "scratch-render": "0.1.0-prerelease.20230221152523",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.0.2", "scratch-storage": "2.1.0",
"scratch-svg-renderer": "0.2.0-prerelease.20230224194137", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137",
"scratch-vm": "1.3.61", "scratch-vm": "1.4.6",
"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",
@ -23717,9 +23735,9 @@
} }
}, },
"node_modules/scratch-gui/node_modules/scratch-l10n": { "node_modules/scratch-gui/node_modules/scratch-l10n": {
"version": "3.15.20230223032131", "version": "3.15.20230312032149",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230223032131.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230312032149.tgz",
"integrity": "sha512-VTUStiRe0cad8TqnL2MfuRXbexQHWmTpEwiMDH+i+2mTWsLSm2k6tM7yS1VyOTmaE0BIsJA3IUHgPj4XybN1Iw==", "integrity": "sha512-fpQiYj3/reI5A5nEcGfYfUDCSDMCRKdpdnjWWnFugAW4Cg2bLA0u8Z/Yj0iZlCJPuxFRknhz63N7OTOruZeU7g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -23833,9 +23851,9 @@
} }
}, },
"node_modules/scratch-l10n": { "node_modules/scratch-l10n": {
"version": "3.15.20230227032200", "version": "3.15.20230313032122",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230227032200.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230313032122.tgz",
"integrity": "sha512-6Y8MVsySw9/z4j5WM8bOiyAKMl4ghPt9lEbAZv0XGwDRr1Ab+XcByZBlWcYUlUHfNvCXVvgm9b36LZvKtwDanw==", "integrity": "sha512-cxtlaLTbFUybXR7Y74oBDxm5jVRPHg3bTATeQ7QeZrcG5Pa+Ys013m4NpoH8qQmaVHx3b8DOqgDhBWOHKifLyQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -23964,9 +23982,9 @@
} }
}, },
"node_modules/scratch-storage": { "node_modules/scratch-storage": {
"version": "2.0.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.0.2.tgz", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.1.0.tgz",
"integrity": "sha512-tLlctKjxPyw2H/xXTmEf3obo3ZPC+ORDHj+kig/ucy3JcZKR27QpEXOrUfN9iDh5DXcZpeIgZPqdl5Nw5aGmsQ==", "integrity": "sha512-ovT5Q7mgwNDxBI69RgtZKbTBkHcUlUad/9JpCPkvc/ol+kBTG/ILzJOhBkPwj54aeadKgLufsW37UrKNL6ex/w==",
"dependencies": { "dependencies": {
"arraybuffer-loader": "^1.0.3", "arraybuffer-loader": "^1.0.3",
"base64-js": "1.3.0", "base64-js": "1.3.0",
@ -24033,9 +24051,9 @@
"dev": true "dev": true
}, },
"node_modules/scratch-vm": { "node_modules/scratch-vm": {
"version": "1.3.61", "version": "1.4.6",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.61.tgz", "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.4.6.tgz",
"integrity": "sha512-afmy2jm3Lb7qg0vsVAA/B8uwpCcrfapfrlMjTs1twpVEVRPO12MEtXayPX64ZmvyxkaNTBL4IOxkVpbLpTPRMg==", "integrity": "sha512-ZBglmQ6vcjBlHTnf/1QGYdYWELrxDGdwcrgKsvjwl3jbWqXakLsxOZ018Js2dzlQPWTDafbDrxQJ5T1+vA4Fag==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@vernier/godirect": "1.5.0", "@vernier/godirect": "1.5.0",
@ -51691,21 +51709,37 @@
} }
}, },
"scratch-blocks": { "scratch-blocks": {
"version": "0.1.0-prerelease.20230227082058", "version": "0.1.0-prerelease.20230312094058",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230227082058.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230312094058.tgz",
"integrity": "sha512-D2XElzziBZc6SWOzDgDE2c3kG0EWtSOxhPq5h2drSKsPIxncx1RcK7D5XC23vhgsMiaUQ3NgIFqMQ9RPIJxwKw==", "integrity": "sha512-G58oYfEfrEvyi4K471Lkj5GQ/gAHtwS1zB3Jbt0AqIdS+8jm25rvc4tD6qw+ip+yDS6b3wULI7f8rzYCa0W4Zw==",
"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.20230227032200" "scratch-l10n": "3.15.20230312032149"
},
"dependencies": {
"scratch-l10n": {
"version": "3.15.20230312032149",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230312032149.tgz",
"integrity": "sha512-fpQiYj3/reI5A5nEcGfYfUDCSDMCRKdpdnjWWnFugAW4Cg2bLA0u8Z/Yj0iZlCJPuxFRknhz63N7OTOruZeU7g==",
"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.3.21", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.3.21.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-1.5.3.tgz",
"integrity": "sha512-epUR5vTmTj756LYZyB4zlnOSOPe3UHq9KYBJoeL/MPwBptXnWrBqxT/Wyxl45hPMXzGzvuNPUgWCwaqu+hEIlg==", "integrity": "sha512-xaO6HjYoXL4jvRBHEV52EEMrQP/n4eZpPtRdnP/T85zEWhoxO9CPrjAeIgmuaiMqsmOO4y0fxeEz6QiUvVD1Sg==",
"dev": true, "dev": true,
"requires": { "requires": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -51756,14 +51790,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.20230227082058", "scratch-blocks": "0.1.0-prerelease.20230312094058",
"scratch-l10n": "3.15.20230223032131", "scratch-l10n": "3.15.20230312032149",
"scratch-paint": "1.1.31", "scratch-paint": "1.1.31",
"scratch-render": "0.1.0-prerelease.20230221152523", "scratch-render": "0.1.0-prerelease.20230221152523",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332", "scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.0.2", "scratch-storage": "2.1.0",
"scratch-svg-renderer": "0.2.0-prerelease.20230224194137", "scratch-svg-renderer": "0.2.0-prerelease.20230224194137",
"scratch-vm": "1.3.61", "scratch-vm": "1.4.6",
"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",
@ -52028,9 +52062,9 @@
} }
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.15.20230223032131", "version": "3.15.20230312032149",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230223032131.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230312032149.tgz",
"integrity": "sha512-VTUStiRe0cad8TqnL2MfuRXbexQHWmTpEwiMDH+i+2mTWsLSm2k6tM7yS1VyOTmaE0BIsJA3IUHgPj4XybN1Iw==", "integrity": "sha512-fpQiYj3/reI5A5nEcGfYfUDCSDMCRKdpdnjWWnFugAW4Cg2bLA0u8Z/Yj0iZlCJPuxFRknhz63N7OTOruZeU7g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -52119,9 +52153,9 @@
} }
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.15.20230227032200", "version": "3.15.20230313032122",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230227032200.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.15.20230313032122.tgz",
"integrity": "sha512-6Y8MVsySw9/z4j5WM8bOiyAKMl4ghPt9lEbAZv0XGwDRr1Ab+XcByZBlWcYUlUHfNvCXVvgm9b36LZvKtwDanw==", "integrity": "sha512-cxtlaLTbFUybXR7Y74oBDxm5jVRPHg3bTATeQ7QeZrcG5Pa+Ys013m4NpoH8qQmaVHx3b8DOqgDhBWOHKifLyQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -52246,9 +52280,9 @@
} }
}, },
"scratch-storage": { "scratch-storage": {
"version": "2.0.2", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.0.2.tgz", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.1.0.tgz",
"integrity": "sha512-tLlctKjxPyw2H/xXTmEf3obo3ZPC+ORDHj+kig/ucy3JcZKR27QpEXOrUfN9iDh5DXcZpeIgZPqdl5Nw5aGmsQ==", "integrity": "sha512-ovT5Q7mgwNDxBI69RgtZKbTBkHcUlUad/9JpCPkvc/ol+kBTG/ILzJOhBkPwj54aeadKgLufsW37UrKNL6ex/w==",
"requires": { "requires": {
"arraybuffer-loader": "^1.0.3", "arraybuffer-loader": "^1.0.3",
"base64-js": "1.3.0", "base64-js": "1.3.0",
@ -52316,9 +52350,9 @@
"dev": true "dev": true
}, },
"scratch-vm": { "scratch-vm": {
"version": "1.3.61", "version": "1.4.6",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.3.61.tgz", "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-1.4.6.tgz",
"integrity": "sha512-afmy2jm3Lb7qg0vsVAA/B8uwpCcrfapfrlMjTs1twpVEVRPO12MEtXayPX64ZmvyxkaNTBL4IOxkVpbLpTPRMg==", "integrity": "sha512-ZBglmQ6vcjBlHTnf/1QGYdYWELrxDGdwcrgKsvjwl3jbWqXakLsxOZ018Js2dzlQPWTDafbDrxQJ5T1+vA4Fag==",
"dev": true, "dev": true,
"requires": { "requires": {
"@vernier/godirect": "1.5.0", "@vernier/godirect": "1.5.0",

6
package.json
View file

@ -56,7 +56,7 @@
"react-twitter-embed": "^3.0.3", "react-twitter-embed": "^3.0.3",
"react-use": "^17.3.1", "react-use": "^17.3.1",
"scratch-parser": "5.1.1", "scratch-parser": "5.1.1",
"scratch-storage": "2.0.2" "scratch-storage": "2.1.0"
}, },
"devDependencies": { "devDependencies": {
"@formatjs/intl-datetimeformat": "6.4.3", "@formatjs/intl-datetimeformat": "6.4.3",
@ -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.3.21", "scratch-gui": "1.5.3",
"scratch-l10n": "3.15.20230227032200", "scratch-l10n": "3.15.20230313032122",
"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
src/components/footer/www/footer.jsx
View file

@ -26,7 +26,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="https://www.scratchfoundation.org/opportunities"> <a href="https://www.scratchfoundation.org/careers">
<FormattedMessage id="general.jobs" /> <FormattedMessage id="general.jobs" />
</a> </a>
</dd> </dd>
@ -92,7 +92,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="https://www.scratchfoundation.org/opportunities"> <a href="https://www.scratchfoundation.org/careers">
<FormattedMessage id="general.jobs" /> <FormattedMessage id="general.jobs" />
</a> </a>
</dd> </dd>

2
src/routes.json
View file

@ -211,7 +211,7 @@
{ {
"name": "jobs-redirect", "name": "jobs-redirect",
"pattern": "^/jobs/?(\\?.*)?$", "pattern": "^/jobs/?(\\?.*)?$",
"redirect": "https://www.scratchfoundation.org/opportunities/" "redirect": "https://www.scratchfoundation.org/careers"
}, },
{ {
"name": "join", "name": "join",

2
src/views/developers/developers.jsx
View file

@ -228,7 +228,7 @@ const Developers = () => (
id="developers.joinBody" id="developers.joinBody"
values={{ values={{
jobsPageLink: ( jobsPageLink: (
<a href="https://www.scratchfoundation.org/opportunities"> <a href="https://www.scratchfoundation.org/careers">
<FormattedMessage id="developers.joinBodyJobsLinkText" /> <FormattedMessage id="developers.joinBodyJobsLinkText" />
</a> </a>
), ),