Sync with reactjs.org @ b0ccb47f

beta/.gitignore

@@ -35,6 +35,4 @@ yarn-error.log*
 .vercel
 
 # external fonts
-public/fonts/Optimistic_Display_W_Lt.woff2
-public/fonts/Optimistic_Display_W_Md.woff2
-public/fonts/Optimistic_Display_W_Bd.woff2
+public/fonts/Optimistic_*.woff2

beta/next.config.js

@@ -2,8 +2,6 @@
  * Copyright (c) Facebook, Inc. and its affiliates.
  */
 
-const redirects = require('./src/redirects.json');
-
 /**
  * @type {import('next').NextConfig}
  **/
@@ -19,19 +17,6 @@ const nextConfig = {
   env: {
     SANDPACK_BARE_COMPONENTS: process.env.SANDPACK_BARE_COMPONENTS,
   },
-  async redirects() {
-    return redirects.redirects;
-  },
-  // TODO: this causes extra router.replace() on every page.
-  // Let's disable until we figure out what's going on.
-  // rewrites() {
-  //   return [
-  //     {
-  //       source: '/feed.xml',
-  //       destination: '/_next/static/feed.xml',
-  //     },
-  //   ];
-  // },
   webpack: (config, {dev, isServer, ...options}) => {
     if (process.env.ANALYZE) {
       const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');

beta/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "analyze": "ANALYZE=true next build",
     "dev": "next-remote-watch ./src/content",
-    "build": "next build && node ./scripts/generateRSS.js && node ./scripts/generateRedirects.js && node ./scripts/downloadFonts.js",
+    "build": "next build && node ./scripts/downloadFonts.js",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
     "format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",

beta/scripts/downloadFonts.js

@@ -15,3 +15,15 @@ execSync(
 execSync(
   'curl https://conf.reactjs.org/fonts/Optimistic_Display_W_Bd.woff2 --output public/fonts/Optimistic_Display_W_Bd.woff2'
 );
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Display_W_SBd.woff2 --output public/fonts/Optimistic_Display_W_SBd.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Rg.woff2 --output public/fonts/Optimistic_Text_W_Rg.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Md.woff2 --output public/fonts/Optimistic_Text_W_Md.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Bd.woff2 --output public/fonts/Optimistic_Text_W_Bd.woff2'
+);