Changeset 50216 for branches/4.1

Timestamp:

02/05/2021 04:29:50 AM (4 years ago)

Author:

desrosj

Message:

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

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.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• .editorconfig (modified) (1 diff)
• .jshintrc (modified) (1 diff)
• .nvmrc (modified) (1 diff)
• Gruntfile.js (modified) (4 diffs)
• package-lock.json (added)
• package.json (modified) (1 diff)
• src/wp-admin/css/colors/_admin.scss (modified) (1 diff)

branches/4.1/.editorconfig

@@ -14 +14 @@
 indent_style = tab
 
-[{.jshintrc,*.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2

branches/4.1/.jshintrc

@@ -20 +20 @@
         "Backbone": false,
         "jQuery": false,
+        "JSON":false,
         "wp": false
     }

branches/4.1/.nvmrc

@@ -1 @@
-v0.10.48
+14

branches/4.1/Gruntfile.js

@@ -3 +3 @@
     var path = require('path'),
         SOURCE_DIR = 'src/',
-        BUILD_DIR = 'build/';
+        BUILD_DIR = 'build/',
+        sass = require( 'sass' );
 
     // Load tasks.
@@ -123 +124 @@
                 src: ['wp-admin/css/colors/*/colors.scss'],
                 options: {
-                    outputStyle: 'expanded'
+                    implementation: sass
                 }
             }
@@ -336 +337 @@
         },
         uglify: {
+            options: {
+                output: {
+                    ie8: true
+                }
+            },
             core: {
                 expand: true,
@@ -361 +367 @@
             jqueryui: {
                 options: {
-                    preserveComments: 'some'
+                    output: {
+                        comments: /^!/
+                    }
                 },
                 expand: true,

branches/4.1/package.json

@@ -1 +1 @@
 {
-  "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"
+    }
 }

branches/4.1/src/wp-admin/css/colors/_admin.scss

@@ -358 +358 @@
 }
 
-#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; }