From 269610e2daeddea3969bb68b7b514b362cceffec Mon Sep 17 00:00:00 2001 From: kassens Date: Fri, 13 Jan 2023 21:09:15 +0000 Subject: [PATCH] [www] set enableTrustedTypesIntegration to false (#25997) This isn't configured to a dynamic value on www, so hardcode here to false. DiffTrain build for [379dd741e9aabefb880af1794d3c828984f9e143](https://github.com/facebook/react/commit/379dd741e9aabefb880af1794d3c828984f9e143) [View git log for this commit](https://github.com/facebook/react/commits/379dd741e9aabefb880af1794d3c828984f9e143) --- .../facebook-www/JSXDEVRuntime-dev.classic.js | 2 - .../facebook-www/JSXDEVRuntime-dev.modern.js | 2 - compiled/facebook-www/REVISION | 2 +- compiled/facebook-www/REVISION_TRANSFORMS | 2 +- compiled/facebook-www/React-dev.classic.js | 4 +- compiled/facebook-www/React-dev.modern.js | 4 +- compiled/facebook-www/React-prod.classic.js | 2 +- compiled/facebook-www/React-prod.modern.js | 2 +- .../facebook-www/React-profiling.classic.js | 2 +- .../facebook-www/React-profiling.modern.js | 2 +- compiled/facebook-www/ReactART-dev.classic.js | 4 +- compiled/facebook-www/ReactART-dev.modern.js | 4 +- .../facebook-www/ReactART-prod.classic.js | 4 +- compiled/facebook-www/ReactART-prod.modern.js | 4 +- compiled/facebook-www/ReactDOM-dev.classic.js | 46 ++----------------- compiled/facebook-www/ReactDOM-dev.modern.js | 46 ++----------------- .../facebook-www/ReactDOM-prod.classic.js | 15 ++---- compiled/facebook-www/ReactDOM-prod.modern.js | 15 ++---- .../ReactDOM-profiling.classic.js | 15 ++---- .../facebook-www/ReactDOM-profiling.modern.js | 15 ++---- .../ReactDOMServer-dev.classic.js | 4 +- .../facebook-www/ReactDOMServer-dev.modern.js | 4 +- .../ReactDOMServer-prod.classic.js | 2 +- .../ReactDOMServer-prod.modern.js | 2 +- .../ReactDOMServerStreaming-dev.modern.js | 2 - .../ReactDOMTesting-dev.classic.js | 2 +- .../ReactDOMTesting-dev.modern.js | 2 +- .../ReactDOMTesting-prod.classic.js | 6 +-- .../ReactDOMTesting-prod.modern.js | 6 +-- .../ReactFlightDOMRelayServer-dev.classic.js | 2 - .../ReactFlightDOMRelayServer-dev.modern.js | 2 - compiled/facebook-www/ReactIs-dev.classic.js | 2 - compiled/facebook-www/ReactIs-dev.modern.js | 2 - .../ReactTestRenderer-dev.classic.js | 2 +- .../ReactTestRenderer-dev.modern.js | 2 +- .../ReactTestUtils-dev.classic.js | 2 - .../facebook-www/ReactTestUtils-dev.modern.js | 2 - 37 files changed, 56 insertions(+), 182 deletions(-) diff --git a/compiled/facebook-www/JSXDEVRuntime-dev.classic.js b/compiled/facebook-www/JSXDEVRuntime-dev.classic.js index 89f7a09f3d..7fdb7d4480 100644 --- a/compiled/facebook-www/JSXDEVRuntime-dev.classic.js +++ b/compiled/facebook-www/JSXDEVRuntime-dev.classic.js @@ -107,8 +107,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/JSXDEVRuntime-dev.modern.js b/compiled/facebook-www/JSXDEVRuntime-dev.modern.js index f6590fbd46..0ca64ca0c8 100644 --- a/compiled/facebook-www/JSXDEVRuntime-dev.modern.js +++ b/compiled/facebook-www/JSXDEVRuntime-dev.modern.js @@ -107,8 +107,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION index 2403a4bd41..48b6f70762 100644 --- a/compiled/facebook-www/REVISION +++ b/compiled/facebook-www/REVISION @@ -1 +1 @@ -489d00fa61dd3c406b1c053a7a039d97f7fe213f +379dd741e9aabefb880af1794d3c828984f9e143 diff --git a/compiled/facebook-www/REVISION_TRANSFORMS b/compiled/facebook-www/REVISION_TRANSFORMS index 2403a4bd41..48b6f70762 100644 --- a/compiled/facebook-www/REVISION_TRANSFORMS +++ b/compiled/facebook-www/REVISION_TRANSFORMS @@ -1 +1 @@ -489d00fa61dd3c406b1c053a7a039d97f7fe213f +379dd741e9aabefb880af1794d3c828984f9e143 diff --git a/compiled/facebook-www/React-dev.classic.js b/compiled/facebook-www/React-dev.classic.js index 896bd39592..eac631a25a 100644 --- a/compiled/facebook-www/React-dev.classic.js +++ b/compiled/facebook-www/React-dev.classic.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-www-classic-489d00fa6-20230112"; +var ReactVersion = "18.3.0-www-classic-379dd741e-20230113"; // ATTENTION // When adding new symbols to this file, @@ -478,8 +478,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/React-dev.modern.js b/compiled/facebook-www/React-dev.modern.js index e16941c70b..340d12f84f 100644 --- a/compiled/facebook-www/React-dev.modern.js +++ b/compiled/facebook-www/React-dev.modern.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-www-modern-489d00fa6-20230112"; +var ReactVersion = "18.3.0-www-modern-379dd741e-20230113"; // ATTENTION // When adding new symbols to this file, @@ -478,8 +478,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/React-prod.classic.js b/compiled/facebook-www/React-prod.classic.js index 4c517c53ad..4eadc2b343 100644 --- a/compiled/facebook-www/React-prod.classic.js +++ b/compiled/facebook-www/React-prod.classic.js @@ -643,4 +643,4 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-classic-489d00fa6-20230112"; +exports.version = "18.3.0-www-classic-379dd741e-20230113"; diff --git a/compiled/facebook-www/React-prod.modern.js b/compiled/facebook-www/React-prod.modern.js index 2adde415ef..4e487b295e 100644 --- a/compiled/facebook-www/React-prod.modern.js +++ b/compiled/facebook-www/React-prod.modern.js @@ -635,4 +635,4 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-modern-489d00fa6-20230112"; +exports.version = "18.3.0-www-modern-379dd741e-20230113"; diff --git a/compiled/facebook-www/React-profiling.classic.js b/compiled/facebook-www/React-profiling.classic.js index 9a18be0f5e..2ce5a395f3 100644 --- a/compiled/facebook-www/React-profiling.classic.js +++ b/compiled/facebook-www/React-profiling.classic.js @@ -654,7 +654,7 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-classic-489d00fa6-20230112"; +exports.version = "18.3.0-www-classic-379dd741e-20230113"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/React-profiling.modern.js b/compiled/facebook-www/React-profiling.modern.js index a5477cd2cf..a64920dcac 100644 --- a/compiled/facebook-www/React-profiling.modern.js +++ b/compiled/facebook-www/React-profiling.modern.js @@ -646,7 +646,7 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-modern-489d00fa6-20230112"; +exports.version = "18.3.0-www-modern-379dd741e-20230113"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactART-dev.classic.js b/compiled/facebook-www/ReactART-dev.classic.js index eb9509c2b4..63f493ef2e 100644 --- a/compiled/facebook-www/ReactART-dev.classic.js +++ b/compiled/facebook-www/ReactART-dev.classic.js @@ -69,7 +69,7 @@ function _assertThisInitialized(self) { return self; } -var ReactVersion = "18.3.0-www-classic-489d00fa6-20230112"; +var ReactVersion = "18.3.0-www-classic-379dd741e-20230113"; var LegacyRoot = 0; var ConcurrentRoot = 1; @@ -167,8 +167,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/ReactART-dev.modern.js b/compiled/facebook-www/ReactART-dev.modern.js index c06c3695bc..4f624db7cd 100644 --- a/compiled/facebook-www/ReactART-dev.modern.js +++ b/compiled/facebook-www/ReactART-dev.modern.js @@ -69,7 +69,7 @@ function _assertThisInitialized(self) { return self; } -var ReactVersion = "18.3.0-www-modern-489d00fa6-20230112"; +var ReactVersion = "18.3.0-www-modern-379dd741e-20230113"; var LegacyRoot = 0; var ConcurrentRoot = 1; @@ -167,8 +167,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js index 4b551e95ef..0cf25f08fb 100644 --- a/compiled/facebook-www/ReactART-prod.classic.js +++ b/compiled/facebook-www/ReactART-prod.classic.js @@ -9804,7 +9804,7 @@ var slice = Array.prototype.slice, return null; }, bundleType: 0, - version: "18.3.0-www-classic-489d00fa6-20230112", + version: "18.3.0-www-classic-379dd741e-20230113", rendererPackageName: "react-art" }; var internals$jscomp$inline_1318 = { @@ -9835,7 +9835,7 @@ var internals$jscomp$inline_1318 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-489d00fa6-20230112" + reconcilerVersion: "18.3.0-next-379dd741e-20230113" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js index 38b5865fbe..9d6702d57d 100644 --- a/compiled/facebook-www/ReactART-prod.modern.js +++ b/compiled/facebook-www/ReactART-prod.modern.js @@ -9471,7 +9471,7 @@ var slice = Array.prototype.slice, return null; }, bundleType: 0, - version: "18.3.0-www-modern-489d00fa6-20230112", + version: "18.3.0-www-modern-379dd741e-20230113", rendererPackageName: "react-art" }; var internals$jscomp$inline_1309 = { @@ -9502,7 +9502,7 @@ var internals$jscomp$inline_1309 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-489d00fa6-20230112" + reconcilerVersion: "18.3.0-next-379dd741e-20230113" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled/facebook-www/ReactDOM-dev.classic.js b/compiled/facebook-www/ReactDOM-dev.classic.js index de0f3fc1ad..50e046c480 100644 --- a/compiled/facebook-www/ReactDOM-dev.classic.js +++ b/compiled/facebook-www/ReactDOM-dev.classic.js @@ -37,8 +37,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"); var disableInputAttributeSyncing = dynamicFeatureFlags.disableInputAttributeSyncing, - enableTrustedTypesIntegration = - dynamicFeatureFlags.enableTrustedTypesIntegration, disableSchedulerTimeoutBasedOnReactExpirationTime = dynamicFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX = dynamicFeatureFlags.warnAboutSpreadingKeyToJSX, @@ -69,7 +67,7 @@ var enableProfilerNestedUpdatePhase = true; var enableProfilerNestedUpdateScheduledHook = dynamicFeatureFlags.enableProfilerNestedUpdateScheduledHook; var createRootStrictEffectsByDefault = false; -var enableClientRenderFallbackOnTextMismatch = false; // Logs additional User Timing API marks for use with an experimental profiling tool. +var enableClientRenderFallbackOnTextMismatch = false; var enableSchedulingProfiler = dynamicFeatureFlags.enableSchedulingProfiler; // Note: we'll want to remove this when we to userland implementation. var enableSuspenseCallback = true; @@ -1964,10 +1962,7 @@ function setValueForProperty(node, name, value, isCustomComponentTag) { checkAttributeStringCoercion(value, name); } - node.setAttribute( - _attributeName, - enableTrustedTypesIntegration ? value : "" + value - ); + node.setAttribute(_attributeName, "" + value); } } @@ -2007,9 +2002,7 @@ function setValueForProperty(node, name, value, isCustomComponentTag) { } else { // `setAttribute` with objects becomes only `[object]` in IE8/9, // ('' + value) makes it output the correct toString()-value. - if (enableTrustedTypesIntegration) { - attributeValue = value; - } else { + { { checkAttributeStringCoercion(value, attributeName); } @@ -3558,23 +3551,6 @@ var reusableSVGContainer; var setInnerHTML = createMicrosoftUnsafeLocalFunction(function(node, html) { if (node.namespaceURI === SVG_NAMESPACE) { - { - if (enableTrustedTypesIntegration) { - // TODO: reconsider the text of this warning and when it should show - // before enabling the feature flag. - if (typeof trustedTypes !== "undefined") { - error( - "Using 'dangerouslySetInnerHTML' in an svg element with " + - "Trusted Types enabled in an Internet Explorer will cause " + - "the trusted value to be converted to string. Assigning string " + - "to 'innerHTML' will throw an error if Trusted Types are enforced. " + - "You can try to wrap your svg element inside a div and use 'dangerouslySetInnerHTML' " + - "on the enclosing div instead." - ); - } - } - } - if (!("innerHTML" in node)) { // IE does not have innerHTML for SVG nodes, so instead we inject the // new markup in a temp node and then move the child nodes across into @@ -5310,7 +5286,6 @@ function validateProperties$2(type, props, eventRegistry) { } var didWarnInvalidHydration = false; -var didWarnScriptTags = false; var DANGEROUSLY_SET_INNER_HTML = "dangerouslySetInnerHTML"; var SUPPRESS_CONTENT_EDITABLE_WARNING = "suppressContentEditableWarning"; var SUPPRESS_HYDRATION_WARNING = "suppressHydrationWarning"; @@ -5625,19 +5600,6 @@ function createElement(type, props, rootContainerElement, parentNamespace) { // set to true and it does not execute var div = ownerDocument.createElement("div"); - { - if (enableTrustedTypesIntegration && !didWarnScriptTags) { - error( - "Encountered a script tag while rendering React component. " + - "Scripts inside React components are never executed when rendering " + - "on the client. Consider using template tag instead " + - "(https://developer.mozilla.org/en-US/docs/Web/HTML/Element/template)." - ); - - didWarnScriptTags = true; - } - } - div.innerHTML = "