Skip to content

Commit

Permalink
General: remove WP 6.1 backwards compatibility checks (#32772)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeherve authored and matticbot committed Sep 5, 2023
1 parent e74cd9d commit ed239d8
Show file tree
Hide file tree
Showing 34 changed files with 268 additions and 232 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- General: remove WP 6.1 backwards compatibility checks
- General: update WordPress version requirements to WordPress 6.2.
- Updated package dependencies.
- Use the new method to render Connection initial state.
Expand Down
2 changes: 1 addition & 1 deletion build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '68d5ce1acd6c90ff27fb');
<?php return array('dependencies' => array('moment', 'react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '502bc3744f6d1c5a4506');
2 changes: 1 addition & 1 deletion build/index.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"automattic/jetpack-autoloader": "^2.11.22",
"automattic/jetpack-composer-plugin": "^1.1.13",
"automattic/jetpack-config": "^1.15.3",
"automattic/jetpack-identity-crisis": "^0.10.3",
"automattic/jetpack-my-jetpack": "^3.4.3",
"automattic/jetpack-identity-crisis": "^0.10.4-alpha",
"automattic/jetpack-my-jetpack": "^3.4.4-alpha",
"automattic/jetpack-plugins-installer": "^0.2.5",
"automattic/jetpack-sync": "^1.56.0",
"automattic/jetpack-transport-helper": "^0.1.6-alpha",
"automattic/jetpack-plans": "^0.3.4",
"automattic/jetpack-waf": "^0.11.9",
"automattic/jetpack-status": "^1.18.2"
"automattic/jetpack-waf": "^0.11.10-alpha",
"automattic/jetpack-status": "^1.18.3-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-connection/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).

## [1.57.3-alpha] - unreleased

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

### Changed
- General: remove WP 6.1 backwards compatibility checks

## [1.57.2] - 2023-09-04
### Changed
- Updated package dependencies. [#32803]
Expand Down Expand Up @@ -872,6 +879,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separate the connection library into its own package.

[1.57.3-alpha]: https://github.com/Automattic/jetpack-connection/compare/v1.57.2...v1.57.3-alpha
[1.57.2]: https://github.com/Automattic/jetpack-connection/compare/v1.57.1...v1.57.2
[1.57.1]: https://github.com/Automattic/jetpack-connection/compare/v1.57.0...v1.57.1
[1.57.0]: https://github.com/Automattic/jetpack-connection/compare/v1.56.1...v1.57.0
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"automattic/jetpack-admin-ui": "^0.2.21",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-roles": "^1.4.24",
"automattic/jetpack-status": "^1.18.2",
"automattic/jetpack-status": "^1.18.3-alpha",
"automattic/jetpack-redirect": "^1.7.26"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '1.57.2';
const PACKAGE_VERSION = '1.57.3-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
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).

## [0.10.4-alpha] - unreleased

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

### Changed
- General: remove WP 6.1 backwards compatibility checks

## [0.10.3] - 2023-09-04
### Changed
- Updated package dependencies. [#32803]
Expand Down Expand Up @@ -405,6 +412,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Use Connection/Urls for home_url and site_url functions migrated from Sync.

[0.10.4-alpha]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.3...v0.10.4-alpha
[0.10.3]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.2...v0.10.3
[0.10.2]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.1...v0.10.2
[0.10.1]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.0...v0.10.1
Expand Down
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-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'aef6c67144c309ed7c6e');
<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'be05f4fa6476173ae8aa');

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-status": "^1.18.2",
"automattic/jetpack-status": "^1.18.3-alpha",
"automattic/jetpack-logo": "^1.6.2",
"automattic/jetpack-assets": "^1.18.10"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function render() {
} = window.JP_IDENTITY_CRISIS__INITIAL_STATE;

if ( ! isSafeModeConfirmed ) {
// @todo: Remove fallback when we drop support for WP 6.1
const component = (
<IDCScreen
wpcomHomeUrl={ wpcomHomeUrl }
Expand All @@ -54,12 +53,7 @@ function render() {
possibleDynamicSiteUrlDetected={ possibleDynamicSiteUrlDetected }
/>
);

if ( WPElement.createRoot ) {
WPElement.createRoot( container ).render( component );
} else {
WPElement.render( component, container );
}
WPElement.createRoot( container ).render( component );
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Identity_Crisis {
/**
* Package Version
*/
const PACKAGE_VERSION = '0.10.3';
const PACKAGE_VERSION = '0.10.4-alpha';

/**
* Instance of the object.
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.21",
"automattic/jetpack-assets": "^1.18.10",
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-device-detection": "^1.4.27",
"automattic/jetpack-logo": "^1.6.2",
"automattic/jetpack-partner": "^1.7.24",
"automattic/jetpack-redirect": "^1.7.26",
"automattic/jetpack-status": "^1.18.2"
"automattic/jetpack-status": "^1.18.3-alpha"
},
"require-dev": {
"brain/monkey": "2.6.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2"
"automattic/jetpack-connection": "^1.57.3-alpha"
},
"require-dev": {
"automattic/wordbless": "@dev",
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).

## [3.4.4-alpha] - unreleased

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

### Changed
- General: remove WP 6.1 backwards compatibility checks

## [3.4.3] - 2023-09-04
### Changed
- Updated package dependencies. [#32803]
Expand Down Expand Up @@ -1007,6 +1014,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[3.4.4-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.4.3...3.4.4-alpha
[3.4.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.4.2...3.4.3
[3.4.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.4.1...3.4.2
[3.4.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.4.0...3.4.1
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' => 'a4c81fa5addc338e3d70');
<?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' => 'a7114d9b859b793c9b62');

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"automattic/jetpack-admin-ui": "^0.2.21",
"automattic/jetpack-assets": "^1.18.10",
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-jitm": "^2.3.18",
"automattic/jetpack-licensing": "^1.8.3",
"automattic/jetpack-plugins-installer": "^0.2.5",
Expand All @@ -17,7 +17,7 @@
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/wordbless": "@dev",
"automattic/jetpack-videopress": "^0.15.2"
"automattic/jetpack-videopress": "^0.15.3-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '3.4.3';
const PACKAGE_VERSION = '3.4.4-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-partner/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-status": "^1.18.2"
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-status": "^1.18.3-alpha"
},
"require-dev": {
"brain/monkey": "2.6.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-redirect/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-status": "^1.18.2"
"automattic/jetpack-status": "^1.18.3-alpha"
},
"require-dev": {
"brain/monkey": "2.6.1",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-status/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).

## [1.18.3-alpha] - unreleased

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

### Changed
- General: remove backwards-compatibility function checks now that the package supports WP 6.2.

## [1.18.2] - 2023-09-04
### Fixed
- Exclude domains starting with live from known Pantheon staging domains [#32789]
Expand Down Expand Up @@ -272,6 +279,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Packages: Introduce a status package

[1.18.3-alpha]: https://github.com/Automattic/jetpack-status/compare/v1.18.2...v1.18.3-alpha
[1.18.2]: https://github.com/Automattic/jetpack-status/compare/v1.18.1...v1.18.2
[1.18.1]: https://github.com/Automattic/jetpack-status/compare/v1.18.0...v1.18.1
[1.18.0]: https://github.com/Automattic/jetpack-status/compare/v1.17.2...v1.18.0
Expand Down
13 changes: 7 additions & 6 deletions jetpack_vendor/automattic/jetpack-status/src/class-status.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,8 @@ public function is_local_site() {
// Check for localhost and sites using an IP only first.
$is_local = $site_url && false === strpos( $site_url, '.' );

// @todo Remove function_exists when the package has a documented minimum WP version.
// Use Core's environment check, if available. Added in 5.5.0 / 5.5.1 (for `local` return value).
if ( function_exists( 'wp_get_environment_type' ) && 'local' === wp_get_environment_type() ) {
// Use Core's environment check, if available.
if ( 'local' === wp_get_environment_type() ) {
$is_local = true;
}

Expand Down Expand Up @@ -221,9 +220,11 @@ public function is_staging_site() {
return $cached;
}

// @todo Remove function_exists when the package has a documented minimum WP version.
// Core's wp_get_environment_type allows for a few specific options. We should default to bowing out gracefully for anything other than production or local.
$is_staging = function_exists( 'wp_get_environment_type' ) && ! in_array( wp_get_environment_type(), array( 'production', 'local' ), true );
/*
* Core's wp_get_environment_type allows for a few specific options.
* We should default to bowing out gracefully for anything other than production or local.
*/
$is_staging = ! in_array( wp_get_environment_type(), array( 'production', 'local' ), true );

$known_staging = array(
'urls' => array(
Expand Down
6 changes: 3 additions & 3 deletions jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-identity-crisis": "^0.10.3",
"automattic/jetpack-identity-crisis": "^0.10.4-alpha",
"automattic/jetpack-password-checker": "^0.2.14",
"automattic/jetpack-ip": "^0.1.5",
"automattic/jetpack-roles": "^1.4.24",
"automattic/jetpack-status": "^1.18.2"
"automattic/jetpack-status": "^1.18.3-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2"
"automattic/jetpack-connection": "^1.57.3-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-waf/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).

## [0.11.10-alpha] - unreleased

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

### Changed
- General: remove backwards-compatible functions now that package relies on WordPress 6.2.

## [0.11.9] - 2023-08-28
### Changed
- Updated package dependencies. [#32605]
Expand Down Expand Up @@ -219,6 +226,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Core: do not ship .phpcs.dir.xml in production builds.

[0.11.10-alpha]: https://github.com/Automattic/jetpack-waf/compare/v0.11.9...v0.11.10-alpha
[0.11.9]: https://github.com/Automattic/jetpack-waf/compare/v0.11.8...v0.11.9
[0.11.8]: https://github.com/Automattic/jetpack-waf/compare/v0.11.7...v0.11.8
[0.11.7]: https://github.com/Automattic/jetpack-waf/compare/v0.11.6...v0.11.7
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-waf/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2",
"automattic/jetpack-connection": "^1.57.3-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-ip": "^0.1.5",
"automattic/jetpack-status": "^1.18.2",
"automattic/jetpack-status": "^1.18.3-alpha",
"wikimedia/aho-corasick": "^1.0"
},
"require-dev": {
Expand Down
8 changes: 4 additions & 4 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
),
'jetpack-connection' => array(
'path' => 'jetpack_vendor/automattic/jetpack-connection',
'ver' => '1.57.2',
'ver' => '1.57.3-alpha1693920191',
),
'jetpack-idc' => array(
'path' => 'jetpack_vendor/automattic/jetpack-identity-crisis',
'ver' => '0.10.3',
'ver' => '0.10.4-alpha1693920191',
),
'jetpack-ip' => array(
'path' => 'jetpack_vendor/automattic/jetpack-ip',
Expand All @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '3.4.3',
'ver' => '3.4.4-alpha1693920191',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -58,7 +58,7 @@
),
'jetpack-waf' => array(
'path' => 'jetpack_vendor/automattic/jetpack-waf',
'ver' => '0.11.9',
'ver' => '0.11.10-alpha1693920191',
),
),
);
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"type": "library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.2"
"automattic/jetpack-connection": "^1.57.3-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-status": "^1.18.2",
"automattic/jetpack-status": "^1.18.3-alpha",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down
Loading

0 comments on commit ed239d8

Please sign in to comment.