diff --git a/packages/shared/forks/consoleWithStackDev.rn.js b/packages/shared/forks/consoleWithStackDev.rn.js index 6ac30b39fb384..ec02866061c47 100644 --- a/packages/shared/forks/consoleWithStackDev.rn.js +++ b/packages/shared/forks/consoleWithStackDev.rn.js @@ -6,9 +6,15 @@ */ import ReactSharedInternals from 'shared/ReactSharedInternals'; +import * as dynamicFlagsUntyped from 'ReactNativeInternalFeatureFlags'; +const enableRemoveConsolePatches = + dynamicFlagsUntyped && dynamicFlagsUntyped.enableRemoveConsolePatches; let suppressWarning = false; export function setSuppressWarning(newSuppressWarning) { + if (enableRemoveConsolePatches) { + return; + } if (__DEV__) { suppressWarning = newSuppressWarning; } @@ -21,7 +27,11 @@ export function setSuppressWarning(newSuppressWarning) { // they are left as they are instead. export function warn(format, ...args) { - if (__DEV__) { + if (enableRemoveConsolePatches) { + if (__DEV__) { + console['warn'](format, ...args); + } + } else if (__DEV__) { if (!suppressWarning) { printWarning('warn', format, args); } @@ -29,7 +39,11 @@ export function warn(format, ...args) { } export function error(format, ...args) { - if (__DEV__) { + if (enableRemoveConsolePatches) { + if (__DEV__) { + console['error'](format, ...args); + } + } else if (__DEV__) { if (!suppressWarning) { printWarning('error', format, args); } @@ -37,6 +51,9 @@ export function error(format, ...args) { } function printWarning(level, format, args) { + if (enableRemoveConsolePatches) { + return; + } if (__DEV__) { if (ReactSharedInternals.getCurrentStack) { const stack = ReactSharedInternals.getCurrentStack(); diff --git a/packages/shared/forks/consoleWithStackDev.www.js b/packages/shared/forks/consoleWithStackDev.www.js index 02dc641156039..84c5d186e4a8e 100644 --- a/packages/shared/forks/consoleWithStackDev.www.js +++ b/packages/shared/forks/consoleWithStackDev.www.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -const {enableRemoveConsolePatches} = require('shared/ReactFeatureFlags'); +const {enableRemoveConsolePatches} = require('ReactFeatureFlags'); // This refers to a WWW module. const warningWWW = require('warning'); diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 3d90283c5e6e0..04bfb1a0e5479 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -783,7 +783,9 @@ const bundles = [ moduleType: RENDERER, entry: 'react-native-renderer', global: 'ReactNativeRenderer', - externals: ['react-native'], + // ReactNativeInternalFeatureFlags temporary until we land enableRemoveConsolePatches. + // Needs to be done before the next RN OSS release. + externals: ['react-native', 'ReactNativeInternalFeatureFlags'], minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: true, babel: opts => @@ -817,7 +819,9 @@ const bundles = [ moduleType: RENDERER, entry: 'react-native-renderer/fabric', global: 'ReactFabric', - externals: ['react-native'], + // ReactNativeInternalFeatureFlags temporary until we land enableRemoveConsolePatches. + // Needs to be done before the next RN OSS release. + externals: ['react-native', 'ReactNativeInternalFeatureFlags'], minifyWithProdErrorCodes: false, wrapWithModuleBoundaries: true, babel: opts =>