Changeset 46634

Timestamp:

11/03/2019 03:29:46 PM (7 years ago)

Author:

desrosj

Message:

External Libraries: Update Plupload from 2.1.9 to 2.3.6.

This change also updates the MoxieJS dependency from 1.3.5 to 1.5.7, converts Plupload to a dependency in NPM, and integrates all relevant parts into the build process.

For a full list of upstream changes, see ​https://github.com/moxiecode/plupload/compare/v2.1.9...v2.3.6.

Props desrosj, hareesh-pillai.
Fixes #48277.

Location:

trunk

Files:

• . (modified) (1 prop)
• Gruntfile.js (modified) (4 diffs)
• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/js/_enqueues/vendor/plupload (deleted)
• src/js/_enqueues/wp/plupload (added)
• src/js/_enqueues/wp/plupload/handlers.js (added)
• src/js/_enqueues/wp/plupload/wp-plupload.js (added)
• src/wp-includes/script-loader.php (modified) (1 diff)

trunk

@@ -15 +15 @@
 vendor
 docker-compose.override.yml
+48277.dif

@@ -15 +15 @@
 vendor
 docker-compose.override.yml
+48277.dif

trunk/Gruntfile.js

@@ -168 +168 @@
                                                 [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
                                                 [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
+                                                [ WORKING_DIR + 'wp-includes/js/plupload/moxie.js' ]: [ './node_modules/plupload/js/moxie.js' ],
+                                                [ WORKING_DIR + 'wp-includes/js/plupload/plupload.js' ]: [ './node_modules/plupload/js/plupload.dev.js' ],
                                                 [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/dist/twemoji.js' ],
                                                 [ WORKING_DIR + 'wp-includes/js/underscore.js' ]: [ './node_modules/underscore/underscore.js' ],
@@ -295 +297 @@
                                         [ WORKING_DIR + 'wp-includes/js/mce-view.js' ]: [ './src/js/_enqueues/wp/mce-view.js' ],
                                         [ WORKING_DIR + 'wp-includes/js/media-editor.js' ]: [ './src/js/_enqueues/wp/media/editor.js' ],
+                                        [ WORKING_DIR + 'wp-includes/js/plupload/handlers.js' ]: [ './src/js/_enqueues/wp/plupload/handlers.js' ],
+                                        [ WORKING_DIR + 'wp-includes/js/plupload/wp-plupload.js' ]: [ './src/js/_enqueues/wp/plupload/wp-plupload.js' ],
                                         [ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
                                         [ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
@@ -1076 +1080 @@
                                         }
                                 ]
+                        },
+                        plupload: {
+                                options: {
+                                        patterns: [
+                                                {
+                                                        match: /;var MXI_DEBUG = true;/g,
+                                                        replacement: function () {
+                                                                return ';var MXI_DEBUG = false;';
+                                                        }
+                                                }
+                                        ]
+                                },
+                                files: [
+                                        {
+                                                expand: true,
+                                                flatten: true,
+                                                src: [
+                                                        'build/wp-includes/js/plupload/moxie.js'
+                                                ],
+                                                dest: 'build/wp-includes/js/plupload/'
+                                        }
+                                ]
                         }
                 },
@@ -1353 +1379 @@
                 'webpack:dev',
                 'copy:js',
+                'replace:plupload',
                 'file_append',
                 'uglify:all',

trunk/package-lock.json

@@ -15785 +15785 @@
                         }
                 },
+                "plupload": {
+                        "version": "2.3.6",
+                        "resolved": "https://registry.npmjs.org/plupload/-/plupload-2.3.6.tgz",
+                        "integrity": "sha1-Jgis9zXV6NuDJIck142BdXu0OGY="
+                },
                 "plur": {
                         "version": "3.1.1",

trunk/package.json

@@ -126 +126 @@
                 "masonry-layout": "3.3.2",
                 "moment": "2.22.2",
+                "plupload": "2.3.6",
                 "polyfill-library": "3.27.4",
                 "react": "16.9.0",

trunk/src/wp-includes/script-loader.php

@@ -1253 +1253 @@
         );
 
-        $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
-        $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.1.9' );
+        $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.5.7' );
+        $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.3.6' );
         // Back compat handles:
         foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
-                $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
+                $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.3.6' );
         }
 

@@ -15 +15 @@
 vendor
 docker-compose.override.yml
+48277.dif