WordPress.org

Make WordPress Core

Changeset 50212


Ignore:
Timestamp:
02/05/2021 04:24:59 AM (9 months ago)
Author:
desrosj
Message:

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

This updates the 4.3 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 change also introduces a packager-lock.json file to the branch.

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

Props desrosj, dd32, netweb, jorbin.
Merges [33726,34888,35332,35335,35363,35513,35520-35521,35538-35541,35562-35563,35859-36865,36935,36978-36980,37017,37019-37020,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] to the 4.3 branch.
See #52341.

Location:
branches/4.3
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • branches/4.3

  • branches/4.3/.editorconfig

    r32116 r50212  
    1414indent_style = tab
    1515
    16 [{.jshintrc,*.json,*.yml}]
     16[*.yml]
    1717indent_style = space
    1818indent_size = 2
  • branches/4.3/.nvmrc

    r49660 r50212  
    1 v4.7.2
     114
  • branches/4.3/Gruntfile.js

    r33292 r50212  
    44        SOURCE_DIR = 'src/',
    55        BUILD_DIR = 'build/',
    6         autoprefixer = require('autoprefixer-core'),
     6        autoprefixer = require('autoprefixer'),
     7        sass = require( 'sass' ),
    78        mediaConfig = {},
    89        mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
     
    2526                processors: [
    2627                    autoprefixer({
    27                         browsers: ['Android >= 2.1', 'Chrome >= 21', 'Explorer >= 7', 'Firefox >= 17', 'Opera >= 12.1', 'Safari >= 6.0'],
    2828                        cascade: false
    2929                    })
     
    141141                src: ['wp-admin/css/colors/*/colors.scss'],
    142142                options: {
    143                     outputStyle: 'expanded'
     143                    implementation: sass
    144144                }
    145145            }
     
    182182            options: {
    183183                // rtlcss options
    184                 config: {
    185                     swapLeftRightInUrl: false,
    186                     swapLtrRtlInUrl: false,
    187                     autoRename: false,
    188                     preserveDirectives: true,
     184                opts: {
     185                    clean: false,
     186                    processUrls: { atrule: true, decl: false },
    189187                    stringMap: [
    190188                        {
    191189                            name: 'import-rtl-stylesheet',
     190                            priority: 10,
     191                            exclusive: true,
    192192                            search: [ '.css' ],
    193193                            replace: [ '-rtl.css' ],
     
    199199                    ]
    200200                },
    201                 properties : [
     201                saveUnmodified: false,
     202                plugins: [
    202203                    {
    203204                        name: 'swap-dashicons-left-right-arrows',
    204                         expr: /content/im,
    205                         action: function( prop, value ) {
    206                             if ( value === '"\\f141"' ) { // dashicons-arrow-left
    207                                 value = '"\\f139"';
    208                             } else if ( value === '"\\f340"' ) { // dashicons-arrow-left-alt
    209                                 value = '"\\f344"';
    210                             } else if ( value === '"\\f341"' ) { // dashicons-arrow-left-alt2
    211                                 value = '"\\f345"';
    212                             } else if ( value === '"\\f139"' ) { // dashicons-arrow-right
    213                                 value = '"\\f141"';
    214                             } else if ( value === '"\\f344"' ) { // dashicons-arrow-right-alt
    215                                 value = '"\\f340"';
    216                             } else if ( value === '"\\f345"' ) { // dashicons-arrow-right-alt2
    217                                 value = '"\\f341"';
     205                        priority: 10,
     206                        directives: {
     207                            control: {},
     208                            value: []
     209                        },
     210                        processors: [
     211                            {
     212                                expr: /content/im,
     213                                action: function( prop, value ) {
     214                                    if ( value === '"\\f141"' ) { // dashicons-arrow-left
     215                                        value = '"\\f139"';
     216                                    } else if ( value === '"\\f340"' ) { // dashicons-arrow-left-alt
     217                                        value = '"\\f344"';
     218                                    } else if ( value === '"\\f341"' ) { // dashicons-arrow-left-alt2
     219                                        value = '"\\f345"';
     220                                    } else if ( value === '"\\f139"' ) { // dashicons-arrow-right
     221                                        value = '"\\f141"';
     222                                    } else if ( value === '"\\f344"' ) { // dashicons-arrow-right-alt
     223                                        value = '"\\f340"';
     224                                    } else if ( value === '"\\f345"' ) { // dashicons-arrow-right-alt2
     225                                        value = '"\\f341"';
     226                                    }
     227                                    return { prop: prop, value: value };
     228                                }
    218229                            }
    219                             return { prop: prop, value: value };
    220                         }
    221                     }
    222                 ],
    223                 saveUnmodified: false
     230                        ]
     231                    }
     232                ]
    224233            },
    225234            core: {
     
    401410        uglify: {
    402411            options: {
    403                 ASCIIOnly: true
     412                output: {
     413                    ascii_only: true,
     414                    ie8: true
     415                }
    404416            },
    405417            core: {
     
    442454            jqueryui: {
    443455                options: {
    444                     preserveComments: 'some'
     456                    output: {
     457                        comments: /^!/
     458                    }
    445459                },
    446460                expand: true,
     
    544558                    interval: 2000
    545559                }
    546             },
    547             browserify: {
    548                 files: [
    549                     SOURCE_DIR + 'wp-includes/js/media/*.js',
    550                     '!' + SOURCE_DIR + 'wp-includes/js/media/*.manifest.js'
    551                 ],
    552                 tasks: ['uglify:media']
    553560            },
    554561            config: {
  • branches/4.3/package.json

    r49421 r50212  
    11{
    2   "name": "WordPress",
    3   "version": "4.3.25",
    4   "description": "WordPress is web software you can use to create a beautiful website or blog.",
    5   "repository": {
    6     "type": "svn",
    7     "url": "https://develop.svn.wordpress.org/trunk"
    8   },
    9   "author": "The WordPress Contributors",
    10   "license": "GPL-2.0+",
    11   "devDependencies": {
    12     "autoprefixer-core": "~5.2.1",
    13     "grunt": "~0.4.5",
    14     "grunt-browserify": "~3.8.0",
    15     "grunt-contrib-clean": "~0.6.0",
    16     "grunt-contrib-compress": "~0.13.0",
    17     "grunt-contrib-concat": "~0.5.1",
    18     "grunt-contrib-copy": "~0.8.0",
    19     "grunt-contrib-cssmin": "~0.12.3",
    20     "grunt-contrib-imagemin": "~0.9.4",
    21     "grunt-contrib-jshint": "~0.11.2",
    22     "grunt-contrib-qunit": "~0.7.0",
    23     "grunt-contrib-uglify": "~0.9.1",
    24     "grunt-contrib-watch": "~0.6.1",
    25     "grunt-includes": "~0.5.1",
    26     "grunt-jsvalidate": "~0.2.2",
    27     "grunt-legacy-util": "^0.2.0",
    28     "grunt-patch-wordpress": "~0.3.0",
    29     "grunt-postcss": "~0.5.4",
    30     "grunt-rtlcss": "~1.6.0",
    31     "grunt-sass": "~1.0.0",
    32     "matchdep": "~0.3.0"
    33   }
     2    "name": "WordPress",
     3    "version": "4.3.25",
     4    "description": "WordPress is web software you can use to create a beautiful website or blog.",
     5    "repository": {
     6        "type": "svn",
     7        "url": "https://develop.svn.wordpress.org/trunk"
     8    },
     9    "engines": {
     10        "node": ">=14.15.0",
     11        "npm": ">=6.14.8"
     12    },
     13    "author": "The WordPress Contributors",
     14    "license": "GPL-2.0+",
     15    "browserslist": [
     16        "Android >= 2.1",
     17        "Chrome >= 21",
     18        "Explorer >= 7",
     19        "Firefox >= 17",
     20        "Opera >= 12.1",
     21        "Safari >= 6.0"
     22    ],
     23    "devDependencies": {
     24        "autoprefixer": "^9.8.6",
     25        "grunt": "~1.3.0",
     26        "grunt-browserify": "~5.3.0",
     27        "grunt-contrib-clean": "~2.0.0",
     28        "grunt-contrib-compress": "~2.0.0",
     29        "grunt-contrib-concat": "1.0.1",
     30        "grunt-contrib-copy": "~1.0.0",
     31        "grunt-contrib-cssmin": "~3.0.0",
     32        "grunt-contrib-imagemin": "~4.0.0",
     33        "grunt-contrib-jshint": "3.0.0",
     34        "grunt-contrib-qunit": "^4.0.0",
     35        "grunt-contrib-uglify": "~5.0.0",
     36        "grunt-contrib-watch": "~1.1.0",
     37        "grunt-includes": "~1.1.0",
     38        "grunt-jsvalidate": "~0.2.2",
     39        "grunt-legacy-util": "^2.0.0",
     40        "grunt-patch-wordpress": "~3.0.0",
     41        "grunt-postcss": "~0.9.0",
     42        "grunt-rtlcss": "~2.0.2",
     43        "grunt-sass": "~3.1.0",
     44        "matchdep": "~2.0.0",
     45        "sass": "^1.32.6"
     46    }
    3447}
  • branches/4.3/src/wp-admin/js/bookmarklet.min.js

    r32828 r50212  
    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);
     1(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.3/src/wp-includes/js/media-audiovideo.js

    r33337 r50212  
    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){
     1(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){
    22var media = wp.media,
    33    baseSettings = window._wpmejsSettings || {},
  • branches/4.3/src/wp-includes/js/media-grid.js

    r33342 r50212  
    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){
     1(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){
    22/**
    33 * wp.media.controller.EditAttachmentMetadata
  • branches/4.3/src/wp-includes/js/media-models.js

    r33337 r50212  
    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){
     1(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){
    22var $ = jQuery,
    33    Attachment, Attachments, l10n, media;
  • branches/4.3/src/wp-includes/js/media-views.js

    r50019 r50212  
    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){
     1(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){
    22/**
    33 * wp.media.controller.CollectionAdd
Note: See TracChangeset for help on using the changeset viewer.