Skip to content

Commit

Permalink
Add/api sandboxed tag to my jetpack (#40971)
Browse files Browse the repository at this point in the history
* Add API Sandboxed tag to My Jetpack

* changelog

* Send apiRoot and apiNonce to AdminPage

* Fix sandboxedDomain variable

* Fix setting of api nonce and root

* Fix bug that was causing the tag to not show

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12795757605

Upstream-Ref: Automattic/jetpack@9932919
  • Loading branch information
CodeyGuyDylan authored and matticbot committed Jan 15, 2025
1 parent 667eb37 commit 71c3e59
Show file tree
Hide file tree
Showing 29 changed files with 255 additions and 240 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"automattic/jetpack-licensing": "^3.0.2",
"automattic/jetpack-logo": "^3.0.0",
"automattic/jetpack-masterbar": "^0.11.0-alpha",
"automattic/jetpack-my-jetpack": "^5.3.2",
"automattic/jetpack-my-jetpack": "^5.3.3-alpha",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-post-list": "^0.7.3",
"automattic/jetpack-publicize": "^0.57.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'moment', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'e492c486719a77ca938f');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'moment', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '445f8fadb887667c2350');
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-backup/build/index.css

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions jetpack_vendor/automattic/jetpack-backup/build/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-backup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@automattic/format-currency": "1.0.1",
"@automattic/jetpack-analytics": "^0.1.34",
"@automattic/jetpack-api": "^0.17.21",
"@automattic/jetpack-components": "^0.65.3",
"@automattic/jetpack-components": "^0.65.4-alpha",
"@automattic/jetpack-connection": "^0.36.3",
"@tanstack/react-query": "5.20.5",
"@wordpress/api-fetch": "7.14.0",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.3.3-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Added
- Add sandboxed tag to My Jetpack

## [5.3.2] - 2025-01-14
### Fixed
- Fix bug where description doesn't show up on backup card in specific scenarios. [#40904]
Expand Down Expand Up @@ -1906,6 +1913,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[5.3.3-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.3.2...5.3.3-alpha
[5.3.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.3.1...5.3.2
[5.3.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.3.0...5.3.1
[5.3.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.2.0...5.3.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '6ab3699f47ebfa7d6508');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '720c6b14192ac0c17a7b');

Large diffs are not rendered by default.

139 changes: 70 additions & 69 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ interface Window {
};
topJetpackMenuItemUrl: string;
isAtomic: boolean;
sandboxedDomain: string;
userIsAdmin: string;
userIsNewToJetpack: string;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '5.3.2';
const PACKAGE_VERSION = '5.3.3-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down Expand Up @@ -290,6 +290,7 @@ public static function enqueue_scripts() {
'isStatsModuleActive' => $modules->is_active( 'stats' ),
'isUserFromKnownHost' => self::is_user_from_known_host(),
'isCommercial' => self::is_commercial_site(),
'sandboxedDomain' => JETPACK__SANDBOX_DOMAIN,
'isAtomic' => ( new Status_Host() )->is_woa_site(),
'jetpackManage' => array(
'isEnabled' => Jetpack_Manage::could_use_jp_manage(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'fd9d03bad14709b28b98');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '2e12707d9d7a8b6bc8cf');

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '53fd6d6b8137e9552f82');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '2b0b0444238bc12ba38e');

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '3a9b1254e9f232bafa76');
<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'bb334d46b73824e06e7c');

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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 @@ -78,7 +78,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.3.2',
'ver' => '5.3.3-alpha1736969905',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
Loading

0 comments on commit 71c3e59

Please sign in to comment.