From d31335da85a3cead9665e342a70a33195fc5e0ed Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Fri, 4 Jan 2019 20:27:49 +0000 Subject: [PATCH] Script Loader: Load unminified package vendor scripts when `SCRIPT_DEBUG` is set. The unminified package vendor scripts are bundled with the release package thus the value of the `SCRIPT_DEBUG` constant should be honored. Props earnjam. See #45535. Built from https://develop.svn.wordpress.org/trunk@44391 git-svn-id: http://core.svn.wordpress.org/trunk@44221 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-block-parser.php | 85 +++++++++++++++------------ wp-includes/script-loader.php | 4 +- wp-includes/version.php | 2 +- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/wp-includes/class-wp-block-parser.php b/wp-includes/class-wp-block-parser.php index 55de7c110c..8b565f1a28 100644 --- a/wp-includes/class-wp-block-parser.php +++ b/wp-includes/class-wp-block-parser.php @@ -81,10 +81,10 @@ class WP_Block_Parser_Block { * @param array $innerContent List of string fragments and null markers where inner blocks were found. */ function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) { - $this->blockName = $name; - $this->attrs = $attrs; - $this->innerBlocks = $innerBlocks; - $this->innerHTML = $innerHTML; + $this->blockName = $name; + $this->attrs = $attrs; + $this->innerBlocks = $innerBlocks; + $this->innerHTML = $innerHTML; $this->innerContent = $innerContent; } } @@ -300,15 +300,17 @@ class WP_Block_Parser { */ if ( 0 === $stack_depth ) { if ( isset( $leading_html_start ) ) { - $this->output[] = (array) self::freeform( substr( - $this->document, - $leading_html_start, - $start_offset - $leading_html_start - ) ); + $this->output[] = (array) self::freeform( + substr( + $this->document, + $leading_html_start, + $start_offset - $leading_html_start + ) + ); } $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ); - $this->offset = $start_offset + $token_length; + $this->offset = $start_offset + $token_length; return true; } @@ -323,13 +325,16 @@ class WP_Block_Parser { case 'block-opener': // track all newly-opened blocks on the stack. - array_push( $this->stack, new WP_Block_Parser_Frame( - new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), - $start_offset, - $token_length, - $start_offset + $token_length, - $leading_html_start - ) ); + array_push( + $this->stack, + new WP_Block_Parser_Frame( + new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), + $start_offset, + $token_length, + $start_offset + $token_length, + $leading_html_start + ) + ); $this->offset = $start_offset + $token_length; return true; @@ -360,11 +365,11 @@ class WP_Block_Parser { * otherwise we're nested and we have to close out the current * block and add it as a new innerBlock to the parent */ - $stack_top = array_pop( $this->stack ); - $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); - $stack_top->block->innerHTML .= $html; + $stack_top = array_pop( $this->stack ); + $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); + $stack_top->block->innerHTML .= $html; $stack_top->block->innerContent[] = $html; - $stack_top->prev_offset = $start_offset + $token_length; + $stack_top->prev_offset = $start_offset + $token_length; $this->add_inner_block( $stack_top->block, @@ -422,22 +427,22 @@ class WP_Block_Parser { return array( 'no-more-tokens', null, null, null, null ); } - list( $match, $started_at ) = $matches[ 0 ]; + list( $match, $started_at ) = $matches[0]; $length = strlen( $match ); - $is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ]; - $is_void = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ]; - $namespace = $matches[ 'namespace' ]; - $namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/'; - $name = $namespace . $matches[ 'name' ][ 0 ]; - $has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ]; + $is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1]; + $is_void = isset( $matches['void'] ) && -1 !== $matches['void'][1]; + $namespace = $matches['namespace']; + $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/'; + $name = $namespace . $matches['name'][0]; + $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1]; /* * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays * are associative arrays. If we use `array()` we get a JSON `[]` */ $attrs = $has_attrs - ? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true ) + ? json_decode( $matches['attrs'][0], /* as-associative */ true ) : $this->empty_attrs; /* @@ -502,17 +507,17 @@ class WP_Block_Parser { * @param int|null $last_offset Last byte offset into document if continuing form earlier output. */ function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) { - $parent = $this->stack[ count( $this->stack ) - 1 ]; + $parent = $this->stack[ count( $this->stack ) - 1 ]; $parent->block->innerBlocks[] = (array) $block; - $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); + $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); if ( ! empty( $html ) ) { - $parent->block->innerHTML .= $html; + $parent->block->innerHTML .= $html; $parent->block->innerContent[] = $html; } $parent->block->innerContent[] = null; - $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; + $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; } /** @@ -531,16 +536,18 @@ class WP_Block_Parser { : substr( $this->document, $prev_offset ); if ( ! empty( $html ) ) { - $stack_top->block->innerHTML .= $html; + $stack_top->block->innerHTML .= $html; $stack_top->block->innerContent[] = $html; } if ( isset( $stack_top->leading_html_start ) ) { - $this->output[] = (array) self::freeform( substr( - $this->document, - $stack_top->leading_html_start, - $stack_top->token_start - $stack_top->leading_html_start - ) ); + $this->output[] = (array) self::freeform( + substr( + $this->document, + $stack_top->leading_html_start, + $stack_top->token_start - $stack_top->leading_html_start + ) + ); } $this->output[] = (array) $stack_top->block; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 83ac6af1ad..7f745acffd 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -76,7 +76,7 @@ function wp_register_tinymce_scripts( &$scripts, $force_uncompressed = false ) { function wp_default_packages_vendor( &$scripts ) { global $wp_locale; - $dev_suffix = wp_scripts_get_suffix( 'dev' ); + $suffix = wp_scripts_get_suffix(); $vendor_scripts = array( 'react' => array( 'wp-polyfill' ), @@ -108,7 +108,7 @@ function wp_default_packages_vendor( &$scripts ) { $dependencies = array(); } - $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js"; + $path = "/wp-includes/js/dist/vendor/$handle$suffix.js"; $version = $vendor_scripts_versions[ $handle ]; $scripts->add( $handle, $path, $dependencies, $version, 1 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index dcb07666b7..42723b6fc4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44389'; +$wp_version = '5.1-alpha-44391'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.