Revert #33394 #33036 and #33042 - VP conditional asset enqueueing (#3…

…3672) * revert work on #33042 #33036 and #33394 as VP blocks on feeds (query loop) are not properly handled * changelog * fix versions Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6577194757
Automattic · Oct 19, 2023 · 0d09390 · 0d09390
1 parent 9cd4889
commit 0d09390
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 50 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -17,7 +17,7 @@
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/jetpack-changelogger": "^3.3.11",
 		"automattic/wordbless": "@dev",
-		"automattic/jetpack-videopress": "^0.17.7-alpha"
+		"automattic/jetpack-videopress": "^0.18.0-alpha"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "83f18180fde8dd1a9223d8927410e38bb6ca6787"
+                "reference": "42c1179d643c75816a72605d6fad33e4bf139432"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -57,7 +57,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "61a26e81de4ff9ff7ce28b0727d6c059b7fcb388"
+                "reference": "8b242216851a2c5c1f28ea6e37b5982be5eec5d9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "598156cbf99be8c9c67523830156aa364c661eca"
+                "reference": "005a7b32f22113fc20ae8be7d1d48a46875b01f6"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "ca2141b2524d070233cc042301c493f1185931a8"
+                "reference": "835d142c014164e7ca54427770736d2d8c57a36c"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -252,7 +252,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "0de29f4906961150c682a02328c988b1c1971d92"
+                "reference": "4e3277a50ff2b963f8ca03ba615610d31f36ada9"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -311,7 +311,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "98cb929666598ca9c03e377df842404f962ec68e"
+                "reference": "6787c7cc399286a5df481b0581821e3e5916d930"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11"
@@ -353,7 +353,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "44e6cc2db7113259541b31a4d056b88b10aa0b20"
+                "reference": "31f5887658f841ad5fc3713d24a3fe8f2502eebe"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -431,7 +431,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "1f5b2f59af3ba21b821180a2909588eac8ceb7d1"
+                "reference": "d1307c1e2c9de83205a32f6534b41ee7cc229817"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -482,7 +482,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "2035db5e3b3805206b0434df4f712bf27772f3b3"
+                "reference": "a6a1992cf01c03f93be37011e3bcb389d438a5fe"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -532,7 +532,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "3d8001eed762cefc8b9144a2485eca192032c56e"
+                "reference": "7ba6451158b5afabca50e2279736fda3e1e392b5"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12",
@@ -610,7 +610,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "265e6ae18fec37f98d51a4a6b78afbc6ebbe3afd"
+                "reference": "3110849332f8c1089cb14fe0c4e3020f14b3ed6b"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -665,7 +665,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "53a7fb38c0b7bd150205db228903ebf98b78427a"
+                "reference": "98160fdf51b72e702e263ee6b3bf00b6199c40ec"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -740,7 +740,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "23e951ee724ebfa57d85ff26c786d89ccb0f2bbd"
+                "reference": "5c98fdf526f07922e0ffdfbedd4658c4ac374d2a"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1"
@@ -801,7 +801,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "787cef95974f3e33a106e68b54b366f72a37616a"
+                "reference": "9835496beb067ca7020e86a3d37377c8ac38081d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -851,7 +851,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "f0c7d1f3455a1f9040463d18e097504314858d63"
+                "reference": "0546a037df737b2f25042f39432bf1e75cd2ccb7"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2.23",
@@ -865,7 +865,7 @@
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
-                "automattic/jetpack-videopress": "^0.17.7-alpha",
+                "automattic/jetpack-videopress": "^0.18.0-alpha",
                 "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "1.1.0"
             },
@@ -941,7 +941,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "98edee513d460df52a8aa0c49cd546d1cde960ba"
+                "reference": "e480c4a46e75cbdd8fae2468dec57d6e76fbd820"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1",
@@ -1003,7 +1003,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "82895119d1400cdeaae0942736ee8ecd21626e9b"
+                "reference": "2c7d8fb149a2515c4d106abb63744e7fe031934d"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1061,7 +1061,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "2e06d637aeefdadc2ae1fa799e65b2bdfee30de3"
+                "reference": "dca41f3bdb08c0649246e230721fb2105b944cfa"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22"
@@ -1115,7 +1115,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "c05847e381b18b63235860293356dedf2ef65f25"
+                "reference": "9c3d01b728ee3c79e91c5814eec97d9f875c2b9f"
             },
             "require": {
                 "automattic/jetpack-status": "^1.18.5"
@@ -1169,7 +1169,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "e52c1ffca324abebdf5d71b11edc3d0203c6c60e"
+                "reference": "4092262679003ad58ff797d77c86ca9fc74caf94"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1220,7 +1220,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "158d9423176557eba6fe0a90c1a21d6dbf7bc3c5"
+                "reference": "a8a1bf97c2fa29e8cafcf1562e9241a33a217934"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12",
@@ -1306,7 +1306,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "0b2e0284752c181703f12444d27573fa47b450c5"
+                "reference": "ccb11cf333702200fa912985065dcec5a7144551"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.12",
@@ -1370,7 +1370,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "55a8420f73eb8e35cb45170827757836e4e13d10"
+                "reference": "064cdf36ff42a0e20d3016aab9b17eb31f037fc7"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1425,7 +1425,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "03051b989e021b8a36359f36d255a5019ac15554"
+                "reference": "c4dea2774ebb496c6634a77b3c0280c915e019eb"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.1",