Merge branch 'master' into develop

src/routes.json

@@ -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",

src/views/credits/credits.jsx

@@ -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,

src/views/credits/people.json

@@ -39,11 +39,6 @@
         "userId": 85830206,
         "name": "Ashlee"
     },
-    {
-        "userName": "bassa846",
-        "userId": 77575217,
-        "name": "Ashley"
-    },
     {
         "userName": "wheelsonfire",
         "userId": 10001044,

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({}, {