Merge branch 'main' into sync-303ecae3

package.json

@@ -91,7 +91,7 @@
  "retext": "^7.0.1",
  "retext-smartypants": "^4.0.0",
  "rss": "^1.2.2",
- "tailwindcss": "^3.3.2",
+ "tailwindcss": "^3.4.1",
  "typescript": "^4.0.2",
  "unist-util-visit": "^2.0.3",
  "webpack-bundle-analyzer": "^4.5.0"

plugins/remark-smartypants.js

@@ -1,3 +1,8 @@
+/*!
+ * Based on 'silvenon/remark-smartypants'
+ * https://github.com/silvenon/remark-smartypants/pull/80
+ */
+
 const visit = require('unist-util-visit');
 const retext = require('retext');
 const smartypants = require('retext-smartypants');
@@ -9,12 +14,48 @@ function check(parent) {
 }
 
 module.exports = function (options) {
- const processor = retext().use(smartypants, options);
+ const processor = retext().use(smartypants, {
+ ...options,
+ // Do not replace ellipses, dashes, backticks because they change string
+ // length, and we couldn't guarantee right splice of text in second visit of
+ // tree
+ ellipses: false,
+ dashes: false,
+ backticks: false,
+ });
+
+ const processor2 = retext().use(smartypants, {
+ ...options,
+ // Do not replace quotes because they are already replaced in the first
+ // processor
+ quotes: false,
+ });
 
  function transformer(tree) {
- visit(tree, 'text', (node, index, parent) => {
- if (check(parent)) node.value = String(processor.processSync(node.value));
+ let allText = '';
+ let startIndex = 0;
+ const textOrInlineCodeNodes = [];
+
+ visit(tree, ['text', 'inlineCode'], (node, _, parent) => {
+ if (check(parent)) {
+ if (node.type === 'text') allText += node.value;
+ // for the case when inlineCode contains just one part of quote: `foo'bar`
+ else allText += 'A'.repeat(node.value.length);
+ textOrInlineCodeNodes.push(node);
+ }
  });
+
+ // Concat all text into one string, to properly replace quotes around non-"text" nodes
+ allText = String(processor.processSync(allText));
+
+ for (const node of textOrInlineCodeNodes) {
+ const endIndex = startIndex + node.value.length;
+ if (node.type === 'text') {
+ const processedText = allText.slice(startIndex, endIndex);
+ node.value = String(processor2.processSync(processedText));
+ }
+ startIndex = endIndex;
+ }
  }
 
  return transformer;

src/components/DocsFooter.tsx

@@ -27,7 +27,7 @@ export const DocsPageFooter = memo<DocsPageFooterProps>(
  <>
  {prevRoute?.path || nextRoute?.path ? (
  <>
- <div className="max-w-7xl mx-auto grid grid-cols-1 md:grid-cols-2 gap-4 py-4 md:py-12">
+ <div className="grid grid-cols-1 gap-4 py-4 mx-auto max-w-7xl md:grid-cols-2 md:py-12">
  {prevRoute?.path ? (
  <FooterLink
  type="Previous"
@@ -69,21 +69,23 @@ function FooterLink({
  <NextLink
  href={href}
  className={cn(
- 'flex gap-x-4 md:gap-x-6 items-center w-full md:w-80 px-4 md:px-5 py-6 border-2 border-transparent text-base leading-base text-link dark:text-link-dark rounded-lg group focus:text-link dark:focus:text-link-dark focus:bg-highlight focus:border-link dark:focus:bg-highlight-dark dark:focus:border-link-dark focus:border-opacity-100 focus:border-2 focus:ring-1 focus:ring-offset-4 focus:ring-blue-40 active:ring-0 active:ring-offset-0 hover:bg-gray-5 dark:hover:bg-gray-80',
+ 'flex gap-x-4 md:gap-x-6 items-center w-full md:min-w-80 md:w-fit md:max-w-md px-4 md:px-5 py-6 border-2 border-transparent text-base leading-base text-link dark:text-link-dark rounded-lg group focus:text-link dark:focus:text-link-dark focus:bg-highlight focus:border-link dark:focus:bg-highlight-dark dark:focus:border-link-dark focus:border-opacity-100 focus:border-2 focus:ring-1 focus:ring-offset-4 focus:ring-blue-40 active:ring-0 active:ring-offset-0 hover:bg-gray-5 dark:hover:bg-gray-80',
  {
  'flex-row-reverse justify-self-end text-end': type === 'Next',
  }
  )}>
  <IconNavArrow
- className="text-tertiary dark:text-tertiary-dark inline group-focus:text-link dark:group-focus:text-link-dark"
+ className="inline text-tertiary dark:text-tertiary-dark group-focus:text-link dark:group-focus:text-link-dark"
  displayDirection={type === 'Previous' ? 'start' : 'end'}
  />
- <span>
- <span className="block no-underline text-sm tracking-wide text-secondary dark:text-secondary-dark uppercase font-bold group-focus:text-link dark:group-focus:text-link-dark group-focus:text-opacity-100">
+ <div className="flex flex-col overflow-hidden">
+ <span className="text-sm font-bold tracking-wide no-underline uppercase text-secondary dark:text-secondary-dark group-focus:text-link dark:group-focus:text-link-dark group-focus:text-opacity-100">
  {type}
  </span>
- <span className="block text-lg group-hover:underline">{title}</span>
- </span>
+ <span className="text-lg break-words group-hover:underline">
+ {title}
+ </span>
+ </div>
  </NextLink>
  );
 }

src/components/ErrorDecoderContext.tsx

@@ -0,0 +1,23 @@
+// Error Decoder requires reading pregenerated error message from getStaticProps,
+// but MDX component doesn't support props. So we use React Context to populate
+// the value without prop-drilling.
+// TODO: Replace with React.cache + React.use when migrating to Next.js App Router
+
+import {createContext, useContext} from 'react';
+
+const notInErrorDecoderContext = Symbol('not in error decoder context');
+
+export const ErrorDecoderContext = createContext<
+ | {errorMessage: string | null; errorCode: string | null}
+ | typeof notInErrorDecoderContext
+>(notInErrorDecoderContext);
+
+export const useErrorDecoderParams = () => {
+ const params = useContext(ErrorDecoderContext);
+
+ if (params === notInErrorDecoderContext) {
+ throw new Error('useErrorDecoder must be used in error decoder pages only');
+ }
+
+ return params;
+};

src/components/Icon/IconGitHub.tsx

@@ -9,8 +9,8 @@ export const IconGitHub = memo<JSX.IntrinsicElements['svg']>(
  return (
  <svg
  xmlns="http://www.w3.org/2000/svg"
- width="1.33em"
- height="1.33em"
+ width="1.5em"
+ height="1.5em"
  viewBox="0 -2 24 24"
  fill="currentColor"
  {...props}>

src/components/Icon/IconThreads.tsx

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ */
+
+import {memo} from 'react';
+
+export const IconThreads = memo<JSX.IntrinsicElements['svg']>(
+ function IconThreads(props) {
+ return (
+ <svg
+ aria-label="Threads"
+ viewBox="0 0 192 192"
+ height="1.40em"
+ width="1.40em"
+ fill="currentColor"
+ xmlns="http://www.w3.org/2000/svg"
+ {...props}>
+ <path
+ className="x19hqcy"
+ d="M141.537 88.9883C140.71 88.5919 139.87 88.2104 139.019 87.8451C137.537 60.5382 122.616 44.905 97.5619 44.745C97.4484 44.7443 97.3355 44.7443 97.222 44.7443C82.2364 44.7443 69.7731 51.1409 62.102 62.7807L75.881 72.2328C81.6116 63.5383 90.6052 61.6848 97.2286 61.6848C97.3051 61.6848 97.3819 61.6848 97.4576 61.6855C105.707 61.7381 111.932 64.1366 115.961 68.814C118.893 72.2193 120.854 76.925 121.825 82.8638C114.511 81.6207 106.601 81.2385 98.145 81.7233C74.3247 83.0954 59.0111 96.9879 60.0396 116.292C60.5615 126.084 65.4397 134.508 73.775 140.011C80.8224 144.663 89.899 146.938 99.3323 146.423C111.79 145.74 121.563 140.987 128.381 132.296C133.559 125.696 136.834 117.143 138.28 106.366C144.217 109.949 148.617 114.664 151.047 120.332C155.179 129.967 155.42 145.8 142.501 158.708C131.182 170.016 117.576 174.908 97.0135 175.059C74.2042 174.89 56.9538 167.575 45.7381 153.317C35.2355 139.966 29.8077 120.682 29.6052 96C29.8077 71.3178 35.2355 52.0336 45.7381 38.6827C56.9538 24.4249 74.2039 17.11 97.0132 16.9405C119.988 17.1113 137.539 24.4614 149.184 38.788C154.894 45.8136 159.199 54.6488 162.037 64.9503L178.184 60.6422C174.744 47.9622 169.331 37.0357 161.965 27.974C147.036 9.60668 125.202 0.195148 97.0695 0H96.9569C68.8816 0.19447 47.2921 9.6418 32.7883 28.0793C19.8819 44.4864 13.2244 67.3157 13.0007 95.9325L13 96L13.0007 96.0675C13.2244 124.684 19.8819 147.514 32.7883 163.921C47.2921 182.358 68.8816 191.806 96.9569 192H97.0695C122.03 191.827 139.624 185.292 154.118 170.811C173.081 151.866 172.51 128.119 166.26 113.541C161.776 103.087 153.227 94.5962 141.537 88.9883ZM98.4405 129.507C88.0005 130.095 77.1544 125.409 76.6196 115.372C76.2232 107.93 81.9158 99.626 99.0812 98.6368C101.047 98.5234 102.976 98.468 104.871 98.468C111.106 98.468 116.939 99.0737 122.242 100.233C120.264 124.935 108.662 128.946 98.4405 129.507Z"></path>
+ </svg>
+ );
+ }
+);

src/components/Layout/Feedback.tsx

@@ -4,6 +4,7 @@
 
 import {useState} from 'react';
 import {useRouter} from 'next/router';
+import cn from 'classnames';
 
 export function Feedback({onSubmit = () => {}}: {onSubmit?: () => void}) {
  const {asPath} = useRouter();
@@ -60,14 +61,18 @@ function sendGAEvent(isPositive: boolean) {
 function SendFeedback({onSubmit}: {onSubmit: () => void}) {
  const [isSubmitted, setIsSubmitted] = useState(false);
  return (
- <div className="max-w-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex">
- <p className="w-full font-bold text-primary dark:text-primary-dark text-lg me-4">
+ <div
+ className={cn(
+ 'max-w-custom-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex',
+ {exit: isSubmitted}
+ )}>
+ <p className="w-full text-lg font-bold text-primary dark:text-primary-dark me-4">
  {isSubmitted ? 'Thank you for your feedback!' : 'Is this page useful?'}
  </p>
  {!isSubmitted && (
  <button
  aria-label="Yes"
- className="bg-secondary-button dark:bg-secondary-button-dark rounded-lg text-primary dark:text-primary-dark px-3 me-2"
+ className="px-3 rounded-lg bg-secondary-button dark:bg-secondary-button-dark text-primary dark:text-primary-dark me-2"
  onClick={() => {
  setIsSubmitted(true);
  onSubmit();
@@ -79,7 +84,7 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
  {!isSubmitted && (
  <button
  aria-label="No"
- className="bg-secondary-button dark:bg-secondary-button-dark rounded-lg text-primary dark:text-primary-dark px-3"
+ className="px-3 rounded-lg bg-secondary-button dark:bg-secondary-button-dark text-primary dark:text-primary-dark"
  onClick={() => {
  setIsSubmitted(true);
  onSubmit();

src/components/Layout/HomeContent.js

@@ -1499,7 +1499,7 @@ function ConferenceLayout({conf, children}) {
  navigate(e.target.value);
  });
  }}
- className="appearance-none pe-8 bg-transparent text-primary-dark text-2xl font-bold mb-0.5"
+ className="appearance-none pe-8 ps-2 bg-transparent text-primary-dark text-2xl font-bold mb-0.5"
  style={{
  backgroundSize: '4px 4px, 4px 4px',
  backgroundRepeat: 'no-repeat',
@@ -1508,8 +1508,16 @@ function ConferenceLayout({conf, children}) {
  backgroundImage:
  'linear-gradient(45deg,transparent 50%,currentColor 50%),linear-gradient(135deg,currentColor 50%,transparent 50%)',
  }}>
- <option value="react-conf-2021">React Conf 2021</option>
- <option value="react-conf-2019">React Conf 2019</option>
+ <option
+ className="bg-wash dark:bg-wash-dark text-primary dark:text-primary-dark"
+ value="react-conf-2021">
+ React Conf 2021
+ </option>
+ <option
+ className="bg-wash dark:bg-wash-dark text-primary dark:text-primary-dark"
+ value="react-conf-2019">
+ React Conf 2019
+ </option>
  </select>
  </Cover>
  <div className="px-4 pb-4" key={conf.id}>

src/components/Layout/Page.tsx

@@ -130,7 +130,7 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
  )}>
  {showSidebar && (
  <div className="lg:-mt-16">
- <div className="lg:pt-16 fixed lg:sticky top-0 start-0 end-0 py-0 shadow lg:shadow-none">
+ <div className="fixed top-0 py-0 shadow lg:pt-16 lg:sticky start-0 end-0 lg:shadow-none">
  <SidebarNav
  key={section}
  routeTree={routeTree}
@@ -143,7 +143,7 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
  <Suspense fallback={null}>
  <main className="min-w-0 isolate">
  <article
- className="break-words font-normal text-primary dark:text-primary-dark"
+ className="font-normal break-words text-primary dark:text-primary-dark"
  key={asPath}>
  {content}
  </article>
@@ -153,14 +153,14 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
  isHomePage && 'bg-wash dark:bg-gray-95 mt-[-1px]'
  )}>
  {!isHomePage && (
- <div className="mx-auto w-full px-5 sm:px-12 md:px-12 pt-10 md:pt-12 lg:pt-10">
+ <div className="w-full px-5 pt-10 mx-auto sm:px-12 md:px-12 md:pt-12 lg:pt-10">
  {
- <hr className="max-w-7xl mx-auto border-border dark:border-border-dark" />
+ <hr className="mx-auto max-w-7xl border-border dark:border-border-dark" />
  }
  {showSurvey && (
  <>
- <div className="flex flex-col items-center m-4 p-4">
- <p className="font-bold text-primary dark:text-primary-dark text-lg mb-4">
+ <div className="flex flex-col items-center p-4 m-4">
+ <p className="mb-4 text-lg font-bold text-primary dark:text-primary-dark">
  How do you like these docs?
  </p>
  <div>
@@ -178,7 +178,7 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
  </ButtonLink>
  </div>
  </div>
- <hr className="max-w-7xl mx-auto border-border dark:border-border-dark" />
+ <hr className="mx-auto max-w-7xl border-border dark:border-border-dark" />
  </>
  )}
  </div>
@@ -193,7 +193,7 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
  </div>
  </main>
  </Suspense>
- <div className="-mt-16 hidden lg:max-w-xs 2xl:block">
+ <div className="hidden -mt-16 lg:max-w-custom-xs 2xl:block">
  {showToc && toc.length > 0 && <Toc headings={toc} key={asPath} />}
  </div>
  </div>

src/components/Layout/SidebarNav/SidebarNav.tsx

@@ -40,12 +40,12 @@ export default function SidebarNav({
  }}>
  <aside
  className={cn(
- `lg:grow flex-col w-full pb-8 lg:pb-0 lg:max-w-xs z-10 hidden lg:block`
+ `lg:grow flex-col w-full pb-8 lg:pb-0 lg:max-w-custom-xs z-10 hidden lg:block`
  )}>
  <nav
  role="navigation"
  style={{'--bg-opacity': '.2'} as React.CSSProperties} // Need to cast here because CSS vars aren't considered valid in TS types (cuz they could be anything)
- className="w-full lg:h-auto grow pe-0 lg:pe-5 pt-6 lg:pb-16 md:pt-4 lg:pt-4 scrolling-touch scrolling-gpu">
+ className="w-full pt-6 scrolling-touch lg:h-auto grow pe-0 lg:pe-5 lg:pb-16 md:pt-4 lg:pt-4 scrolling-gpu">
  {/* No fallback UI so need to be careful not to suspend directly inside. */}
  <Suspense fallback={null}>
  <SidebarRouteTree