copy fix in <style> precedence error

ztanner · ztanner · commit 5e7e9f9bef91 · 2024-11-12T13:50:18.000-08:00
diff --git a/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js b/packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js
@@ -3137,10 +3137,9 @@ export function isHostHoistableType(
             console.error(
               'Cannot render a <style> outside the main document without knowing its precedence and a unique href key.' +
                 ' React can hoist and deduplicate <style> tags if you provide a `precedence` prop along with an `href` prop that' +
-                ' does not conflic with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags. ' +
+                ' does not conflict with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags. ' +
                 ' Note that hoisting <style> tags is considered an advanced feature that most will not use directly.' +
-                ' Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`, or move the <style>' +
-                ' to the <style> tag.',
+                ' Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`.',
             );
           }
         }
diff --git a/packages/react-dom/src/__tests__/ReactDOMFloat-test.js b/packages/react-dom/src/__tests__/ReactDOMFloat-test.js
@@ -282,8 +282,8 @@ describe('ReactDOMFloat', () => {
     return children.length === 0
       ? undefined
       : children.length === 1
-        ? children[0]
-        : children;
+      ? children[0]
+      : children;
   }
 
   function BlockedOn({value, children}) {
@@ -551,8 +551,8 @@ describe('ReactDOMFloat', () => {
       );
       await waitForAll([]);
     }).toErrorDev([
-      'Cannot render a <style> outside the main document without knowing its precedence and a unique href key. React can hoist and deduplicate <style> tags if you provide a `precedence` prop along with an `href` prop that does not conflic with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags.  Note that hoisting <style> tags is considered an advanced feature that most will not use directly. Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`, or move the <style> to the <style> tag.',
-      'In HTML, <style> cannot be a child of <html>.',
+      'Cannot render a <style> outside the main document without knowing its precedence and a unique href key. React can hoist and deduplicate <style> tags if you provide a `precedence` prop along with an `href` prop that does not conflict with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags.  Note that hoisting <style> tags is considered an advanced feature that most will not use directly. Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`.',
+      'In HTML, <style> cannot be a child of <html>',
     ]);
 
     await expect(async () => {

Original file line number	Diff line number	Diff line change
`@@ -3137,10 +3137,9 @@ export function isHostHoistableType(`
`3137`	`3137`	`console.error(`
`3138`	`3138`	`'Cannot render a <style> outside the main document without knowing its precedence and a unique href key.' +`
`3139`	`3139`	' React can hoist and deduplicate <style> tags if you provide a `precedence` prop along with an `href` prop that' +
`3140`		- ' does not conflic with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags. ' +
	`3140`	+ ' does not conflict with the `href` values used in any other hoisted <style> or <link rel="stylesheet" ...> tags. ' +
`3141`	`3141`	`' Note that hoisting <style> tags is considered an advanced feature that most will not use directly.' +`
`3142`		- ' Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`, or move the <style>' +
`3143`		`- ' to the <style> tag.',`
	`3142`	+ ' Consider moving the <style> tag to the <head> or consider adding a `precedence="default"` and `href="some unique resource identifier"`.',
`3144`	`3143`	`);`
`3145`	`3144`	`}`
`3146`	`3145`	`}`