Skip to content

Commit 676c22e

Browse files
committed
Build/Test Tools: Support NodeJS 14.x in the 5.0 branch.
This updates the 5.0 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. In addition to backporting the package updates that happened after branching 5.0, dependencies that were removed in future releases have also been updated to their latest versions. Props desrosj, dd32, netweb, jorbin. Merges [44233,44728,45321,45765,45826,46403-46404,46408,46409,47404,47867-47869,47872-47873,48705,49636,49933,49937,49939,49940,49983,49989,50017,50126,50176,50185,50192] to the 5.0 branch. See #52341. git-svn-id: https://develop.svn.wordpress.org/branches/5.0@50201 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 4b924e3 commit 676c22e

File tree

7 files changed

+6473
-8172
lines changed

7 files changed

+6473
-8172
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
1+
14

Gruntfile.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ module.exports = function(grunt) {
99
SOURCE_DIR = 'src/',
1010
BUILD_DIR = 'build/',
1111
BANNER_TEXT = '/*! This file is auto-generated */',
12-
autoprefixer = require( 'autoprefixer' );
12+
autoprefixer = require( 'autoprefixer' ),
13+
sass = require( 'sass' );
1314

1415
// Load tasks.
1516
require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );
@@ -22,18 +23,6 @@ module.exports = function(grunt) {
2223
options: {
2324
processors: [
2425
autoprefixer({
25-
browsers: [
26-
'> 1%',
27-
'ie >= 11',
28-
'last 1 Android versions',
29-
'last 1 ChromeAndroid versions',
30-
'last 2 Chrome versions',
31-
'last 2 Firefox versions',
32-
'last 2 Safari versions',
33-
'last 2 iOS versions',
34-
'last 2 Edge versions',
35-
'last 2 Opera versions'
36-
],
3726
cascade: false
3827
})
3928
]
@@ -184,7 +173,7 @@ module.exports = function(grunt) {
184173
ext: '.css',
185174
src: ['wp-admin/css/colors/*/colors.scss'],
186175
options: {
187-
outputStyle: 'expanded'
176+
implementation: sass
188177
}
189178
}
190179
},
@@ -485,8 +474,9 @@ module.exports = function(grunt) {
485474
},
486475
uglify: {
487476
options: {
488-
ASCIIOnly: true,
489-
screwIE8: false
477+
output: {
478+
ascii_only: true
479+
}
490480
},
491481
core: {
492482
expand: true,
@@ -542,7 +532,9 @@ module.exports = function(grunt) {
542532
jqueryui: {
543533
options: {
544534
// Preserve comments that start with a bang.
545-
preserveComments: /^!/
535+
output: {
536+
comments: /^!/
537+
}
546538
},
547539
expand: true,
548540
cwd: SOURCE_DIR,
@@ -553,7 +545,9 @@ module.exports = function(grunt) {
553545
masonry: {
554546
options: {
555547
// Preserve comments that start with a bang.
556-
preserveComments: /^!/
548+
output: {
549+
comments: /^!/
550+
}
557551
},
558552
src: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.js',
559553
dest: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.min.js'

0 commit comments

Comments
 (0)