From 1eec5db0b457baa64da842fb7b8738d3fce4f446 Mon Sep 17 00:00:00 2001 From: Billy Janitsch Date: Thu, 14 Apr 2022 18:25:03 -0400 Subject: [PATCH 1/2] Synchronize implementations of second render logging --- packages/react-devtools-shared/src/backend/utils.js | 2 +- packages/react-devtools-shared/src/hook.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/react-devtools-shared/src/backend/utils.js b/packages/react-devtools-shared/src/backend/utils.js index da911cf9445..f0f78b7f778 100644 --- a/packages/react-devtools-shared/src/backend/utils.js +++ b/packages/react-devtools-shared/src/backend/utils.js @@ -187,7 +187,7 @@ export function formatWithStyles( return inputArgs; } - // Matches any of %(o|O|i|s|f), but not %%(o|O|i|s|f) + // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f) const REGEXP = /([^%]|^)(%([oOdisf]))/g; if (inputArgs[0].match(REGEXP)) { return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)]; diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js index 1ea54985fab..30a053ae0be 100644 --- a/packages/react-devtools-shared/src/hook.js +++ b/packages/react-devtools-shared/src/hook.js @@ -180,13 +180,15 @@ export function installHook(target: any): DevToolsHook | null { inputArgs === undefined || inputArgs === null || inputArgs.length === 0 || - (typeof inputArgs[0] === 'string' && inputArgs[0].includes('%c')) || + // Matches any of %c but not %%c + (typeof inputArgs[0] === 'string' && inputArgs[0].match(/([^%]|^)(%c)/g)) || style === undefined ) { return inputArgs; } - - const REGEXP = /(%?)(%([oOdisf]))/g; + + // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f) + const REGEXP = /([^%]|^)(%([oOdisf]))/g; if (inputArgs[0].match(REGEXP)) { return [`%c${inputArgs[0]}`, style, ...inputArgs.slice(1)]; } else { From 0b6618ad4af47fd7c7bad68a1649300a92a2313f Mon Sep 17 00:00:00 2001 From: Billy Janitsch Date: Fri, 15 Apr 2022 10:54:20 -0400 Subject: [PATCH 2/2] Format --- packages/react-devtools-shared/src/hook.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react-devtools-shared/src/hook.js b/packages/react-devtools-shared/src/hook.js index 30a053ae0be..ad5b33850b7 100644 --- a/packages/react-devtools-shared/src/hook.js +++ b/packages/react-devtools-shared/src/hook.js @@ -181,12 +181,13 @@ export function installHook(target: any): DevToolsHook | null { inputArgs === null || inputArgs.length === 0 || // Matches any of %c but not %%c - (typeof inputArgs[0] === 'string' && inputArgs[0].match(/([^%]|^)(%c)/g)) || + (typeof inputArgs[0] === 'string' && + inputArgs[0].match(/([^%]|^)(%c)/g)) || style === undefined ) { return inputArgs; } - + // Matches any of %(o|O|d|i|s|f), but not %%(o|O|d|i|s|f) const REGEXP = /([^%]|^)(%([oOdisf]))/g; if (inputArgs[0].match(REGEXP)) {