mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-17 00:21:20 -05:00
Merge remote-tracking branch 'origin/develop' into monorepo-integration
This commit is contained in:
MiroslavDionisiev
commit
2576c5d9cd
7 changed files with 354 additions and 359 deletions
2
.nvmrc
2
.nvmrc
|
|
@ -1 +1 @@
|
|||
18.20.3
|
||||
18.20.4
|
||||
|
|
|
|||
639
package-lock.json
generated
639
package-lock.json
generated
File diff suppressed because it is too large
Load diff
24
package.json
24
package.json
|
|
@ -55,18 +55,18 @@
|
|||
"react-onclickoutside": "6.13.0",
|
||||
"react-router-dom": "5.3.4",
|
||||
"react-twitter-embed": "3.0.3",
|
||||
"react-use": "17.5.0",
|
||||
"react-use": "17.5.1",
|
||||
"scratch-parser": "5.2.1",
|
||||
"scratch-storage": "2.3.171"
|
||||
"scratch-storage": "2.3.190"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "7.24.7",
|
||||
"@babel/core": "7.24.7",
|
||||
"@babel/eslint-parser": "7.24.7",
|
||||
"@babel/cli": "7.24.8",
|
||||
"@babel/core": "7.24.9",
|
||||
"@babel/eslint-parser": "7.24.8",
|
||||
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
||||
"@babel/plugin-transform-async-to-generator": "7.24.7",
|
||||
"@babel/plugin-transform-object-rest-spread": "7.24.7",
|
||||
"@babel/preset-env": "7.24.7",
|
||||
"@babel/preset-env": "7.24.8",
|
||||
"@babel/preset-react": "7.24.7",
|
||||
"@formatjs/intl-datetimeformat": "6.12.5",
|
||||
"@formatjs/intl-locale": "3.4.6",
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
"eslint-config-scratch": "9.0.8",
|
||||
"eslint-plugin-jest": "27.9.0",
|
||||
"eslint-plugin-json": "2.1.2",
|
||||
"eslint-plugin-react": "7.34.3",
|
||||
"eslint-plugin-react": "7.35.0",
|
||||
"eslint-plugin-react-hooks": "4.6.2",
|
||||
"fastly": "1.2.1",
|
||||
"file-loader": "^6.2.0",
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
"formsy-react-components": "1.1.0",
|
||||
"git-bundle-sha": "0.0.2",
|
||||
"glob": "5.0.15",
|
||||
"google-libphonenumber": "3.2.35",
|
||||
"google-libphonenumber": "3.2.37",
|
||||
"html-webpack-plugin": "5.6.0",
|
||||
"iso-3166-2": "1.0.0",
|
||||
"jest": "29.7.0",
|
||||
|
|
@ -141,18 +141,18 @@
|
|||
"redux-mock-store": "1.5.4",
|
||||
"redux-thunk": "2.4.2",
|
||||
"regenerator-runtime": "0.13.9",
|
||||
"sass": "1.77.6",
|
||||
"sass": "1.77.8",
|
||||
"sass-loader": "10.5.2",
|
||||
"scratch-gui": "3.6.15",
|
||||
"scratch-l10n": "3.18.209",
|
||||
"selenium-webdriver": "4.22.0",
|
||||
"scratch-l10n": "3.18.230",
|
||||
"selenium-webdriver": "4.23.0",
|
||||
"slick-carousel": "1.8.1",
|
||||
"stream-browserify": "3.0.0",
|
||||
"style-loader": "^0.23.0",
|
||||
"tap": "14.11.0",
|
||||
"url-loader": "3.0.0",
|
||||
"use-onclickoutside": "0.4.1",
|
||||
"webpack": "5.92.1",
|
||||
"webpack": "5.93.0",
|
||||
"webpack-bundle-analyzer": "4.10.2",
|
||||
"webpack-cli": "5.1.4",
|
||||
"webpack-dev-middleware": "5.3.4",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
"name": "about",
|
||||
"pattern": "^/about/?$",
|
||||
"routeAlias": "/about/?$",
|
||||
"redirect": "RADISH_URL/"
|
||||
"view": "about/about",
|
||||
"title": "About"
|
||||
},
|
||||
{
|
||||
"name": "annual-report",
|
||||
|
|
@ -133,19 +134,23 @@
|
|||
"name": "contact-us",
|
||||
"pattern": "^/contact-us/?(\\?.*)?$",
|
||||
"routeAlias": "/contact-us/?",
|
||||
"redirect": "RADISH_URL/help-center/"
|
||||
"view": "contact-us/contact-us",
|
||||
"title": "Contact Us",
|
||||
"viewportWidth": "device-width"
|
||||
},
|
||||
{
|
||||
"name": "cookies",
|
||||
"pattern": "^/cookies/?$",
|
||||
"routeAlias": "/cookies/?",
|
||||
"redirect": "RADISH_URL/cookie-policy/"
|
||||
"view": "cookies/cookies",
|
||||
"title": "Cookie Policy"
|
||||
},
|
||||
{
|
||||
"name": "credits",
|
||||
"pattern": "^/credits/?$",
|
||||
"routeAlias": "/info/(cards|credits|faq|donate)/?$",
|
||||
"redirect": "RADISH_URL/our-team-credits/"
|
||||
"view": "credits/credits",
|
||||
"title": "Credits"
|
||||
},
|
||||
{
|
||||
"name": "developers",
|
||||
|
|
@ -158,19 +163,22 @@
|
|||
"name": "dmca",
|
||||
"pattern": "^/DMCA/?$",
|
||||
"routeAlias": "/DMCA/?$",
|
||||
"redirect": "RADISH_URL/42-0-dmca/"
|
||||
"view": "dmca/dmca",
|
||||
"title": "DMCA"
|
||||
},
|
||||
{
|
||||
"name": "download",
|
||||
"pattern": "^/download/?(\\?.*)?$",
|
||||
"routeAlias": "/download",
|
||||
"redirect": "RADISH_URL/help-center/"
|
||||
"view": "download/download",
|
||||
"title": "Scratch Offline Editor"
|
||||
},
|
||||
{
|
||||
"name": "educator-landing",
|
||||
"pattern": "^/educators/?(\\?.*)?$",
|
||||
"routeAlias": "/educators(?:/(faq|register|waiting))?/?(\\?.*)?$",
|
||||
"redirect": "RADISH_URL/scratch-for-educators/"
|
||||
"view": "teachers/landing/landing",
|
||||
"title": "Educators"
|
||||
},
|
||||
{
|
||||
"name": "ethics",
|
||||
|
|
@ -246,7 +254,8 @@
|
|||
"name": "parents",
|
||||
"pattern": "^/parents/?(\\?.*)?$",
|
||||
"routeAlias": "/parents/",
|
||||
"redirect": "RADISH_URL/parents-caregivers/"
|
||||
"view": "parents/parents",
|
||||
"title": "For Parents"
|
||||
},
|
||||
{
|
||||
"name": "preview-faq-redirect",
|
||||
|
|
@ -258,7 +267,8 @@
|
|||
"name": "privacypolicy",
|
||||
"pattern": "^/privacy_policy/?$",
|
||||
"routeAlias": "/privacy_policy/?$",
|
||||
"redirect": "RADISH_URL/privacy-policy/"
|
||||
"view": "privacypolicy/privacypolicy",
|
||||
"title": "Privacy Policy"
|
||||
},
|
||||
{
|
||||
"name": "privacypolicy-apps",
|
||||
|
|
@ -389,7 +399,8 @@
|
|||
"name": "terms",
|
||||
"pattern": "^/terms_of_use/?$",
|
||||
"routeAlias": "/terms_of_use/?$",
|
||||
"redirect": "RADISH_URL/privacy-policy/"
|
||||
"view": "terms/terms",
|
||||
"title": "Scratch Terms of Use"
|
||||
},
|
||||
{
|
||||
"name": "wedo2",
|
||||
|
|
@ -443,7 +454,7 @@
|
|||
"name" : "credits-redirect",
|
||||
"pattern": "^/info/credits/?$",
|
||||
"routeAlias": "/info/(cards|credits|faq|donate)/?$",
|
||||
"redirect": "RADISH_URL/our-team-credits/"
|
||||
"redirect" : "/credits"
|
||||
},
|
||||
{
|
||||
"name" : "faq-redirect",
|
||||
|
|
@ -538,7 +549,7 @@
|
|||
"name": "sec-redirect",
|
||||
"pattern": "^/sec/?$",
|
||||
"routeAlias": "/sec",
|
||||
"redirect": "RADISH_URL/scratch-education-collaborative/"
|
||||
"redirect": "https://sip.scratch.mit.edu/sec"
|
||||
},
|
||||
{
|
||||
"name": "splash-redirect",
|
||||
|
|
|
|||
|
|
@ -117,9 +117,9 @@ const Credits = () => (
|
|||
<FormattedMessage id="credits.pastContributorsThanks" />
|
||||
</p>
|
||||
<p>
|
||||
Yusuf Ahmad, Zoë Bentley, Ben Berg, Amos Blanton, Paula Bontá, Carl Bowman, Karen Brennan,
|
||||
Juanita Buitrago, Leo Burd, Gaia Carini, Jolie Castellucci, Karishma Chadha, Kasia Chmielinski,
|
||||
Michelle Chung, Shane Clements, Hannah Cole, Sayamindu Dasgupta,
|
||||
Yusuf Ahmad, Ashley Bass, Zoë Bentley, Ben Berg, Amos Blanton, Paula Bontá, Carl Bowman,
|
||||
Karen Brennan, Juanita Buitrago, Leo Burd, Gaia Carini, Jolie Castellucci, Karishma Chadha,
|
||||
Kasia Chmielinski, Michelle Chung, Shane Clements, Hannah Cole, Sayamindu Dasgupta,
|
||||
Zachary Deiman, Margarita Dekoli, Manuj Dhariwal, Shruti Dhariwal, Dave Feinberg,
|
||||
Champika Fernando, Linda Fernsel, Elizabeth Foster, Joan Fusco,
|
||||
Lily Gabaree, Stephanie Gayle, Chris Graves, Joel Gritter,
|
||||
|
|
|
|||
|
|
@ -39,11 +39,6 @@
|
|||
"userId": 85830206,
|
||||
"name": "Ashlee"
|
||||
},
|
||||
{
|
||||
"userName": "bassa846",
|
||||
"userId": 77575217,
|
||||
"name": "Ashley"
|
||||
},
|
||||
{
|
||||
"userName": "wheelsonfire",
|
||||
"userId": 10001044,
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ module.exports = {
|
|||
resolve: {
|
||||
fallback: {
|
||||
// Node modules are no longer polyfilled by default in Webpack 5, so we need to add these here
|
||||
buffer: require.resolve('buffer/'),
|
||||
Buffer: require.resolve('buffer/'),
|
||||
stream: require.resolve('stream-browserify') // jszip
|
||||
},
|
||||
symlinks: false // Fix local development with `npm link` packages
|
||||
|
|
|
|||
Loading…
Reference in a new issue