WordPress.org

Make WordPress Core

Changeset 46638


Ignore:
Timestamp:
11/03/2019 05:07:42 PM (9 months ago)
Author:
desrosj
Message:

External Libraries: Revert [46634-46635].

On further investigation, Plupload changed it’s license to a non-GPL compatible license. The newest, GPL compatible version is being used already in Core.

Unprops desrosj.
See #48277.

Location:
trunk
Files:
1 deleted
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/Gruntfile.js

    r46634 r46638  
    168168                        [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
    169169                        [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
    170                         [ WORKING_DIR + 'wp-includes/js/plupload/moxie.js' ]: [ './node_modules/plupload/js/moxie.js' ],
    171                         [ WORKING_DIR + 'wp-includes/js/plupload/plupload.js' ]: [ './node_modules/plupload/js/plupload.dev.js' ],
    172170                        [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/dist/twemoji.js' ],
    173171                        [ WORKING_DIR + 'wp-includes/js/underscore.js' ]: [ './node_modules/underscore/underscore.js' ],
     
    297295                    [ WORKING_DIR + 'wp-includes/js/mce-view.js' ]: [ './src/js/_enqueues/wp/mce-view.js' ],
    298296                    [ WORKING_DIR + 'wp-includes/js/media-editor.js' ]: [ './src/js/_enqueues/wp/media/editor.js' ],
    299                     [ WORKING_DIR + 'wp-includes/js/plupload/handlers.js' ]: [ './src/js/_enqueues/wp/plupload/handlers.js' ],
    300                     [ WORKING_DIR + 'wp-includes/js/plupload/wp-plupload.js' ]: [ './src/js/_enqueues/wp/plupload/wp-plupload.js' ],
    301297                    [ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
    302298                    [ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
     
    10801076                    }
    10811077                ]
    1082             },
    1083             plupload: {
    1084                 options: {
    1085                     patterns: [
    1086                         {
    1087                             match: /;var MXI_DEBUG = true;/g,
    1088                             replacement: function () {
    1089                                 return ';var MXI_DEBUG = false;';
    1090                             }
    1091                         }
    1092                     ]
    1093                 },
    1094                 files: [
    1095                     {
    1096                         expand: true,
    1097                         flatten: true,
    1098                         src: [
    1099                             'build/wp-includes/js/plupload/moxie.js'
    1100                         ],
    1101                         dest: 'build/wp-includes/js/plupload/'
    1102                     }
    1103                 ]
    11041078            }
    11051079        },
     
    13791353        'webpack:dev',
    13801354        'copy:js',
    1381         'replace:plupload',
    13821355        'file_append',
    13831356        'uglify:all',
  • trunk/package-lock.json

    r46634 r46638  
    1578515785            }
    1578615786        },
    15787         "plupload": {
    15788             "version": "2.3.6",
    15789             "resolved": "https://registry.npmjs.org/plupload/-/plupload-2.3.6.tgz",
    15790             "integrity": "sha1-Jgis9zXV6NuDJIck142BdXu0OGY="
    15791         },
    1579215787        "plur": {
    1579315788            "version": "3.1.1",
  • trunk/package.json

    r46634 r46638  
    126126        "masonry-layout": "3.3.2",
    127127        "moment": "2.22.2",
    128         "plupload": "2.3.6",
    129128        "polyfill-library": "3.27.4",
    130129        "react": "16.9.0",
  • trunk/src/wp-includes/script-loader.php

    r46634 r46638  
    12531253    );
    12541254
    1255     $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.5.7' );
    1256     $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.3.6' );
     1255    $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
     1256    $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.1.9' );
    12571257    // Back compat handles:
    12581258    foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
    1259         $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.3.6' );
     1259        $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
    12601260    }
    12611261
Note: See TracChangeset for help on using the changeset viewer.