Changeset 45354

Timestamp:

05/17/2019 05:07:41 PM (6 years ago)

Author:

desrosj

Message:

jQuery: bring jquery.js back into the WordPress SVN repo and backport the patch from 3.4.0.

Merges [45342] to the 5.2 branch.

Props MikeNGarrett, peterwilsoncc, azaozz.
Fixes #47020.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• Gruntfile.js (modified) (1 diff)
• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/js/_enqueues/vendor/jquery/jquery.js (copied) (copied from trunk/src/js/_enqueues/vendor/jquery/jquery.js)
• src/wp-includes/script-loader.php (modified) (1 diff)

branches/5.2/Gruntfile.js

@@ -173 +173 @@
                         [ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.min.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.min.js' ],
                         [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
-                        [ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
                         [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
                         [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/2/twemoji.js' ],

branches/5.2/package-lock.json

@@ -9025 +9025 @@
         },
         "jquery": {
-            "version": "1.12.4",
-            "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
-            "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+            "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
         },
         "jquery-color": {

branches/5.2/package.json

@@ -99 +99 @@
         "formdata-polyfill": "3.0.13",
         "imagesloaded": "3.2.0",
-        "jquery": "1.12.4",
         "jquery-color": "github:jquery/jquery-color#2.1.1",
         "jquery-form": "4.2.1",

branches/5.2/src/wp-includes/script-loader.php

@@ -1013 +1013 @@
 
     // jQuery
-    $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
-    $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
+    $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4-wp' );
+    $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4-wp' );
     $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );