mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-01-16 20:38:35 +01:00
Code Issues Actions 75 Packages Projects Releases Wiki Activity

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

Browse Source 
This updates the 4.1 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.1, dependencies that were removed in future releases have also been updated to their latest versions.

Props desrosj, dd32, netweb, jorbin.
Merges [31425,31504,31557,31648-31650,32356-32357,32988,33726,35363,35513,35521,35538-35541,35859,36861-36865,37017,37019-37020,37212,37612,38111,39110,39113,39115-39117,39478,41835,42460-42461,42463,42887,43320,43323,43977,44219,44233,45321,45765,46404,46408-46409,47404,47867,47872-47873,48705,49636,49933,49937,49939,50126,50176,50185] to the 4.1 branch.
See #52341.

git-svn-id: https://develop.svn.wordpress.org/branches/4.1@50216 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonathan Desrosiers 2021-02-05 04:29:50 +00:00
parent 36a96f04ac
commit 08da37b18b
7 changed files with 6913 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -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

1
.jshintrc
View File

@ -19,6 +19,7 @@
"_": false,
"Backbone": false,
"jQuery": false,
"JSON":false,
"wp": false
}
}

2
.nvmrc
View File

@ -1 +1 @@
v0.10.48
14

14
Gruntfile.js
View File

@ -2,7 +2,8 @@
module.exports = function(grunt) {
var path = require('path'),
SOURCE_DIR = 'src/',
BUILD_DIR = 'build/';
BUILD_DIR = 'build/',
sass = require( 'sass' );
// Load tasks.
require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );
@ -122,7 +123,7 @@ module.exports = function(grunt) {
ext: '.css',
src: ['wp-admin/css/colors/*/colors.scss'],
options: {
outputStyle: 'expanded'
implementation: sass
}
}
},
@ -335,6 +336,11 @@ module.exports = function(grunt) {
}
},
uglify: {
options: {
output: {
ie8: true
}
},
core: {
expand: true,
cwd: SOURCE_DIR,
@ -360,7 +366,9 @@ module.exports = function(grunt) {
},
jqueryui: {
options: {
preserveComments: 'some'
output: {
comments: /^!/
}
},
expand: true,
cwd: SOURCE_DIR,

6861
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

63
package.json
View File

@ -1,31 +1,36 @@
{
"name": "WordPress",
"version": "4.1.32",
"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": "GPLv2 or later",
"devDependencies": {
"grunt": "~0.4.5",
"grunt-autoprefixer": "~1.0.1",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.12.0",
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-copy": "~0.7.0",
"grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-imagemin": "~0.9.1",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-uglify": "~0.6.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-cssjanus": "git://github.com/ocean90/grunt-cssjanus.git#936144c11fdee00427c3ce3cb0f87ee5770149b7",
"grunt-jsvalidate": "~0.2.2",
"grunt-legacy-util": "^0.2.0",
"grunt-patch-wordpress": "~0.2.1",
"grunt-sass": "~0.16.0",
"matchdep": "~0.3.0"
}
"name": "WordPress",
"version": "4.1.32",
"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": "GPLv2 or later",
"devDependencies": {
"grunt": "~1.3.0",
"grunt-autoprefixer": "~3.0.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-cssjanus": "~0.5.0",
"grunt-jsvalidate": "~0.2.2",
"grunt-legacy-util": "^2.0.0",
"grunt-patch-wordpress": "~3.0.0",
"grunt-sass": "~3.1.0",
"matchdep": "~2.0.0",
"sass": "^1.32.6"
}
}

8
src/wp-admin/css/colors/_admin.scss
View File

@ -357,10 +357,10 @@ ul#adminmenu > li.current > a.current:after {
background: $adminbar-input-background;
}
#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { color: $menu-text; opacity: .7; }
#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { color: $menu-text; opacity: .7; }
#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { color: $menu-text; opacity: .7; }
#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { color: $menu-text; opacity: .7; }
#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { color: $menu-text; opacity: 0.7; }
#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { color: $menu-text; opacity: 0.7; }
#wpadminbar #adminbarsearch .adminbar-input::-moz-placeholder { color: $menu-text; opacity: 0.7; }
#wpadminbar #adminbarsearch .adminbar-input:-ms-input-placeholder { color: $menu-text; opacity: 0.7; }
/* Admin Bar: my account */