mirror of
git://develop.git.wordpress.org/
synced 2025-04-14 00:52:00 +02:00
Build/Test Tools: Support NodeJS 14.x in the 4.4 branch.
This updates the 4.4 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.4, dependencies that were removed in future releases have also been updated to their latest versions. Props desrosj, dd32, netweb, jorbin. Merges [35859,35862,36860-36865,36935,36978-36979,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,50192] to the 4.4 branch. See #52341. git-svn-id: https://develop.svn.wordpress.org/branches/4.4@50210 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
12bc77d2fb
commit
f2700994d7
@ -13,7 +13,7 @@ insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
indent_style = tab
|
||||
|
||||
[{.jshintrc,*.json,*.yml}]
|
||||
[*.yml]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
|
80
Gruntfile.js
80
Gruntfile.js
@ -1,9 +1,10 @@
|
||||
/* jshint node:true */
|
||||
9/* jshint node:true */
|
||||
module.exports = function(grunt) {
|
||||
var path = require('path'),
|
||||
SOURCE_DIR = 'src/',
|
||||
BUILD_DIR = 'build/',
|
||||
autoprefixer = require('autoprefixer'),
|
||||
sass = require( 'sass' ),
|
||||
mediaConfig = {},
|
||||
mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
|
||||
|
||||
@ -24,15 +25,6 @@ module.exports = function(grunt) {
|
||||
options: {
|
||||
processors: [
|
||||
autoprefixer({
|
||||
browsers: [
|
||||
'Android >= 2.1',
|
||||
'Chrome >= 21',
|
||||
'Edge >= 12',
|
||||
'Explorer >= 7',
|
||||
'Firefox >= 17',
|
||||
'Opera >= 12.1',
|
||||
'Safari >= 6.0'
|
||||
],
|
||||
cascade: false
|
||||
})
|
||||
]
|
||||
@ -148,7 +140,7 @@ module.exports = function(grunt) {
|
||||
ext: '.css',
|
||||
src: ['wp-admin/css/colors/*/colors.scss'],
|
||||
options: {
|
||||
outputStyle: 'expanded'
|
||||
implementation: sass
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -190,14 +182,14 @@ module.exports = function(grunt) {
|
||||
rtlcss: {
|
||||
options: {
|
||||
// rtlcss options
|
||||
config: {
|
||||
swapLeftRightInUrl: false,
|
||||
swapLtrRtlInUrl: false,
|
||||
autoRename: false,
|
||||
preserveDirectives: true,
|
||||
opts: {
|
||||
clean: false,
|
||||
processUrls: { atrule: true, decl: false },
|
||||
stringMap: [
|
||||
{
|
||||
name: 'import-rtl-stylesheet',
|
||||
priority: 10,
|
||||
exclusive: true,
|
||||
search: [ '.css' ],
|
||||
replace: [ '-rtl.css' ],
|
||||
options: {
|
||||
@ -207,29 +199,38 @@ module.exports = function(grunt) {
|
||||
}
|
||||
]
|
||||
},
|
||||
properties : [
|
||||
saveUnmodified: false,
|
||||
plugins: [
|
||||
{
|
||||
name: 'swap-dashicons-left-right-arrows',
|
||||
expr: /content/im,
|
||||
action: function( prop, value ) {
|
||||
if ( value === '"\\f141"' ) { // dashicons-arrow-left
|
||||
value = '"\\f139"';
|
||||
} else if ( value === '"\\f340"' ) { // dashicons-arrow-left-alt
|
||||
value = '"\\f344"';
|
||||
} else if ( value === '"\\f341"' ) { // dashicons-arrow-left-alt2
|
||||
value = '"\\f345"';
|
||||
} else if ( value === '"\\f139"' ) { // dashicons-arrow-right
|
||||
value = '"\\f141"';
|
||||
} else if ( value === '"\\f344"' ) { // dashicons-arrow-right-alt
|
||||
value = '"\\f340"';
|
||||
} else if ( value === '"\\f345"' ) { // dashicons-arrow-right-alt2
|
||||
value = '"\\f341"';
|
||||
priority: 10,
|
||||
directives: {
|
||||
control: {},
|
||||
value: []
|
||||
},
|
||||
processors: [
|
||||
{
|
||||
expr: /content/im,
|
||||
action: function( prop, value ) {
|
||||
if ( value === '"\\f141"' ) { // dashicons-arrow-left
|
||||
value = '"\\f139"';
|
||||
} else if ( value === '"\\f340"' ) { // dashicons-arrow-left-alt
|
||||
value = '"\\f344"';
|
||||
} else if ( value === '"\\f341"' ) { // dashicons-arrow-left-alt2
|
||||
value = '"\\f345"';
|
||||
} else if ( value === '"\\f139"' ) { // dashicons-arrow-right
|
||||
value = '"\\f141"';
|
||||
} else if ( value === '"\\f344"' ) { // dashicons-arrow-right-alt
|
||||
value = '"\\f340"';
|
||||
} else if ( value === '"\\f345"' ) { // dashicons-arrow-right-alt2
|
||||
value = '"\\f341"';
|
||||
}
|
||||
return { prop: prop, value: value };
|
||||
}
|
||||
}
|
||||
return { prop: prop, value: value };
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
saveUnmodified: false
|
||||
]
|
||||
},
|
||||
core: {
|
||||
expand: true,
|
||||
@ -411,7 +412,10 @@ module.exports = function(grunt) {
|
||||
},
|
||||
uglify: {
|
||||
options: {
|
||||
ASCIIOnly: true
|
||||
output: {
|
||||
ascii_only: true,
|
||||
ie8: true
|
||||
}
|
||||
},
|
||||
core: {
|
||||
expand: true,
|
||||
@ -466,7 +470,9 @@ module.exports = function(grunt) {
|
||||
jqueryui: {
|
||||
options: {
|
||||
// Preserve comments that start with a bang.
|
||||
preserveComments: /^!/
|
||||
output: {
|
||||
comments: /^!/
|
||||
}
|
||||
},
|
||||
expand: true,
|
||||
cwd: SOURCE_DIR,
|
||||
|
20607
npm-shrinkwrap.json
generated
20607
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
7941
package-lock.json
generated
Normal file
7941
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
82
package.json
82
package.json
@ -1,34 +1,48 @@
|
||||
{
|
||||
"name": "WordPress",
|
||||
"version": "4.4.24",
|
||||
"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.1.0",
|
||||
"grunt": "~0.4.5",
|
||||
"grunt-browserify": "~4.0.1",
|
||||
"grunt-contrib-clean": "~0.6.0",
|
||||
"grunt-contrib-compress": "~0.14.0",
|
||||
"grunt-contrib-concat": "~0.5.1",
|
||||
"grunt-contrib-copy": "~0.8.2",
|
||||
"grunt-contrib-cssmin": "~0.14.0",
|
||||
"grunt-contrib-imagemin": "~0.9.4",
|
||||
"grunt-contrib-jshint": "~0.11.3",
|
||||
"grunt-contrib-qunit": "~1.1.0",
|
||||
"grunt-contrib-uglify": "~0.10.0",
|
||||
"grunt-contrib-watch": "~0.6.1",
|
||||
"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": "~1.6.0",
|
||||
"grunt-sass": "~1.1.0",
|
||||
"matchdep": "~1.0.0"
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "WordPress",
|
||||
"version": "4.4.24",
|
||||
"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.2",
|
||||
"grunt-sass": "~3.1.0",
|
||||
"matchdep": "~2.0.0",
|
||||
"sass": "^1.32.6"
|
||||
}
|
||||
}
|
||||
|
@ -145,6 +145,7 @@
|
||||
display: inline-block;
|
||||
float: none;
|
||||
margin-right: 4.799999999%;
|
||||
width: -webkit-calc( 47.6% - 4px );
|
||||
width: calc( 47.6% - 4px );
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
2
src/wp-admin/js/bookmarklet.min.js
vendored
2
src/wp-admin/js/bookmarklet.min.js
vendored
@ -1 +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);
|
@ -1,4 +1,4 @@
|
||||
(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 || {},
|
||||
l10n = window._wpMediaViewsL10n || {};
|
||||
|
@ -1,4 +1,4 @@
|
||||
(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
|
||||
*
|
||||
|
@ -1,4 +1,4 @@
|
||||
(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;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
(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
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user