Changeset 50214 for branches/4.2

Timestamp:

02/05/2021 04:27:25 AM (4 years ago)

Author:

desrosj

Message:

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

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

Props desrosj, dd32, netweb, jorbin.
Merges [32356-32357,32988,33726,34888,35335,35363,35513,35521,35538-35541,35859,36861-36865,36935,36979,37017,37019-37020,37212,37612,38111,39110,39113,39115-39119,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.2 branch.
See #52341.

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• .editorconfig (modified) (1 diff)
• .nvmrc (modified) (1 diff)
• Gruntfile.js (modified) (7 diffs)
• package-lock.json (added)
• package.json (modified) (1 diff)
• src/wp-admin/js/bookmarklet.min.js (modified) (1 diff)

branches/4.2/.editorconfig

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

branches/4.2/.nvmrc

@@ -1 @@
-v0.12.18
+14

branches/4.2/Gruntfile.js

@@ -5 +5 @@
         BUILD_DIR = 'build/',
         mediaConfig = {},
-        mediaBuilds = ['audiovideo', 'grid', 'models', 'views'];
+        mediaBuilds = ['audiovideo', 'grid', 'models', 'views'],
+        sass = require( 'sass' );
 
     // Load tasks.
@@ -135 +136 @@
                 src: ['wp-admin/css/colors/*/colors.scss'],
                 options: {
-                    outputStyle: 'expanded'
+                    implementation: sass
                 }
             }
@@ -176 +177 @@
             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' ],
@@ -193 +194 @@
                     ]
                 },
-                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: {
@@ -394 +404 @@
         },
         uglify: {
+            options: {
+                output: {
+                    ascii_only: true,
+                    ie8: true
+                }
+            },
             core: {
                 expand: true,
@@ -433 +449 @@
             jqueryui: {
                 options: {
-                    preserveComments: 'some'
+                    output: {
+                        comments: /^!/
+                    }
                 },
                 expand: true,
@@ -535 +553 @@
                     interval: 2000
                 }
-            },
-            browserify: {
-                files: [
-                    SOURCE_DIR + 'wp-includes/js/media/*.js',
-                    '!' + SOURCE_DIR + 'wp-includes/js/media/*.manifest.js'
-                ],
-                tasks: ['uglify:media']
             },
             config: {

branches/4.2/package.json

@@ -1 +1 @@
 {
-  "name": "WordPress",
-  "version": "4.2.29",
-  "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": "~2.2.0",
-    "grunt-browserify": "^3.3.0",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-compress": "~0.13.0",
-    "grunt-contrib-concat": "~0.5.1",
-    "grunt-contrib-copy": "~0.8.0",
-    "grunt-contrib-cssmin": "~0.10.0",
-    "grunt-contrib-imagemin": "~0.9.3",
-    "grunt-contrib-jshint": "~0.11.0",
-    "grunt-contrib-qunit": "~0.5.2",
-    "grunt-contrib-uglify": "~0.8.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-includes": "~0.4.5",
-    "grunt-jsvalidate": "~0.2.2",
-    "grunt-legacy-util": "^0.2.0",
-    "grunt-patch-wordpress": "~0.3.0",
-    "grunt-rtlcss": "~1.6.0",
-    "grunt-sass": "~0.18.0",
-    "matchdep": "~0.3.0"
-  }
+    "name": "WordPress",
+    "version": "4.2.29",
+    "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-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-rtlcss": "~2.0.2",
+        "grunt-sass": "~3.1.0",
+        "matchdep": "~2.0.0",
+        "sass": "^1.32.6"
+    }
 }

branches/4.2/src/wp-admin/js/bookmarklet.min.js

@@ -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);(c.match(/\/\/(www|m)\.youtube\.com\/watch/)||c.match(/\/\/vimeo\.com\/(.+\/)?([\d]+)$/)||c.match(/\/\/(www\.)?dailymotion\.com\/video\/.+$/)||c.match(/\/\/soundcloud\.com\/.+$/)||c.match(/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/)||c.match(/\/\/vine\.co\/v\/[^\/]+/))&&e("_embeds[]",c),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(t,i,e,a){var n,o,l,m,r,s,c,h,d=t.encodeURIComponent,g=i.createElement("form"),u=i.getElementsByTagName("head")[0],b="_press_this_app",p=!0;if(a)if(e.match(/^https?:/))if(a+="&u="+d(e),e.match(/^https:/)&&a.match(/^http:/)&&(p=!1),t.getSelection?o=t.getSelection()+"":i.getSelection?o=i.getSelection()+"":i.selection&&(o=i.selection.createRange().text||""),a+="&buster="+(new Date).getTime(),p||(i.title&&(a+="&t="+d(i.title.substr(0,256))),o&&(a+="&s="+d(o.substr(0,512)))),n=(n=t.outerWidth||i.documentElement.clientWidth||600)<800||5e3<n?600:.7*n,d=(d=t.outerHeight||i.documentElement.clientHeight||700)<800||3e3<d?700:.9*d,p){(e.match(/\/\/(www|m)\.youtube\.com\/watch/)||e.match(/\/\/vimeo\.com\/(.+\/)?([\d]+)$/)||e.match(/\/\/(www\.)?dailymotion\.com\/video\/.+$/)||e.match(/\/\/soundcloud\.com\/.+$/)||e.match(/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/)||e.match(/\/\/vine\.co\/v\/[^\/]+/))&&T("_embeds[]",e),l=u.getElementsByTagName("meta")||[];for(var y=0;y<l.length&&!(200<y);y++){var f=l[y],w=f.getAttribute("name"),v=f.getAttribute("property"),f=f.getAttribute("content");f&&(w?T("_meta["+w+"]",f):v&&T("_meta["+v+"]",f))}m=u.getElementsByTagName("link")||[];for(var E=0;E<m.length&&!(50<=E);E++){var _=m[E],A=_.getAttribute("rel");"canonical"!==A&&"icon"!==A&&"shortlink"!==A||T("_links["+A+"]",_.getAttribute("href"))}i.body.getElementsByClassName&&(r=i.body.getElementsByClassName("hfeed")[0]),s=(r=i.getElementById("content")||r||i.body).getElementsByTagName("img")||[];for(var B=0;B<s.length&&!(100<=B);B++)-1<(h=s[B]).src.indexOf("avatar")||-1<h.className.indexOf("avatar")||h.width&&h.width<256||h.height&&h.height<128||T("_images[]",h.src);c=i.body.getElementsByTagName("iframe")||[];for(var N=0;N<c.length&&!(50<=N);N++)T("_embeds[]",c[N].src);i.title&&T("t",i.title),o&&T("s",o),g.setAttribute("method","POST"),g.setAttribute("action",a),g.setAttribute("target",b),g.setAttribute("style","display: none;"),t.open("about:blank",b,"location,resizable,scrollbars,width="+n+",height="+d),i.body.appendChild(g),g.submit()}else t.open(a,b,"location,resizable,scrollbars,width="+n+",height="+d);else top.location.href=a;function T(t,e){var a;void 0!==e&&((a=i.createElement("input")).name=t,a.value=e,a.type="hidden",g.appendChild(a))}})(window,document,top.location.href,window.pt_url);