Hotfix/revert 33410 (#33697)

* just return true as a way to revert 33410 as the lib dependency is not properly imported * add TODO comment * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6580434692
Automattic · Oct 19, 2023 · bb809e2 · bb809e2
1 parent 46bb4ed
commit bb809e2
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 84 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 This is an alpha version! The changes listed here are not final.
 
 ### Changed
+- Make has_required_plan return true (as it was before #33410) as a way to revert the change.
 - Updated package dependencies.
 
 ## [3.9.0] - 2023-10-17

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/products/class-videopress.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/products/class-videopress.php
@@ -7,7 +7,6 @@
 
 namespace Automattic\Jetpack\My_Jetpack\Products;
 
-use Automattic\Jetpack\Current_Plan;
 use Automattic\Jetpack\My_Jetpack\Hybrid_Product;
 use Automattic\Jetpack\My_Jetpack\Wpcom_Products;
 
@@ -164,7 +163,7 @@ public static function get_manage_url() {
 	 * @return boolean
 	 */
 	public static function has_required_plan() {
-		// using second argument `true` to force fetching from wpcom
-		return Current_Plan::supports( 'videopress-1tb-storage', true );
+		// TODO: import and perform a proper check with Current_Plan. See #33410.
+		return true;
 	}
 }
diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -38,7 +38,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '3.9.1-alpha1697744587',
+      'ver' => '3.9.1-alpha1697750815',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

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": "894c4650536ce8b21d47fb0f33bd48af0e998e9a"
+                "reference": "ccbc43b32c4051ad3bdb3f9101bc63c105e1c49a"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -57,7 +57,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "419f821ba95893ef7123cb81e6fe5acca10b2924"
+                "reference": "14342ca74ed9ea11d49e74951a2265671dbdfcb9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "101d994a485c30fd1fa0a692df781af9f67ac85f"
+                "reference": "217be894f79a4465bf1b992d94c68fc11bdccac4"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "1376cc23cf3308f1c026b82cea6473b9a684584a"
+                "reference": "c9f1873ac75dfaaad85b40c2dd7bc43e1bc75f97"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -252,7 +252,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "a4088a62f7aaffe90cc5541a6f27caded0e9a1c6"
+                "reference": "7330f864eaccc252f577312a68f3c784b3e0d61a"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -311,7 +311,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "1949d12cd869ac863bc4ca92c3c7f9233d34a602"
+                "reference": "557fad39eccb32f501f0e1367018a8b799dc2518"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11"
@@ -353,7 +353,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "5199a01874721dbe6b7a63e7eab8f4bc9b853ffd"
+                "reference": "44f9bc3122306764e3cc53952eda48eea3099c5a"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -431,7 +431,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "9597124cff4c44e31af8ca1aee25129b40263f94"
+                "reference": "0b4167a2148f457df93f77e6330040bca0bb5316"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -482,7 +482,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "59ecff752bff0019313d15dfc3de0b56cd8a9f1b"
+                "reference": "c111fe97d9ab1ea3a28caf3903a38df37e86f2e8"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -532,7 +532,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "fecf4852b1598cc7f2181faff71aa6d0b80a2d3c"
+                "reference": "c1a63559f932dbc9e229a5072e2a78b026b70760"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.13-alpha",
@@ -610,7 +610,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "afa76005f1071d1ac64056d2cbe85c86f6decb87"
+                "reference": "4d92c2a114f45a710ee272d39de0895608a8df1f"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -665,7 +665,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "6999deca090abc3fb89900b5bbd5d383ce460150"
+                "reference": "45080ae0189f0d4a7c834d0aabac5f0ce60dbab2"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -740,7 +740,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "8ef4d88f22056f34748362ed782e7bfb4383d3dc"
+                "reference": "8c76b6f77afd6bf4352bb4c56b3c2bdc5a4d739e"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha"
@@ -801,7 +801,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "6f02826bb1d4aff1f51a2bf5088b86a83f10c0d8"
+                "reference": "39807eb96e25d1c5a72a4572721506e2e8a89828"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -846,12 +846,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "3.9.1-alpha.1697744587",
-            "version_normalized": "3.9.1.0-alpha1697744587",
+            "version": "3.9.1-alpha.1697750815",
+            "version_normalized": "3.9.1.0-alpha1697750815",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "c4c5a4df330ce27fbec8d5c3d6dad348c9a63d9d"
+                "reference": "a856c5fec81624ce0cb97e8b7c720fa7085284c2"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2.23",
@@ -941,7 +941,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "845e776f156602128d7ac18c38c53f4580e118f0"
+                "reference": "99e3b9109e90a54c123fe1cb2e321efc37788ac0"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha",
@@ -1003,7 +1003,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "78119c30bbc6ff32955458322f0829598b38c6bb"
+                "reference": "d097e14a63f3b5afec9997c4c7c80b37720e9f67"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1061,7 +1061,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "4e79773a7bc7b1a7b856f87d822ea6e48507888b"
+                "reference": "37380613811b49911ca7ab9214296aafd18a86e0"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha"
@@ -1128,7 +1128,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "1267505e50c6915a12f6d19d944e5b6a3fb72f13"
+                "reference": "127f06c5a689e85067359de28ea8f2413dd76ed4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22"
@@ -1182,7 +1182,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "c049c03a8cfc144cbce0a21978983855205bdada"
+                "reference": "b54186d76aa52df0a158c2be65a6de5afe637b8c"
             },
             "require": {
                 "automattic/jetpack-status": "^1.18.5"
@@ -1236,7 +1236,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "18391252640a03175ade79208bee8b4f80d05c61"
+                "reference": "c4c3127bfdf6d00134fb10cc218971523adf11fb"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1287,7 +1287,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "fa2d1612551a06fb6814d7ce072eea8f11a0cb5a"
+                "reference": "4fbecac7c904fe5a5f3dec431750304d252d5e99"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1342,7 +1342,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "8202233402cd6a1a6ad7a71fb2796a3b40a26a2e"
+                "reference": "43252c2dabe25353aa840b2c8431d2b3e09eb25e"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha",
@@ -1412,7 +1412,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
-                "reference": "702fd88d2e010bce2927936c9fbaf1f551d271a5"
+                "reference": "d2b9f950e3ff86366fa9724ce48ffcf0e27728ad"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha"
@@ -1485,7 +1485,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-waf",
-                "reference": "9268a5a666c84e19315b8b5a087a6ead5235bd28"
+                "reference": "3d0ca0cabb753488f103e25a340a9fc3f6843634"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2-alpha",