<!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>[54650] trunk: General: Correctly refer to {U+201C}npm{U+201D} and {U+201C}Node.js{U+201D}.</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/54650">54650</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/54650","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>2022-10-19 18:18:45 +0000 (Wed, 19 Oct 2022)</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'>General: Correctly refer to {U+201C}npm{U+201D} and {U+201C}Node.js{U+201D}.
This update all references to npm and Node.js to their correct spelling.
Fixes <a href="https://core.trac.wordpress.org/ticket/56816">#56816</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgithubworkflowscodingstandardsyml">trunk/.github/workflows/coding-standards.yml</a></li>
<li><a href="#trunkgithubworkflowsendtoendtestsyml">trunk/.github/workflows/end-to-end-tests.yml</a></li>
<li><a href="#trunkgithubworkflowsjavascripttestsyml">trunk/.github/workflows/javascript-tests.yml</a></li>
<li><a href="#trunkgithubworkflowsphpunittestsyml">trunk/.github/workflows/phpunit-tests.yml</a></li>
<li><a href="#trunkgithubworkflowstestcoverageyml">trunk/.github/workflows/test-coverage.yml</a></li>
<li><a href="#trunkgithubworkflowstestnpmyml">trunk/.github/workflows/test-npm.yml</a></li>
<li><a href="#trunkREADMEmd">trunk/README.md</a></li>
<li><a href="#trunkSECURITYmd">trunk/SECURITY.md</a></li>
<li><a href="#trunksrcindexphp">trunk/src/index.php</a></li>
<li><a href="#trunksrcjs_enqueuesvendorREADMEmd">trunk/src/js/_enqueues/vendor/README.md</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgithubworkflowscodingstandardsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/coding-standards.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/coding-standards.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/coding-standards.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Any change to a PHP or JavaScript file should run checks.
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.php'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><span class="cx" style="display: block; padding: 0 10px"> # These files configure Composer. Changes could affect the outcome.
</span><span class="cx" style="display: block; padding: 0 10px"> - 'composer.*'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,9 +125,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs updated debug information.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Run the WordPress JSHint checks.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> jshint:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkgithubworkflowsendtoendtestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/end-to-end-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/end-to-end-tests.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/end-to-end-tests.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,8 +36,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets environment variables.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the WordPress Docker container.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs general debug information.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> php -i
</span><span class="cx" style="display: block; padding: 0 10px"> locale -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkgithubworkflowsjavascripttestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/javascript-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/javascript-tests.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/javascript-tests.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> paths:
</span><span class="cx" style="display: block; padding: 0 10px"> # Any change to a JavaScript file should run tests.
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><span class="cx" style="display: block; padding: 0 10px"> # This file configures ESLint. Changes could affect the outcome.
</span><span class="cx" style="display: block; padding: 0 10px"> - '.eslintignore'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,9 +44,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs updated debug information.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Run the WordPress QUnit tests.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-js:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkgithubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/phpunit-tests.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/phpunit-tests.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets environment variables.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets up the environment variables needed for testing with memcached (if desired).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # - Installs NPM dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
+ # - Installs npm dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Configures caching for Composer.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Installs Composer dependencies.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs Docker debug information (about the Docker installation within the runner).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><span class="cx" style="display: block; padding: 0 10px"> uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkgithubworkflowstestcoverageyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/test-coverage.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/test-coverage.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/test-coverage.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the WordPress Importer plugin (needed for the Core PHPUnit tests).
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs Docker debug information (about the Docker installation within the runner).
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the WordPress Docker container.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug general information.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> php -i
</span><span class="cx" style="display: block; padding: 0 10px"> locale -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkgithubworkflowstestnpmyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/test-npm.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/test-npm.yml 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/.github/workflows/test-npm.yml 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-name: Test NPM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+name: Test npm
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,11 +15,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '3.[7-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> paths:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # These files configure NPM. Changes could affect the outcome.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # These files configure npm. Changes could affect the outcome.
</ins><span class="cx" style="display: block; padding: 0 10px"> - 'package*.json'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # JavaScript files are built using NPM.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # JavaScript files are built using npm.
</ins><span class="cx" style="display: block; padding: 0 10px"> - '**.js'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # CSS and SCSS files are built using NPM.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # CSS and SCSS files are built using npm.
</ins><span class="cx" style="display: block; padding: 0 10px"> - '**.scss'
</span><span class="cx" style="display: block; padding: 0 10px"> - '**.css'
</span><span class="cx" style="display: block; padding: 0 10px"> # Changes to workflow files should always verify all workflows are successful.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,13 +37,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Verifies that installing NPM dependencies and building WordPress works as expected.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verifies that installing npm dependencies and building WordPress works as expected.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `src` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-npm:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: Test NPM on ${{ matrix.os }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: Test npm on ${{ matrix.os }}
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: ${{ matrix.os }}
</span><span class="cx" style="display: block; padding: 0 10px"> timeout-minutes: 20
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Ensure version-controlled files are not modified or deleted during building and cleaning
</span><span class="cx" style="display: block; padding: 0 10px"> run: git diff --exit-code
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Verifies that installing NPM dependencies and building WordPress works as expected on MacOS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Verifies that installing npm dependencies and building WordPress works as expected on MacOS.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # This is separate from the job above in order to use stricter conditions about when to run.
</span><span class="cx" style="display: block; padding: 0 10px"> # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Checks out the repository.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Logs debug information about the GitHub Action runner.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Installs NodeJS.
- # _ Installs NPM dependencies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Node.js.
+ # _ Installs npm dependencies.
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Builds WordPress to run from the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `build` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cleans up after building WordPress to the `src` directory.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Ensures version-controlled files are not modified or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> test-npm-macos:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: Test NPM on MacOS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: Test npm on MacOS
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: macos-latest
</span><span class="cx" style="display: block; padding: 0 10px"> timeout-minutes: 30
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> git --version
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Install NodeJS
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Install Node.js
</ins><span class="cx" style="display: block; padding: 0 10px"> uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version-file: '.nvmrc'
</span></span></pre></div>
<a id="trunkREADMEmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/README.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/README.md 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/README.md 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> If you are not using a package manager, see the [Node.js download page](https://nodejs.org/en/download/) for installers and binaries.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-**Note:** WordPress currently only supports NodeJS `14.x` and npm `6.x`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+**Note:** WordPress currently only supports Node.js `14.x` and npm `6.x`.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> You will also need [Docker](https://www.docker.com/products/docker-desktop) installed and running on your computer. Docker is the virtualization software that powers the local development environment. Docker can be installed just like any other regular application.
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkSECURITYmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/SECURITY.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/SECURITY.md 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/SECURITY.md 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Output from automated scans - please manually verify issues and include a valid proof of concept.
</span><span class="cx" style="display: block; padding: 0 10px"> * Any non-severe vulnerability on `irclogs.wordpress.org`, `lists.wordpress.org`, or any other low impact site.
</span><span class="cx" style="display: block; padding: 0 10px"> * Clickjacking with minimal security implications
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-* Vulnerabilities in Composer/NPM `devDependencies`, unless there's a practical way to exploit it remotely.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+* Vulnerabilities in Composer/npm `devDependencies`, unless there's a practical way to exploit it remotely.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Theoretical vulnerabilities where you can't demonstrate a significant security impact with a PoC.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ## Guidelines
</span></span></pre></div>
<a id="trunksrcindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/index.php 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/src/index.php 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +55,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: NPM URL, 2: Handbook URL. */
- __( 'This requires <a href="%1$s">NPM</a>. <a href="%2$s">Learn more about setting up your local development environment</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: npm URL, 2: Handbook URL. */
+ __( 'This requires <a href="%1$s">npm</a>. <a href="%2$s">Learn more about setting up your local development environment</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://www.npmjs.com/get-npm',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span></span></pre></div>
<a id="trunksrcjs_enqueuesvendorREADMEmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/vendor/README.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/vendor/README.md 2022-10-19 18:10:43 UTC (rev 54649)
+++ trunk/src/js/_enqueues/vendor/README.md 2022-10-19 18:18:45 UTC (rev 54650)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # src/js/enqueues/vendor
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-In this directory you'll find vendor JavaScript packages that cannot be installed through NPM, but are included in WordPress. Below we've documented the sources for those packages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+In this directory you'll find vendor JavaScript packages that cannot be installed through npm, but are included in WordPress. Below we've documented the sources for those packages.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ## Folder dependencies
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +62,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - farbtastic: https://github.com/mattfarina/farbtastic
</span><span class="cx" style="display: block; padding: 0 10px"> - iris: https://github.com/Automattic/Iris
</span><span class="cx" style="display: block; padding: 0 10px"> - json2: https://github.com/douglascrockford/JSON-js
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- jquery/jquery.color: https://github.com/jquery/jquery-color. Package is on NPM but not published by maintainer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- jquery/jquery.color: https://github.com/jquery/jquery-color. Package is on npm but not published by maintainer.
</ins><span class="cx" style="display: block; padding: 0 10px"> - jquery/jquery.hotkeys: https://github.com/tzuryby/jquery.hotkeys
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- jquery/jquery.masonry: Old version for BC purposes, can't include two versions with NPM. The newer version is included through NPM and built to `wp-includes/js/masonry.min.js`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- jquery/jquery.masonry: Old version for BC purposes, can't include two versions with npm. The newer version is included through npm and built to `wp-includes/js/masonry.min.js`
</ins><span class="cx" style="display: block; padding: 0 10px"> - jquery/jquery.query: https://github.com/blairmitchelmore/jquery.plugins/blob/master/jquery.query.js
</span><span class="cx" style="display: block; padding: 0 10px"> - jquery/jquery.schedule: https://github.com/rse/jquery-schedule
</span><span class="cx" style="display: block; padding: 0 10px"> - jquery/jquery.serializeobject: https://github.com/cowboy/jquery-misc/blob/master/jquery.ba-serializeobject.js
</span></span></pre>
</div>
</div>
</body>
</html>