| @@ -366,36 +366,34 @@ | ||
| 366 | 366 | * |
| 367 | 367 | * @param WP_Scripts $scripts WP_Scripts instance. |
| 368 | 368 | */ |
| 369 | 369 | function gutenberg_register_vendor_scripts( $scripts ) { |
| 370 | - $extension = SCRIPT_DEBUG ? '.js' : '.min.js'; | |
| 371 | - $vendors_dir = gutenberg_dir_path() . 'build/scripts/vendors/'; | |
| 370 | + $extension = SCRIPT_DEBUG ? '.js' : '.min.js'; | |
| 372 | 371 | |
| 373 | - $vendor_handles = array( 'react', 'react-dom', 'react-jsx-runtime' ); | |
| 372 | + gutenberg_override_script( | |
| 373 | + $scripts, | |
| 374 | + 'react', | |
| 375 | + gutenberg_url( 'build/scripts/vendors/react' . $extension ), | |
| 376 | + // WordPress Core in `wp_register_development_scripts` sets `wp-react-refresh-entry` as a dependency to `react` when `SCRIPT_DEBUG` is true. | |
| 377 | + // We need to preserve that here. | |
| 378 | + SCRIPT_DEBUG ? array( 'wp-react-refresh-entry', 'wp-polyfill' ) : array( 'wp-polyfill' ), | |
| 379 | + '18' | |
| 380 | + ); | |
| 381 | + gutenberg_override_script( | |
| 382 | + $scripts, | |
| 383 | + 'react-dom', | |
| 384 | + gutenberg_url( 'build/scripts/vendors/react-dom' . $extension ), | |
| 385 | + array( 'react' ), | |
| 386 | + '18' | |
| 387 | + ); | |
| 374 | 388 | |
| 375 | - foreach ( $vendor_handles as $handle ) { | |
| 376 | - $asset_file = $vendors_dir . $handle . '.min.asset.php'; | |
| 377 | - $asset = file_exists( $asset_file ) ? require $asset_file : array(); | |
| 378 | - $dependencies = $asset['dependencies'] ?? array(); | |
| 379 | - $version = $asset['version'] ?? '0'; | |
| 380 | - | |
| 381 | - gutenberg_override_script( | |
| 382 | - $scripts, | |
| 383 | - $handle, | |
| 384 | - gutenberg_url( 'build/scripts/vendors/' . $handle . $extension ), | |
| 385 | - $dependencies, | |
| 386 | - $version | |
| 387 | - ); | |
| 388 | - } | |
| 389 | - | |
| 390 | - // WordPress Core in `wp_register_development_scripts` sets `wp-react-refresh-entry` | |
| 391 | - // as a dependency to `react` when `SCRIPT_DEBUG` is true. Preserve that here. | |
| 392 | - if ( SCRIPT_DEBUG ) { | |
| 393 | - $react = $scripts->query( 'react', 'registered' ); | |
| 394 | - if ( $react && ! in_array( 'wp-react-refresh-entry', $react->deps, true ) ) { | |
| 395 | - $react->deps[] = 'wp-react-refresh-entry'; | |
| 396 | - } | |
| 397 | - } | |
| 389 | + gutenberg_override_script( | |
| 390 | + $scripts, | |
| 391 | + 'react-jsx-runtime', | |
| 392 | + gutenberg_url( 'build/scripts/vendors/react-jsx-runtime' . $extension ), | |
| 393 | + array( 'react' ), | |
| 394 | + '18' | |
| 395 | + ); | |
| 398 | 396 | } |
| 399 | 397 | add_action( 'wp_default_scripts', 'gutenberg_register_vendor_scripts' ); |
| 400 | 398 | |
| 401 | 399 | /** |
| @@ -449,11 +447,9 @@ | ||
| 449 | 447 | * when client-side media processing is triggered via @wordpress/upload-media. |
| 450 | 448 | * |
| 451 | 449 | * @see packages/vips/src/loader.ts |
| 452 | 450 | */ |
| 453 | -if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) { | |
| 454 | - add_action( 'enqueue_block_editor_assets', 'gutenberg_enqueue_vips_loader' ); | |
| 455 | -} | |
| 451 | +add_action( 'enqueue_block_editor_assets', 'gutenberg_enqueue_vips_loader' ); | |
| 456 | 452 | function gutenberg_enqueue_vips_loader() { |
| 457 | 453 | wp_enqueue_script_module( '@wordpress/vips/loader' ); |
| 458 | 454 | } |
| 459 | 455 | |
