Changeset 50208

Timestamp:

02/05/2021 04:19:31 AM (6 years ago)

Author:

desrosj

Message:

Build/Test Tools: Support NodeJS 14.x in the 4.5 branch.

This updates the 4.5 branch to support the latest LTS version of NodeJS (currently 14.x), allowing the same version to be used across all WordPress branches that receive security updates as a courtesy.

Because older branches use (really) old versions of NodeJS, the local Docker environment cannot be backported since the needed dependencies will not run on these older versions (see #48301). This also blocks the ability to move automated testing over to GitHub Actions (see #50401).

This also replaces the npm-shrinkwrap.json with a package-lock.json file. Lock files were not supported in earlier versions of NPM, but can now be used.

In addition to backporting the package updates that happened after branching 4.5, dependencies that were removed in future releases have also been updated to their latest versions.

Props desrosj, dd32, netweb, jorbin.
Merges [37185,37212,37612,38111,38688,39110,39113-39119,39478,42460-42461,42463,42887,43320,43323,43977,44219,44233,44728,45321,45765,46404,46408-46409,47404,47867-47869,47872-47873,48705,49636,49933,49937,49939,50017,50126,50176,50185,50192] to the 4.5 branch.
See #52341.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• .editorconfig (modified) (1 diff)
• .nvmrc (modified) (1 diff)
• Gruntfile.js (modified) (6 diffs)
• npm-shrinkwrap.json (deleted)
• package-lock.json (added)
• package.json (modified) (1 diff)
• src/wp-admin/js/bookmarklet.min.js (modified) (1 diff)
• src/wp-includes/js/media-audiovideo.js (modified) (1 diff)
• src/wp-includes/js/media-grid.js (modified) (1 diff)
• src/wp-includes/js/media-models.js (modified) (1 diff)
• src/wp-includes/js/media-views.js (modified) (1 diff)

branches/4.5/.editorconfig

@@ -14 +14 @@
 indent_style = tab
 
-[{.jshintrc,*.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2

branches/4.5/.nvmrc

@@ -1 @@
-v4.7.2
+14

branches/4.5/Gruntfile.js

@@ -2 +2 @@
 module.exports = function(grunt) {
         var path = require('path'),
-                gitorsvn = require('git-or-svn'),
+                fs = require( 'fs' ),
                 SOURCE_DIR = 'src/',
                 BUILD_DIR = 'build/',
                 autoprefixer = require('autoprefixer'),
+                sass = require( 'sass' ),
                 mediaConfig = {},
                 mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
@@ -26 +27 @@
                                 processors: [
                                         autoprefixer({
-                                                browsers: [
-                                                        'Android >= 2.1',
-                                                        'Chrome >= 21',
-                                                        'Edge >= 12',
-                                                        'Explorer >= 7',
-                                                        'Firefox >= 17',
-                                                        'Opera >= 12.1',
-                                                        'Safari >= 6.0'
-                                                ],
                                                 cascade: false
                                         })
@@ -167 +159 @@
                                 src: ['wp-admin/css/colors/*/colors.scss'],
                                 options: {
-                                        outputStyle: 'expanded'
+                                        implementation: sass
                                 }
                         }
@@ -442 +434 @@
                 uglify: {
                         options: {
-                                ASCIIOnly: true
+                                output: {
+                                        ascii_only: true,
+                                        ie8: true
+                                }
                         },
                         core: {
@@ -499 +494 @@
                                 options: {
                                         // Preserve comments that start with a bang.
-                                        preserveComments: /^!/
+                                        output: {
+                                                comments: /^!/
+                                        }
                                 },
                                 expand: true,
@@ -690 +687 @@
         grunt.registerTask( 'precommit', 'Runs test and build tasks in preparation for a commit', function() {
                 var done = this.async();
-
-                // Figure out what tasks to run based on what files have been modified.
-                function enqueueTestingTasksForModifiedFiles( filesModified ) {
-                        var taskList = ['precommit:base'];
-                        if ( /.*\.js/.test( filesModified ) ) {
-                                grunt.log.write( 'JavaScript source files modified. JavaScript tests will be run.\n');
-                                taskList = taskList.concat( ['precommit:js'] );
-                        }
-                        if ( /src.*\.css/.test( filesModified ) ) {
-                                grunt.log.write( 'CSS source files modified. CSS tests will be run.\n');
-                                taskList = taskList.concat( ['postcss:core'] );
-                        }
-                        if ( /.*\.php/.test( filesModified ) ) {
-                                grunt.log.write( 'PHP source files modified. PHP tests will be run.\n');
-                                taskList = taskList.concat( ['precommit:php'] );
-                        }
-                        grunt.task.run( taskList );
-                        done();
+                var map = {
+                        svn: 'svn status --ignore-externals',
+                        git: 'git status --short'
+                };
+
+                find( [
+                        __dirname + '/.svn',
+                        __dirname + '/.git',
+                        path.dirname( __dirname ) + '/.svn'
+                ] );
+
+                function find( set ) {
+                        var dir;
+
+                        if ( set.length ) {
+                                fs.stat( dir = set.shift(), function( error ) {
+                                        error ? find( set ) : run( path.basename( dir ).substr( 1 ) );
+                                } );
+                        } else {
+                                grunt.fatal( 'This WordPress install is not under version control.' );
+                        }
                 }
-                gitorsvn( __dirname, function(gitorsvn) {
-                        if ( gitorsvn === 'svn' ) {
-                                grunt.util.spawn(
-                                        {
-                                                cmd: 'svn',
-                                                args: ['status']
-                                        },
-                                        function(error, result, code) {
-                                                if ( code !== 0 ) {
-                                                        grunt.fail.warn( 'The `svn status` command returned a non-zero exit code.', code );
-                                                }
-                                                enqueueTestingTasksForModifiedFiles( result.stdout );
-                                        }
-                                );
-                        } else if ( gitorsvn === 'git' ) {
-                                grunt.util.spawn(
-                                        {
-                                                cmd: 'git',
-                                                args: ['diff', '--name-only']
-                                        },
-                                        function(error, result, code) {
-                                                if ( code !== 0 ) {
-                                                        grunt.fail.warn( 'The `git diff --name-only` command returned a non-zero exit code.', code );
-                                                }
-                                                enqueueTestingTasksForModifiedFiles( result.stdout );
-                                        }
-                                );
-                        } else {
-                                grunt.log.write( 'This WordPress install is not under version control. No tests will be run.' );
-                        }
-                });
-        });
+
+                function run( type ) {
+                        var command = map[ type ].split( ' ' );
+                        var taskList = [ 'precommit:base' ];
+
+                        grunt.util.spawn( {
+                                cmd: command.shift(),
+                                args: command
+                        }, function( error, result, code ) {
+                                if ( code !== 0 ) {
+                                        grunt.fatal( 'The `' +  map[ type ] + '` command returned a non-zero exit code.', code );
+                                }
+
+                                [ 'js', 'css', 'php' ].forEach( function( extension ) {
+                                        if ( ( result.stdout + '\n' ).indexOf( '.' + extension + '\n' ) !== -1 ) {
+                                                grunt.log.writeln( extension.toUpperCase() + ' files modified. ' + extension.toUpperCase() + ' tests will be run.');
+                                                taskList.push( 'precommit:' + extension );
+                                        }
+                                } );
+
+                                grunt.task.run( taskList );
+
+                                done();
+                        } );
+                }
+        } );
 
         grunt.registerTask( 'copy:all', [

branches/4.5/package.json

@@ -1 +1 @@
 {
-  "name": "WordPress",
-  "version": "4.5.23",
-  "description": "WordPress is web software you can use to create a beautiful website or blog.",
-  "repository": {
-    "type": "svn",
-    "url": "https://develop.svn.wordpress.org/trunk"
-  },
-  "author": "The WordPress Contributors",
-  "license": "GPL-2.0+",
-  "devDependencies": {
-    "autoprefixer": "~6.3.3",
-    "git-or-svn": "~0.1.0",
-    "grunt": "~0.4.5",
-    "grunt-browserify": "~5.0.0",
-    "grunt-contrib-clean": "~1.0.0",
-    "grunt-contrib-compress": "~1.1.0",
-    "grunt-contrib-concat": "~1.0.0",
-    "grunt-contrib-copy": "~1.0.0",
-    "grunt-contrib-cssmin": "~1.0.0",
-    "grunt-contrib-imagemin": "~1.0.0",
-    "grunt-contrib-jshint": "~1.0.0",
-    "grunt-contrib-qunit": "~1.1.0",
-    "grunt-contrib-uglify": "~0.10.0",
-    "grunt-contrib-watch": "~1.0.0",
-    "grunt-includes": "~0.5.1",
-    "grunt-jsvalidate": "~0.2.2",
-    "grunt-legacy-util": "^0.2.0",
-    "grunt-patch-wordpress": "~0.3.0",
-    "grunt-postcss": "~0.7.1",
-    "grunt-rtlcss": "~2.0.1",
-    "grunt-sass": "~1.1.0",
-    "matchdep": "~1.0.0"
-  }
+        "name": "WordPress",
+        "version": "4.5.23",
+        "description": "WordPress is web software you can use to create a beautiful website or blog.",
+        "repository": {
+                "type": "svn",
+                "url": "https://develop.svn.wordpress.org/trunk"
+        },
+        "engines": {
+                "node": ">=14.15.0",
+                "npm": ">=6.14.8"
+        },
+        "author": "The WordPress Contributors",
+        "license": "GPL-2.0+",
+        "browserslist": [
+                "Android >= 2.1",
+                "Chrome >= 21",
+                "Edge >= 12",
+                "Explorer >= 7",
+                "Firefox >= 17",
+                "Opera >= 12.1",
+                "Safari >= 6.0"
+        ],
+        "devDependencies": {
+                "autoprefixer": "^9.8.6",
+                "grunt": "~1.3.0",
+                "grunt-browserify": "~5.3.0",
+                "grunt-contrib-clean": "~2.0.0",
+                "grunt-contrib-compress": "~2.0.0",
+                "grunt-contrib-concat": "~1.0.1",
+                "grunt-contrib-copy": "~1.0.0",
+                "grunt-contrib-cssmin": "~3.0.0",
+                "grunt-contrib-imagemin": "~4.0.0",
+                "grunt-contrib-jshint": "3.0.0",
+                "grunt-contrib-qunit": "^4.0.0",
+                "grunt-contrib-uglify": "~5.0.0",
+                "grunt-contrib-watch": "~1.1.0",
+                "grunt-includes": "~1.1.0",
+                "grunt-jsvalidate": "~0.2.2",
+                "grunt-legacy-util": "^2.0.0",
+                "grunt-patch-wordpress": "~3.0.0",
+                "grunt-postcss": "~0.9.0",
+                "grunt-rtlcss": "~2.0.1",
+                "grunt-sass": "~3.1.0",
+                "matchdep": "~2.0.0",
+                "sass": "^1.32.6"
+        }
 }

branches/4.5/src/wp-admin/js/bookmarklet.min.js

@@ -1 @@
-(function(a,b,c,d){function e(a,c){if("undefined"!=typeof c){var d=b.createElement("input");d.name=a,d.value=c,d.type="hidden",p.appendChild(d)}}var f,g,h,i,j,k,l,m,n,o=a.encodeURIComponent,p=b.createElement("form"),q=b.getElementsByTagName("head")[0],r="_press_this_app",s=!0;if(d){if(!c.match(/^https?:/))return void(top.location.href=d);if(d+="&u="+o(c),c.match(/^https:/)&&d.match(/^http:/)&&(s=!1),a.getSelection?h=a.getSelection()+"":b.getSelection?h=b.getSelection()+"":b.selection&&(h=b.selection.createRange().text||""),d+="&buster="+(new Date).getTime(),s||(b.title&&(d+="&t="+o(b.title.substr(0,256))),h&&(d+="&s="+o(h.substr(0,512)))),f=a.outerWidth||b.documentElement.clientWidth||600,g=a.outerHeight||b.documentElement.clientHeight||700,f=800>f||f>5e3?600:.7*f,g=800>g||g>3e3?700:.9*g,!s)return void a.open(d,r,"location,resizable,scrollbars,width="+f+",height="+g);i=q.getElementsByTagName("meta")||[];for(var t=0;t<i.length&&!(t>200);t++){var u=i[t],v=u.getAttribute("name"),w=u.getAttribute("property"),x=u.getAttribute("content");x&&(v?e("_meta["+v+"]",x):w&&e("_meta["+w+"]",x))}j=q.getElementsByTagName("link")||[];for(var y=0;y<j.length&&!(y>=50);y++){var z=j[y],A=z.getAttribute("rel");("canonical"===A||"icon"===A||"shortlink"===A)&&e("_links["+A+"]",z.getAttribute("href"))}b.body.getElementsByClassName&&(k=b.body.getElementsByClassName("hfeed")[0]),k=b.getElementById("content")||k||b.body,l=k.getElementsByTagName("img")||[];for(var B=0;B<l.length&&!(B>=100);B++)n=l[B],n.src.indexOf("avatar")>-1||n.className.indexOf("avatar")>-1||n.width&&n.width<256||n.height&&n.height<128||e("_images[]",n.src);m=b.body.getElementsByTagName("iframe")||[];for(var C=0;C<m.length&&!(C>=50);C++)e("_embeds[]",m[C].src);b.title&&e("t",b.title),h&&e("s",h),p.setAttribute("method","POST"),p.setAttribute("action",d),p.setAttribute("target",r),p.setAttribute("style","display: none;"),a.open("about:blank",r,"location,resizable,scrollbars,width="+f+",height="+g),b.body.appendChild(p),p.submit()}})(window,document,top.location.href,window.pt_url);
+(function(e,n,t,i){var a,l,o,r,s,m,g,h=e.encodeURIComponent,c=n.createElement("form"),d=n.getElementsByTagName("head")[0],b="_press_this_app",u=!0;if(i)if(t.match(/^https?:/))if(i+="&u="+h(t),t.match(/^https:/)&&i.match(/^http:/)&&(u=!1),e.getSelection?a=e.getSelection()+"":n.getSelection?a=n.getSelection()+"":n.selection&&(a=n.selection.createRange().text||""),i+="&buster="+(new Date).getTime(),u||(n.title&&(i+="&t="+h(n.title.substr(0,256))),a&&(i+="&s="+h(a.substr(0,512)))),t=(t=e.outerWidth||n.documentElement.clientWidth||600)<800||5e3<t?600:.7*t,h=(h=e.outerHeight||n.documentElement.clientHeight||700)<800||3e3<h?700:.9*h,u){l=d.getElementsByTagName("meta")||[];for(var p=0;p<l.length&&!(200<p);p++){var f=l[p],y=f.getAttribute("name"),v=f.getAttribute("property"),f=f.getAttribute("content");f&&(y?N("_meta["+y+"]",f):v&&N("_meta["+v+"]",f))}o=d.getElementsByTagName("link")||[];for(var E=0;E<o.length&&!(50<=E);E++){var w=o[E],A=w.getAttribute("rel");"canonical"!==A&&"icon"!==A&&"shortlink"!==A||N("_links["+A+"]",w.getAttribute("href"))}n.body.getElementsByClassName&&(r=n.body.getElementsByClassName("hfeed")[0]),s=(r=n.getElementById("content")||r||n.body).getElementsByTagName("img")||[];for(var _=0;_<s.length&&!(100<=_);_++)-1<(g=s[_]).src.indexOf("avatar")||-1<g.className.indexOf("avatar")||g.width&&g.width<256||g.height&&g.height<128||N("_images[]",g.src);m=n.body.getElementsByTagName("iframe")||[];for(var B=0;B<m.length&&!(50<=B);B++)N("_embeds[]",m[B].src);n.title&&N("t",n.title),a&&N("s",a),c.setAttribute("method","POST"),c.setAttribute("action",i),c.setAttribute("target",b),c.setAttribute("style","display: none;"),e.open("about:blank",b,"location,resizable,scrollbars,width="+t+",height="+h),n.body.appendChild(c),c.submit()}else e.open(i,b,"location,resizable,scrollbars,width="+t+",height="+h);else top.location.href=i;function N(e,t){var i;void 0!==t&&((i=n.createElement("input")).name=e,i.value=t,i.type="hidden",c.appendChild(i))}})(window,document,top.location.href,window.pt_url);

branches/4.5/src/wp-includes/js/media-audiovideo.js

@@ -1 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 var media = wp.media,
         baseSettings = window._wpmejsSettings || {},

branches/4.5/src/wp-includes/js/media-grid.js

@@ -1 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 /**
  * wp.media.controller.EditAttachmentMetadata

branches/4.5/src/wp-includes/js/media-models.js

@@ -1 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 var $ = jQuery,
         Attachment, Attachments, l10n, media;

branches/4.5/src/wp-includes/js/media-views.js

@@ -1 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 /**
  * wp.media.controller.CollectionAdd