Skip to content

Commit

Permalink
My Jetpack: Update checkout flow to connect "after" checkout vs befor…
Browse files Browse the repository at this point in the history
…e. (#33257)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6594136201
  • Loading branch information
elliottprogrammer authored and matticbot committed Oct 21, 2023
1 parent 55008fb commit 7df453b
Show file tree
Hide file tree
Showing 9 changed files with 111 additions and 108 deletions.
3 changes: 3 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
### Added
- Add jetpack-plans dependency. It will be use to restore the reverted change on #33410

### Changed
- Update checkout flow to connect "After" checkout vs before (if not connected).

## [3.9.1] - 2023-10-19
### Changed
- Make has_required_plan return true (as it was before #33410) as a way to revert the change. [#33697]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '86d713f826cd96de9db1');
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '72ab022021d381528d06');
44 changes: 22 additions & 22 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '960ea13d47c300a4a5e9');
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '8774c5a6bfd8571e98c4');

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '3.10.0-alpha1697806960',
'ver' => '3.10.0-alpha1697849167',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
54 changes: 27 additions & 27 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "1837a947acadad94d0aa3db67e029b1c95aa43de"
"reference": "7b4057997e8ba3e692f3f42e43209a5e0c1e7284"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -57,7 +57,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "d7fb28711bb393b0917caf72df6526f3fcbf14f8"
"reference": "0088f999ed57f9d521fc0bf6c31a14e7bc01e805"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -119,7 +119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "f6eabdffaae5618aabf2d551e536141c0039a938"
"reference": "7af6440b042fd98f16872d071c3dfd8bd94bc3ac"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -187,7 +187,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "ee7a5373853427863f0255b2917bf05ff8b7a407"
"reference": "8c08f5d1d68b5ce76088d55f0f06a59274f8fa3b"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0"
Expand Down Expand Up @@ -252,7 +252,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "c758b8c0af397b793386987169b9bd207e7df33c"
"reference": "17d0ecf0685468fa9f99da4ac5e7d4f17a8a2673"
},
"require": {
"composer-plugin-api": "^2.1.0"
Expand Down Expand Up @@ -311,7 +311,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "588a034ced938981f73be1f5a06f28963395e592"
"reference": "20c402ee2868f6360822233a65c605a13a9ead46"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11"
Expand Down Expand Up @@ -353,7 +353,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "3e9db92d01a332c1c7a3a88061c778fc3e553c8f"
"reference": "8096df43006ccfe47967b1e74332762630ed6579"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -431,7 +431,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "88d74a9e8c00fe10f4ba567b0fb93d9fa9c3a688"
"reference": "5bc42aa26e738a32add08349ae2f643fc85c3ffa"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -482,7 +482,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "705aa39519c7f5fd50dedcf0641da532a76b1fb8"
"reference": "f44a947cdb91b94b145b242cd031d98eb7debe0c"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -532,7 +532,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "696175e6c57f024efc4b6221fe8b88a518f59fb4"
"reference": "1440973f33d9579a317c718789c373311f8e08e7"
},
"require": {
"automattic/jetpack-assets": "^1.18.13",
Expand Down Expand Up @@ -610,7 +610,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "895859d465b8ff78176e48bac0f752ceeed8cfad"
"reference": "a7790d7d484c84c858bd07e3ccb085b0d292bbef"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -665,7 +665,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "25f0f1f2c2eebeccd4e720af7a1974a724d8aacb"
"reference": "974781777a1cc24b577df5fae4e322bb7ef0cc31"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -740,7 +740,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "5666a6b3b5932dbdc30fdd865be845e1c86dcb14"
"reference": "54f20cd53be758cbffdbb83dd8fc5da79de5c860"
},
"require": {
"automattic/jetpack-connection": "^1.58.2"
Expand Down Expand Up @@ -801,7 +801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "f10b6ad1174a8f9e416d20e366aad4765c8a5416"
"reference": "2377217294bad57567dc8232a4bc0b95de4f106a"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -846,12 +846,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "3.10.0-alpha.1697806960",
"version_normalized": "3.10.0.0-alpha1697806960",
"version": "3.10.0-alpha.1697849167",
"version_normalized": "3.10.0.0-alpha1697849167",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "0abb26de60bb8fe712c1fffaf70e52bfe479fa7b"
"reference": "23cbd40b8c9201aca154e3aea7b2e5be5c0d271a"
},
"require": {
"automattic/jetpack-admin-ui": "^0.2.23",
Expand Down Expand Up @@ -942,7 +942,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-partner",
"reference": "a9b3ef82d950848536aa3d100df8baf62f1efcbc"
"reference": "7123521a81e32fc9bb0dc6bb93dd5a3fcb2463a3"
},
"require": {
"automattic/jetpack-connection": "^1.58.2",
Expand Down Expand Up @@ -1004,7 +1004,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "61989fe1056899ef6493a61a2f898d4bfc2e67c5"
"reference": "871974d70d1e2002233040a9d3c0ff008f43f3d6"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1062,7 +1062,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "df5c4bee7852b876b0b72540993bfa2ffa133c75"
"reference": "2b5e04fcc5b23df371d9219fe716b8ec8d87fea9"
},
"require": {
"automattic/jetpack-connection": "^1.58.2"
Expand Down Expand Up @@ -1129,7 +1129,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "2bce20aead03ab8bdfab06b270e237f0989e01c0"
"reference": "b78593cae8ea84e6f1fe377ce3d26c3669a774a7"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22"
Expand Down Expand Up @@ -1183,7 +1183,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "7f91714913c11a3a6b2c7d16d5f58c7ab1db748a"
"reference": "729568737c225a6d37eb53b52073adf7921234e2"
},
"require": {
"automattic/jetpack-status": "^1.18.5"
Expand Down Expand Up @@ -1237,7 +1237,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "ffde859a0468d95cd75c44ef0dc1d114e1fcc463"
"reference": "835ab9328258f6af610293d758dce9dd07a2e8c2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1288,7 +1288,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "403b4aac15970fe8a347534cbd528ed35d8671de"
"reference": "ba18d7f207e474622b4b5bdd339200910c920dc6"
},
"require": {
"automattic/jetpack-assets": "^1.18.13",
Expand Down Expand Up @@ -1374,7 +1374,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "9bb6e5f19044db94dbc582022b8622c09b7dfd97"
"reference": "0eb23dd386aa1521a142a882fa7cb10e1a56fd6d"
},
"require": {
"automattic/jetpack-assets": "^1.18.13",
Expand Down Expand Up @@ -1438,7 +1438,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "b2374ffe27a69736ad47a516d639c73b68ba5d94"
"reference": "c7b4fb79a353a208a109066de42edfb945b9001f"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -1493,7 +1493,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "7ac89b6804b1623fd3d6346e88a43eae5155d70a"
"reference": "c7fc8b7abc4c59878bf1f58add8e73a6edd41107"
},
"require": {
"automattic/jetpack-connection": "^1.58.2",
Expand Down
Loading

0 comments on commit 7df453b

Please sign in to comment.