From 430c8b091b5f1cb027228b4a0ec748bea4432833 Mon Sep 17 00:00:00 2001 From: Ella Date: Fri, 31 May 2024 17:54:41 +0000 Subject: [PATCH] React: Upgrade to the new JSX transform. See https://github.com/WordPress/gutenberg/pull/61692. See https://github.com/WordPress/wordpress-develop/pull/6678. Props youknowriad. Fixes #61324. git-svn-id: https://develop.svn.wordpress.org/trunk@58271 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 2 ++ tools/webpack/packages.js | 4 ---- webpack.config.js | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 7da37990de1eb..f9813ed87c91f 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -91,6 +91,7 @@ function wp_default_packages_vendor( $scripts ) { $vendor_scripts = array( 'react', 'react-dom' => array( 'react' ), + 'react-jsx-runtime' => array( 'react' ), 'regenerator-runtime', 'moment', 'lodash', @@ -109,6 +110,7 @@ function wp_default_packages_vendor( $scripts ) { $vendor_scripts_versions = array( 'react' => '18.3.1', 'react-dom' => '18.3.1', + 'react-jsx-runtime' => '18.3.1', 'regenerator-runtime' => '0.14.0', 'moment' => '2.29.4', 'lodash' => '4.17.21', diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js index 09f2b37516aa2..17913885eb187 100644 --- a/tools/webpack/packages.js +++ b/tools/webpack/packages.js @@ -95,8 +95,6 @@ module.exports = function ( 'wp-polyfill-inert.js': 'wicg-inert/dist/inert.js', 'wp-polyfill-importmap.js': 'es-module-shims/dist/es-module-shims.wasm.js', 'moment.js': 'moment/moment.js', - 'react.js': 'react/umd/react.development.js', - 'react-dom.js': 'react-dom/umd/react-dom.development.js', 'regenerator-runtime.js': 'regenerator-runtime/runtime.js', }; @@ -111,8 +109,6 @@ module.exports = function ( 'objectFitPolyfill/dist/objectFitPolyfill.min.js', 'wp-polyfill-inert.min.js': 'wicg-inert/dist/inert.min.js', 'moment.min.js': 'moment/min/moment.min.js', - 'react.min.js': 'react/umd/react.production.min.js', - 'react-dom.min.js': 'react-dom/umd/react-dom.production.min.js', }; const minifyVendors = { diff --git a/webpack.config.js b/webpack.config.js index 963117a7a52de..40f9b7e53bbb2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,6 +3,7 @@ const developmentConfig = require( './tools/webpack/development' ); const mediaConfig = require( './tools/webpack/media' ); const packagesConfig = require( './tools/webpack/packages' ); const modulesConfig = require( './tools/webpack/modules' ); +const vendorsConfig = require( './tools/webpack/vendors' ); module.exports = function( env = { environment: "production", watch: false, buildTarget: false } ) { if ( ! env.watch ) { @@ -19,6 +20,7 @@ module.exports = function( env = { environment: "production", watch: false, buil mediaConfig( env ), packagesConfig( env ), modulesConfig( env ), + ...vendorsConfig( env ), ]; return config;