From 6b7ec3cbe91b181ae60318aae2ccf48414895379 Mon Sep 17 00:00:00 2001 From: Colby Gutierrez-Kraybill Date: Wed, 5 Jun 2024 20:07:39 -0400 Subject: [PATCH 1/5] Need to make some redirect room --- src/routes.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/routes.json b/src/routes.json index ffefbbad7..26a2c928a 100644 --- a/src/routes.json +++ b/src/routes.json @@ -103,12 +103,6 @@ "title": "Scratch Conferences", "viewportWidth": "device-width" }, - { - "name": "conference-index-2020", - "pattern": "^/conference/2020/?$", - "routeAlias": "/conference(?!/20[1-2][0-9])", - "redirect": "/conference/2021" - }, { "name": "conference-index-2021", "pattern": "^/conference/2021/?$", @@ -248,12 +242,6 @@ "routeAlias": "/parents/", "redirect": "RADISH_URL/parents-caregivers/" }, - { - "name": "preview-faq-redirect", - "pattern": "^/preview-faq/?$", - "routeAlias": "/preview-faq", - "redirect": "/3faq" - }, { "name": "privacypolicy", "pattern": "^/privacy_policy/?$", @@ -504,12 +492,6 @@ "routeAlias": "/hoc/?\\??", "redirect": "/ideas" }, - { - "name": "hoc2014-redirect", - "pattern": "^/hoc2014/?(\\?.*)?$", - "routeAlias": "/hoc2014/?\\??", - "redirect": "/ideas" - }, { "name": "info-redirect", "pattern": "^/info/?(\\?.*)?$", From e9b390f922855f92be63ee86d200c7afc1878b18 Mon Sep 17 00:00:00 2001 From: Colby Gutierrez-Kraybill Date: Wed, 5 Jun 2024 20:21:19 -0400 Subject: [PATCH 2/5] This time will work for sure! --- src/routes.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/routes.json b/src/routes.json index 26a2c928a..5a2428470 100644 --- a/src/routes.json +++ b/src/routes.json @@ -421,12 +421,6 @@ "view": "boost/boost", "title": "LEGO BOOST" }, - { - "name":"3-faq-redirect", - "pattern": "^/3faq/?$", - "routeAlias": "/3faq/?$", - "redirect": "/faq#scratch3" - }, { "name" : "credits-redirect", "pattern": "^/info/credits/?$", From b9a45c0a5e7fa970bdb2f886ec1c9311cf9c667a Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Wed, 5 Jun 2024 19:44:34 -0700 Subject: [PATCH 3/5] fix: temporarily revert all routing changes for the new site --- src/routes.json | 59 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/src/routes.json b/src/routes.json index 5a2428470..06e47904d 100644 --- a/src/routes.json +++ b/src/routes.json @@ -3,7 +3,8 @@ "name": "about", "pattern": "^/about/?$", "routeAlias": "/about/?$", - "redirect": "RADISH_URL/" + "view": "about/about", + "title": "About" }, { "name": "annual-report", @@ -103,6 +104,12 @@ "title": "Scratch Conferences", "viewportWidth": "device-width" }, + { + "name": "conference-index-2020", + "pattern": "^/conference/2020/?$", + "routeAlias": "/conference(?!/20[1-2][0-9])", + "redirect": "/conference/2021" + }, { "name": "conference-index-2021", "pattern": "^/conference/2021/?$", @@ -127,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", @@ -152,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", @@ -240,13 +254,21 @@ "name": "parents", "pattern": "^/parents/?(\\?.*)?$", "routeAlias": "/parents/", - "redirect": "RADISH_URL/parents-caregivers/" + "view": "parents/parents", + "title": "For Parents" + }, + { + "name": "preview-faq-redirect", + "pattern": "^/preview-faq/?$", + "routeAlias": "/preview-faq", + "redirect": "/3faq" }, { "name": "privacypolicy", "pattern": "^/privacy_policy/?$", "routeAlias": "/privacy_policy/?$", - "redirect": "RADISH_URL/privacy-policy/" + "view": "privacypolicy/privacypolicy", + "title": "Privacy Policy" }, { "name": "privacypolicy-apps", @@ -377,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", @@ -421,11 +444,17 @@ "view": "boost/boost", "title": "LEGO BOOST" }, + { + "name":"3-faq-redirect", + "pattern": "^/3faq/?$", + "routeAlias": "/3faq/?$", + "redirect": "/faq#scratch3" + }, { "name" : "credits-redirect", "pattern": "^/info/credits/?$", "routeAlias": "/info/(cards|credits|faq|donate)/?$", - "redirect": "RADISH_URL/our-team-credits/" + "redirect" : "/credits" }, { "name" : "faq-redirect", @@ -486,6 +515,12 @@ "routeAlias": "/hoc/?\\??", "redirect": "/ideas" }, + { + "name": "hoc2014-redirect", + "pattern": "^/hoc2014/?(\\?.*)?$", + "routeAlias": "/hoc2014/?\\??", + "redirect": "/ideas" + }, { "name": "info-redirect", "pattern": "^/info/?(\\?.*)?$", @@ -514,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", From 4153ad6538bc9e848260980942755615f3a15fa6 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:44:36 -0700 Subject: [PATCH 4/5] fix: correct Buffer polyfill in webpack config --- webpack.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index becf4eb94..79fb72fee 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -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 @@ -200,6 +200,9 @@ module.exports = { new EmitFilePlugin({ filename: 'version.txt', content: getVersionId + }), + new webpack.ProvidePlugin({ + Buffer: ['buffer', 'Buffer'] }) ].concat(pageRoutes .map(route => new HtmlWebpackPlugin(defaults({}, { From 408403d42a3ca09438aa46f647811731e8bb9bf8 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Fri, 28 Jun 2024 07:57:35 -0700 Subject: [PATCH 5/5] fix: credits update --- src/views/credits/credits.jsx | 6 +++--- src/views/credits/people.json | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index e399bf2b2..16d832e94 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -117,9 +117,9 @@ const Credits = () => (

- 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, diff --git a/src/views/credits/people.json b/src/views/credits/people.json index 19ce8d837..785c7ed19 100644 --- a/src/views/credits/people.json +++ b/src/views/credits/people.json @@ -39,11 +39,6 @@ "userId": 85830206, "name": "Ashlee" }, - { - "userName": "bassa846", - "userId": 77575217, - "name": "Ashley" - }, { "userName": "wheelsonfire", "userId": 10001044,