<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44271] Core Editor: Specify script versions for the WordPress packages and their vendor dependencies.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44271">44271</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44271","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-17 18:18:49 +0000 (Mon, 17 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Core Editor: Specify script versions for the WordPress packages and their vendor dependencies.
Using the `package.json` versions of the NPM dependencies as versions when registering the WordPress scripts.
Props dimadin, dd32, youknowriad.
Merges <a href="https://core.trac.wordpress.org/changeset/43925">[43925]</a> to trunk.
Fixes <a href="https://core.trac.wordpress.org/ticket/45187">#45187</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-17 18:06:42 UTC (rev 44270)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-17 18:18:49 UTC (rev 44271)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43919,43921-43924,43926-43929,43937-43938,43946-43947,43952-43954,43956,43961-43963,43967-43969,44014,44017
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43919,43921-43929,43937-43938,43946-43947,43952-43954,43956,43961-43963,43967-43969,44014,44017
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2018-12-17 18:06:42 UTC (rev 44270)
+++ trunk/src/wp-includes/script-loader.php 2018-12-17 18:18:49 UTC (rev 44271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,6 +90,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-polyfill',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $vendor_scripts_versions = array(
+ 'react' => '16.6.3',
+ 'react-dom' => '16.6.3',
+ 'moment' => '2.22.2',
+ 'lodash' => '4.17.11',
+ 'wp-polyfill-fetch' => '3.0.0',
+ 'wp-polyfill-formdata' => '3.0.12',
+ 'wp-polyfill-node-contains' => '3.26.0-0',
+ 'wp-polyfill-element-closest' => '2.0.2',
+ 'wp-polyfill' => '7.0.0',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vendor_scripts as $handle => $dependencies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_string( $dependencies ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = $dependencies;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,9 +108,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dependencies = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js";
+ $version = $vendor_scripts_versions[ $handle ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( $handle, $path, $dependencies, false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( $handle, $path, $dependencies, false, $version );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-polyfill', null, array( 'wp-polyfill' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,6 +206,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_default_packages_scripts( &$scripts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = wp_scripts_get_suffix();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $packages_versions = array(
+ 'api-fetch' => '2.2.5',
+ 'a11y' => '2.0.2',
+ 'annotations' => '1.0.3',
+ 'api-fetch' => '2.2.5',
+ 'autop' => '2.0.2',
+ 'blob' => '2.1.0',
+ 'block-library' => '2.2.6',
+ 'block-serialization-default-parser' => '2.0.0',
+ 'blocks' => '6.0.2',
+ 'components' => '7.0.1',
+ 'compose' => '3.0.0',
+ 'core-data' => '2.0.14',
+ 'data' => '4.0.1',
+ 'date' => '3.0.0',
+ 'deprecated' => '2.0.3',
+ 'dom' => '2.0.7',
+ 'dom-ready' => '2.0.2',
+ 'edit-post' => '3.1.1',
+ 'editor' => '9.0.1',
+ 'element' => '2.1.8',
+ 'escape-html' => '1.0.1',
+ 'format-library' => '1.2.4',
+ 'hooks' => '2.0.3',
+ 'html-entities' => '2.0.3',
+ 'i18n' => '3.1.0',
+ 'is-shallow-equal' => '1.1.4',
+ 'keycodes' => '2.0.5',
+ 'list-reusable-blocks' => '1.1.14',
+ 'notices' => '1.1.0',
+ 'nux' => '3.0.2',
+ 'plugins' => '2.0.9',
+ 'redux-routine' => '3.0.3',
+ 'rich-text' => '3.0.2',
+ 'shortcode' => '2.0.2',
+ 'token-list' => '1.1.0',
+ 'url' => '2.3.1',
+ 'viewport' => '2.0.12',
+ 'wordcount' => '2.0.3',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $packages_dependencies = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api-fetch' => array( 'wp-polyfill', 'wp-hooks', 'wp-i18n', 'wp-url' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'a11y' => array( 'wp-dom-ready', 'wp-polyfill' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +298,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-rich-text',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'block-serialization-default-parser' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'block-serialization-spec-parser' => array( 'wp-polyfill' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'components' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lodash',
</span><span class="cx" style="display: block; padding: 0 10px"> 'moment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,10 +464,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $packages_dependencies as $package => $dependencies ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $handle = 'wp-' . $package;
- $path = "/wp-includes/js/dist/$package$suffix.js";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $handle = 'wp-' . $package;
+ $path = "/wp-includes/js/dist/$package$suffix.js";
+ $version = $packages_versions[ $package ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( $handle, $path, $dependencies, false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( $handle, $path, $dependencies, false, $version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $package_translations[ $package ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( $handle, $package_translations[ $package ] );
</span></span></pre>
</div>
</div>
</body>
</html>