Skip to content

Commit 0f989b3

Browse files
committed
Build/Test Tools: Support NodeJS 14.x in the 4.7 branch.
This updates the 4.7 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. 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.7, dependencies that were removed in future releases have also been updated to their latest versions. Props desrosj, dd32, netweb, jorbin. Merges [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.7 branch. See #52341. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@50204 602fd350-edb4-49c9-b593-d223f7449a82
1 parent c0f53ac commit 0f989b3

File tree

13 files changed

+8134
-5181
lines changed

13 files changed

+8134
-5181
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ insert_final_newline = true
1313
trim_trailing_whitespace = true
1414
indent_style = tab
1515

16-
[{.jshintrc,*.json,*.yml}]
16+
[*.yml]
1717
indent_style = space
1818
indent_size = 2
1919

.nvmrc

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

Gruntfile.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = function(grunt) {
55
SOURCE_DIR = 'src/',
66
BUILD_DIR = 'build/',
77
autoprefixer = require('autoprefixer'),
8+
sass = require( 'sass' ),
89
mediaConfig = {},
910
mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
1011

@@ -25,15 +26,6 @@ module.exports = function(grunt) {
2526
options: {
2627
processors: [
2728
autoprefixer({
28-
browsers: [
29-
'Android >= 2.1',
30-
'Chrome >= 21',
31-
'Edge >= 12',
32-
'Explorer >= 7',
33-
'Firefox >= 17',
34-
'Opera >= 12.1',
35-
'Safari >= 6.0'
36-
],
3729
cascade: false
3830
})
3931
]
@@ -166,7 +158,7 @@ module.exports = function(grunt) {
166158
ext: '.css',
167159
src: ['wp-admin/css/colors/*/colors.scss'],
168160
options: {
169-
outputStyle: 'expanded'
161+
implementation: sass
170162
}
171163
}
172164
},
@@ -447,8 +439,10 @@ module.exports = function(grunt) {
447439
},
448440
uglify: {
449441
options: {
450-
ASCIIOnly: true,
451-
screwIE8: false
442+
output: {
443+
ascii_only: true,
444+
ie8: true
445+
}
452446
},
453447
core: {
454448
expand: true,
@@ -505,7 +499,9 @@ module.exports = function(grunt) {
505499
jqueryui: {
506500
options: {
507501
// Preserve comments that start with a bang.
508-
preserveComments: /^!/
502+
output: {
503+
comments: /^!/
504+
}
509505
},
510506
expand: true,
511507
cwd: SOURCE_DIR,
@@ -525,7 +521,9 @@ module.exports = function(grunt) {
525521
masonry: {
526522
options: {
527523
// Preserve comments that start with a bang.
528-
preserveComments: /^!/
524+
output: {
525+
comments: /^!/
526+
}
529527
},
530528
src: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.js',
531529
dest: SOURCE_DIR + 'wp-includes/js/jquery/jquery.masonry.min.js'

0 commit comments

Comments
 (0)