From dcb3ba1b829b08d179aa75bbddba2a21ce51927c Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Fri, 24 May 2024 16:47:10 +0400 Subject: [PATCH 1/5] Try: Re-enable React StrictMode --- packages/customize-widgets/src/index.js | 14 ++++--- packages/edit-post/src/editor.js | 38 ++++++++++--------- .../edit-site/src/components/app/index.js | 21 +++++----- .../index.js | 34 +++++++++-------- 4 files changed, 58 insertions(+), 49 deletions(-) diff --git a/packages/customize-widgets/src/index.js b/packages/customize-widgets/src/index.js index 9afda775a1701c..5de010fa8bd37e 100644 --- a/packages/customize-widgets/src/index.js +++ b/packages/customize-widgets/src/index.js @@ -1,7 +1,7 @@ /** * WordPress dependencies */ -import { createRoot } from '@wordpress/element'; +import { createRoot, StrictMode } from '@wordpress/element'; import { registerCoreBlocks, __experimentalGetCoreBlocks, @@ -92,11 +92,13 @@ export function initialize( editorName, blockEditorSettings ) { } ); createRoot( container ).render( - + + + ); } ); } diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js index 378265c1927788..203afbe53f1b6e 100644 --- a/packages/edit-post/src/editor.js +++ b/packages/edit-post/src/editor.js @@ -8,7 +8,7 @@ import { store as editorStore, privateApis as editorPrivateApis, } from '@wordpress/editor'; -import { useMemo } from '@wordpress/element'; +import { StrictMode, useMemo } from '@wordpress/element'; import { SlotFillProvider } from '@wordpress/components'; import { store as coreStore } from '@wordpress/core-data'; import { CommandMenu } from '@wordpress/commands'; @@ -95,23 +95,25 @@ function Editor( { } return ( - - - - - - - - - - + + + + + + + + + + + + ); } diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js index 764b188acf6a53..86534d5e973b56 100644 --- a/packages/edit-site/src/components/app/index.js +++ b/packages/edit-site/src/components/app/index.js @@ -10,6 +10,7 @@ import { store as noticesStore } from '@wordpress/notices'; import { useDispatch } from '@wordpress/data'; import { __, sprintf } from '@wordpress/i18n'; import { PluginArea } from '@wordpress/plugins'; +import { StrictMode } from '@wordpress/element'; import { privateApis as routerPrivateApis } from '@wordpress/router'; /** @@ -37,14 +38,16 @@ export default function App() { } return ( - - - - - - - - - + + + + + + + + + + + ); } diff --git a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js index 55704bfc7680ff..d8c05a342f478b 100644 --- a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js +++ b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js @@ -10,7 +10,7 @@ import { store as coreStore, useResourcePermissions, } from '@wordpress/core-data'; -import { useMemo } from '@wordpress/element'; +import { StrictMode, useMemo } from '@wordpress/element'; import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor'; import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns'; import { store as preferencesStore } from '@wordpress/preferences'; @@ -112,20 +112,22 @@ export default function WidgetAreasBlockEditorProvider( { ); return ( - - - - - { children } - - - + + + + + + { children } + + + + ); } From 49ca8b9d1ced264b046e6983e96d279aa83c8f5c Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Fri, 24 May 2024 17:18:00 +0400 Subject: [PATCH 2/5] Wrap full app --- packages/edit-post/src/editor.js | 38 +++++++++---------- packages/edit-post/src/index.js | 16 ++++---- .../edit-site/src/components/app/index.js | 21 +++++----- packages/edit-site/src/index.js | 8 +++- .../index.js | 34 ++++++++--------- packages/edit-widgets/src/index.js | 8 +++- 6 files changed, 64 insertions(+), 61 deletions(-) diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js index 203afbe53f1b6e..378265c1927788 100644 --- a/packages/edit-post/src/editor.js +++ b/packages/edit-post/src/editor.js @@ -8,7 +8,7 @@ import { store as editorStore, privateApis as editorPrivateApis, } from '@wordpress/editor'; -import { StrictMode, useMemo } from '@wordpress/element'; +import { useMemo } from '@wordpress/element'; import { SlotFillProvider } from '@wordpress/components'; import { store as coreStore } from '@wordpress/core-data'; import { CommandMenu } from '@wordpress/commands'; @@ -95,25 +95,23 @@ function Editor( { } return ( - - - - - - - - - - - - + + + + + + + + + + ); } diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js index 0ec4388a9af70e..e7600831f11bae 100644 --- a/packages/edit-post/src/index.js +++ b/packages/edit-post/src/index.js @@ -7,7 +7,7 @@ import { __experimentalRegisterExperimentalCoreBlocks, } from '@wordpress/block-library'; import deprecated from '@wordpress/deprecated'; -import { createRoot } from '@wordpress/element'; +import { createRoot, StrictMode } from '@wordpress/element'; import { dispatch, select } from '@wordpress/data'; import { store as preferencesStore } from '@wordpress/preferences'; import { @@ -137,12 +137,14 @@ export function initializeEditor( window.addEventListener( 'drop', ( e ) => e.preventDefault(), false ); root.render( - + + + ); return root; diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js index 86534d5e973b56..764b188acf6a53 100644 --- a/packages/edit-site/src/components/app/index.js +++ b/packages/edit-site/src/components/app/index.js @@ -10,7 +10,6 @@ import { store as noticesStore } from '@wordpress/notices'; import { useDispatch } from '@wordpress/data'; import { __, sprintf } from '@wordpress/i18n'; import { PluginArea } from '@wordpress/plugins'; -import { StrictMode } from '@wordpress/element'; import { privateApis as routerPrivateApis } from '@wordpress/router'; /** @@ -38,16 +37,14 @@ export default function App() { } return ( - - - - - - - - - - - + + + + + + + + + ); } diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js index 41fc0a1985fded..f7ef09f81ce7e7 100644 --- a/packages/edit-site/src/index.js +++ b/packages/edit-site/src/index.js @@ -9,7 +9,7 @@ import { } from '@wordpress/block-library'; import { dispatch } from '@wordpress/data'; import deprecated from '@wordpress/deprecated'; -import { createRoot } from '@wordpress/element'; +import { createRoot, StrictMode } from '@wordpress/element'; import { store as editorStore } from '@wordpress/editor'; import { store as preferencesStore } from '@wordpress/preferences'; import { @@ -85,7 +85,11 @@ export function initializeEditor( id, settings ) { window.addEventListener( 'dragover', ( e ) => e.preventDefault(), false ); window.addEventListener( 'drop', ( e ) => e.preventDefault(), false ); - root.render( ); + root.render( + + + + ); return root; } diff --git a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js index d8c05a342f478b..55704bfc7680ff 100644 --- a/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js +++ b/packages/edit-widgets/src/components/widget-areas-block-editor-provider/index.js @@ -10,7 +10,7 @@ import { store as coreStore, useResourcePermissions, } from '@wordpress/core-data'; -import { StrictMode, useMemo } from '@wordpress/element'; +import { useMemo } from '@wordpress/element'; import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor'; import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns'; import { store as preferencesStore } from '@wordpress/preferences'; @@ -112,22 +112,20 @@ export default function WidgetAreasBlockEditorProvider( { ); return ( - - - - - - { children } - - - - + + + + + { children } + + + ); } diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js index 2374ec19dabd7b..f8247d733f1a15 100644 --- a/packages/edit-widgets/src/index.js +++ b/packages/edit-widgets/src/index.js @@ -9,7 +9,7 @@ import { } from '@wordpress/blocks'; import { dispatch } from '@wordpress/data'; import deprecated from '@wordpress/deprecated'; -import { createRoot } from '@wordpress/element'; +import { StrictMode, createRoot } from '@wordpress/element'; import { registerCoreBlocks, __experimentalGetCoreBlocks, @@ -91,7 +91,11 @@ export function initializeEditor( id, settings ) { // see: https://github.com/WordPress/gutenberg/issues/33097 setFreeformContentHandlerName( 'core/html' ); - root.render( ); + root.render( + + + + ); return root; } From 2c01013751df0c285fe94ed86a4c38aa9c920d5b Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Fri, 24 May 2024 17:53:34 +0400 Subject: [PATCH 3/5] REVERTME: Enable development mode in WP --- .wp-env.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.wp-env.json b/.wp-env.json index 20d5597e54bbc9..57d4e1a72d8610 100644 --- a/.wp-env.json +++ b/.wp-env.json @@ -4,6 +4,9 @@ "themes": [ "./test/emptytheme" ], "env": { "tests": { + "config": { + "SCRIPT_DEBUG": true + }, "mappings": { "wp-content/plugins/gutenberg": ".", "wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins", From 8ec075b107ccce67562c5e2e62a90ef571f4cd01 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Fri, 31 May 2024 01:07:37 +0400 Subject: [PATCH 4/5] Revert "REVERTME: Enable development mode in WP" This reverts commit d723b043cee773f862043359a9d31c1cf1a6984e. --- .wp-env.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.wp-env.json b/.wp-env.json index 57d4e1a72d8610..20d5597e54bbc9 100644 --- a/.wp-env.json +++ b/.wp-env.json @@ -4,9 +4,6 @@ "themes": [ "./test/emptytheme" ], "env": { "tests": { - "config": { - "SCRIPT_DEBUG": true - }, "mappings": { "wp-content/plugins/gutenberg": ".", "wp-content/mu-plugins": "./packages/e2e-tests/mu-plugins", From 50117dbe7b4396a2d4089752d806533528562c3e Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Fri, 31 May 2024 16:12:30 +0400 Subject: [PATCH 5/5] Feedback --- packages/list-reusable-blocks/src/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/list-reusable-blocks/src/index.js b/packages/list-reusable-blocks/src/index.js index 4440ba1c49f05a..f5cb411726963c 100644 --- a/packages/list-reusable-blocks/src/index.js +++ b/packages/list-reusable-blocks/src/index.js @@ -1,7 +1,7 @@ /** * WordPress dependencies */ -import { createRoot } from '@wordpress/element'; +import { createRoot, StrictMode } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; /** @@ -44,6 +44,8 @@ document.addEventListener( 'DOMContentLoaded', () => { container.className = 'list-reusable-blocks__container'; button.parentNode.insertBefore( container, button ); createRoot( container ).render( - + + + ); } );