Skip to content

Commit

Permalink
Merge branch 'trunk' into update/react-compat-useref-requires-argument
Browse files Browse the repository at this point in the history
  • Loading branch information
coder-karen authored Aug 8, 2024
2 parents e8e9606 + c76aa10 commit da8be28
Show file tree
Hide file tree
Showing 70 changed files with 351 additions and 372 deletions.
4 changes: 4 additions & 0 deletions projects/js-packages/script-data/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ 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.1.0 - 2024-08-08
### Added
- Added jetpack-script-data package to consolidate the logic for Jetpack Initial state [#38430]

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/script-data/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-script-data",
"version": "0.1.0-alpha",
"version": "0.1.0",
"description": "A library to provide data for script handles and the corresponding utility functions for Jetpack.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/script-data/#readme",
"bugs": {
Expand Down
4 changes: 4 additions & 0 deletions projects/js-packages/webpack-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ 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.3.0 - 2024-08-08
### Added
- Added jetpack-initial-state package to consolidate the logic for Initial state [#38430]

## 3.2.11 - 2024-07-24
### Added
- Pass default Babel options to I18nCheckWebpackPlugin if none are supplied, as we already do for TranspileRule. [#38482]
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/webpack-config/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-webpack-config",
"version": "3.3.0-alpha",
"version": "3.3.0",
"description": "Library of pieces for webpack config in Jetpack projects.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/webpack-config/#readme",
"bugs": {
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/assets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ 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).

## [2.3.0] - 2024-08-08
### Added
- Added jetpack-initial-state package to consolidate the logic for Initial state [#38430]

## [2.2.0] - 2024-07-23
### Added
- Assets: Add JSX runtime polyfill `react-jsx-runtime` for WordPress < 6.6. [#38428]
Expand Down Expand Up @@ -462,6 +466,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Statically access asset tools

[2.3.0]: https://github.com/Automattic/jetpack-assets/compare/v2.2.0...v2.3.0
[2.2.0]: https://github.com/Automattic/jetpack-assets/compare/v2.1.13...v2.2.0
[2.1.13]: https://github.com/Automattic/jetpack-assets/compare/v2.1.12...v2.1.13
[2.1.12]: https://github.com/Automattic/jetpack-assets/compare/v2.1.11...v2.1.12
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions projects/packages/assets/src/class-script-data.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ protected static function get_admin_script_data() {
* For example, the social (publicize) data is used only on Social admin page, Jetpack settings page and the post editor.
* So, the social data should be added only on those pages.
*
* @since $$next-version$$
* @since 2.3.0
*
* @param array $state The script data.
*/
Expand All @@ -149,7 +149,7 @@ protected static function get_public_script_data() {
*
* See the docs for `jetpack_admin_js_script_data` filter for more information.
*
* @since $$next-version$$
* @since 2.3.0
*
* @param array $state The script data.
*/
Expand Down
16 changes: 16 additions & 0 deletions projects/packages/jetpack-mu-wpcom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ 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.54.0] - 2024-08-08
### Added
- MU WPCOM: Port enqueue_coblocks_gallery_scripts from the ETK [#38731]
- MU WPCOM: Port the newspack blocks from the ETK [#38724]
- Point Edit Profile link to wpcalypso.* [#38775]
- Show Help center in front end admin bar [#38651]
- Show links back to WordPress.com for them to manage their WordPress.com profile [#38638]

### Changed
- Removed gating logic for wpcom_admin_interface_settings_field [#38774]
- WordPress.com Features: Remove unused files for Calypso Locale Bidirectional Sync [#38773]

### Fixed
- Simple Classic: make Users -> Profile -> Email input readonly instead of disabled [#38752]

## [5.53.1] - 2024-08-05
### Changed
- Internal updates.
Expand Down Expand Up @@ -1101,6 +1116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Testing initial package release.

[5.54.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.53.1...v5.54.0
[5.53.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.53.0...v5.53.1
[5.53.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.52.1...v5.53.0
[5.52.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.52.0...v5.52.1
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion projects/packages/jetpack-mu-wpcom/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-mu-wpcom",
"version": "5.54.0-alpha",
"version": "5.54.0",
"description": "Enhances your site with features powered by WordPress.com",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
"bugs": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Jetpack_Mu_Wpcom main class.
*/
class Jetpack_Mu_Wpcom {
const PACKAGE_VERSION = '5.54.0-alpha';
const PACKAGE_VERSION = '5.54.0';
const PKG_DIR = __DIR__ . '/../';
const BASE_DIR = __DIR__ . '/';
const BASE_FILE = __FILE__;
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit da8be28

Please sign in to comment.