Skip to content

Commit

Permalink
Fix site specific features passed to front-end for simple sites (#39817)
Browse files Browse the repository at this point in the history
* Add `Current_Plan::get_simple_site_specific_features()` method

* Pass the features for simple sites to the script data

* Create siteHasFeature utility

* Add changelog

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

Upstream-Ref: Automattic/jetpack@cc5911c
  • Loading branch information
manzoorwanijk authored and matticbot committed Oct 21, 2024
1 parent 5a6e82a commit 04afea8
Show file tree
Hide file tree
Showing 12 changed files with 152 additions and 101 deletions.
66 changes: 33 additions & 33 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => '0274966690f87adbeccb');
<?php return array('dependencies' => array(), 'version' => '0d9b7c1c5507602fae89');

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"validate": "pnpm exec validate-es build/"
},
"dependencies": {
"@automattic/jetpack-script-data": "^0.1.2",
"@automattic/jetpack-script-data": "^0.1.3-alpha",
"react": "18.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"automattic/jetpack-assets": "^2.3.10",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-plans": "^0.4.11",
"automattic/jetpack-plans": "^0.4.12-alpha",
"automattic/jetpack-redirect": "^2.0.4",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.14.2"
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-masterbar/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-jitm": "^3.1.26",
"automattic/jetpack-logo": "^2.0.4",
"automattic/jetpack-plans": "^0.4.11",
"automattic/jetpack-plans": "^0.4.12-alpha",
"automattic/jetpack-status": "^4.0.2"
},
"require-dev": {
Expand Down
8 changes: 8 additions & 0 deletions vendor/automattic/jetpack-plans/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.4.12-alpha] - unreleased

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

### Fixed
- Fixed the site features for Simple sites

## [0.4.11] - 2024-09-23
### Changed
- Update dependencies.
Expand Down Expand Up @@ -154,6 +161,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Deprecated
- Moved the options class into Connection. [#24095]

[0.4.12-alpha]: https://github.com/Automattic/jetpack-plans/compare/v0.4.11...v0.4.12-alpha
[0.4.11]: https://github.com/Automattic/jetpack-plans/compare/v0.4.10...v0.4.11
[0.4.10]: https://github.com/Automattic/jetpack-plans/compare/v0.4.9...v0.4.10
[0.4.9]: https://github.com/Automattic/jetpack-plans/compare/v0.4.8...v0.4.9
Expand Down
Loading

0 comments on commit 04afea8

Please sign in to comment.