cleanup

facebook · Feb 7, 2023 · 0e8255f · 0e8255f
1 parent 0b46ee6
commit 0e8255f
Show file tree

Hide file tree

Showing 28 changed files with 520 additions and 355 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -8,7 +8,7 @@ module.exports = {
   jsxBracketSameLine: true,
   trailingComma: 'es5',
   printWidth: 80,
-  parser: 'babel',
+  parser: 'flow',
   arrowParens: 'avoid',
   overrides: [
     {

diff --git a/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js b/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js
@@ -16,13 +16,6 @@ import ReactDOMSharedInternals from 'shared/ReactDOMSharedInternals.js';
 const {Dispatcher} = ReactDOMSharedInternals;
 import {DOCUMENT_NODE} from '../shared/HTMLNodeType';
 import {
-  warnOnMissingHrefAndRel,
-  validatePreloadResourceDifference,
-  validateURLKeyedUpdatedProps,
-  validateStyleResourceDifference,
-  validateScriptResourceDifference,
-  validateLinkPropsForStyleResource,
-  validateLinkPropsForPreloadResource,
   validatePreloadArguments,
   validatePreinitArguments,
 } from '../shared/ReactDOMResourceValidation';
@@ -178,9 +171,8 @@ function preload(href: string, options: PreloadOptions) {
     ownerDocument
   ) {
     const as = options.as;
-    const limitedEscapedHref = escapeSelectorAttributeValueInsideDoubleQuotes(
-      href,
-    );
+    const limitedEscapedHref =
+      escapeSelectorAttributeValueInsideDoubleQuotes(href);
     const preloadKey = `link[rel="preload"][as="${as}"][href="${limitedEscapedHref}"]`;
     let key = preloadKey;
     switch (as) {
@@ -256,9 +248,8 @@ function preinit(href: string, options: PreinitOptions) {
         // matching preload with this href
         const preloadDocument = getDocumentForPreloads();
         if (preloadDocument) {
-          const limitedEscapedHref = escapeSelectorAttributeValueInsideDoubleQuotes(
-            href,
-          );
+          const limitedEscapedHref =
+            escapeSelectorAttributeValueInsideDoubleQuotes(href);
           const preloadKey = `link[rel="preload"][as="${as}"][href="${limitedEscapedHref}"]`;
           let key = preloadKey;
           switch (as) {
@@ -476,8 +467,6 @@ export function getResource(
         const styles = getResourcesFromRoot(resourceRoot).hoistableStyles;
         let resource = styles.get(key);
         if (!resource) {
-          // We asserted this above but Flow can't figure out that the type satisfies
-          const ownerDocument = getDocumentFromRoot(resourceRoot);
           resource = {
             type: 'style',
             instance: null,
@@ -570,9 +559,8 @@ function styleTagPropsFromRawProps(
 }
 
 function getStyleKey(href: string) {
-  const limitedEscapedHref = escapeSelectorAttributeValueInsideDoubleQuotes(
-    href,
-  );
+  const limitedEscapedHref =
+    escapeSelectorAttributeValueInsideDoubleQuotes(href);
   return `href="${limitedEscapedHref}"`;
 }
 
@@ -609,9 +597,6 @@ function preloadStylesheet(
     // There is no matching stylesheet instance in the Document.
     // We will insert a preload now to kick off loading because
     // we expect this stylesheet to commit
-    const limitedEscapedHref = escapeSelectorAttributeValueInsideDoubleQuotes(
-      preloadProps.href,
-    );
     if (
       null ===
       ownerDocument.querySelector(getPreloadStylesheetSelectorFromKey(key))

diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js
@@ -463,10 +463,7 @@ export const scheduleMicrotask: any =
     ? queueMicrotask
     : typeof localPromise !== 'undefined'
     ? callback =>
-        localPromise
-          .resolve(null)
-          .then(callback)
-          .catch(handleErrorInNextTick)
+        localPromise.resolve(null).then(callback).catch(handleErrorInNextTick)
     : scheduleTimeout; // TODO: Determine the best fallback here.
 
 function handleErrorInNextTick(error: any) {
@@ -1591,8 +1588,8 @@ export function isHostHoistableType(
   if (__DEV__) {
     const hostContextDev: HostContextDev = (hostContext: any);
     // We can only render resources when we are not within the host container context
-    outsideHostContainerContext = !hostContextDev.ancestorInfo
-      .containerTagInScope;
+    outsideHostContainerContext =
+      !hostContextDev.ancestorInfo.containerTagInScope;
     namespace = hostContextDev.namespace;
   } else {
     const hostContextProd: HostContextProd = (hostContext: any);
@@ -1623,22 +1620,40 @@ export function isHostHoistableType(
       );
     }
     case 'link': {
-      const {onLoad, onError} = props;
-      if (onLoad || onError) {
+      const {onLoad, onError, rel, href} = props;
+      if (
+        namespace === SVG_NAMESPACE ||
+        typeof rel !== 'string' ||
+        typeof href !== 'string' ||
+        href === '' ||
+        onLoad ||
+        onError
+      ) {
         if (__DEV__) {
           if (outsideHostContainerContext) {
-            console.error(
-              'Cannot render a <link> with onLoad or onError listeners outside the main document.' +
-                ' Try removing onLoad={...} and onError={...} or moving it into the root <head> tag or' +
-                ' somewhere in the <body>.',
-            );
+            if (
+              typeof rel !== 'string' ||
+              typeof href !== 'string' ||
+              href === ''
+            ) {
+              console.error(
+                'Cannot render a <link> outside the main document without a `rel` and `href` prop.' +
+                  ' Try adding a `rel` and/or `href` prop to this <link> or moving the link into the <head> tag',
+              );
+            } else if (onError || onLoad) {
+              console.error(
+                'Cannot render a <link> with onLoad or onError listeners outside the main document.' +
+                  ' Try removing onLoad={...} and onError={...} or moving it into the root <head> tag or' +
+                  ' somewhere in the <body>.',
+              );
+            }
           }
         }
         return false;
       }
       switch (props.rel) {
         case 'stylesheet': {
-          const {href, precedence, disabled} = props;
+          const {precedence, disabled} = props;
           if (__DEV__) {
             validateLinkPropsForStyleResource(props);
             if (typeof precedence !== 'string') {
@@ -1650,12 +1665,7 @@ export function isHostHoistableType(
               }
             }
           }
-          return (
-            namespace !== SVG_NAMESPACE &&
-            typeof href === 'string' &&
-            typeof precedence === 'string' &&
-            disabled == null
-          );
+          return typeof precedence === 'string' && disabled == null;
         }
         default: {
           return true;