Merge branch 'trunk' into add/blog-stats-visitors

Automattic · Feb 6, 2024 · 0bb778c · 0bb778c
2 parents 3dbaa4c + bd5f882
commit 0bb778c
Show file tree

Hide file tree

Showing 323 changed files with 1,301 additions and 1,384 deletions.
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
@@ -11,13 +11,6 @@
  * @returns {object} Modified pkg.
  */
 function fixDeps( pkg ) {
-	// Depends on punycode but doesn't declare it.
-	// https://github.com/markdown-it/markdown-it/issues/230
-	// https://github.com/markdown-it/markdown-it/issues/945
-	if ( pkg.name === 'markdown-it' && ! pkg.dependencies.punycode ) {
-		pkg.dependencies.punycode = '*';
-	}
-
 	// Missing dep or peer dep on react.
 	// https://github.com/WordPress/gutenberg/issues/55171
 	if (

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/github-actions/repo-gardening/changelog/update-repo-gardening-zap-assignment b/projects/github-actions/repo-gardening/changelog/update-repo-gardening-zap-assignment
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Board triage: update team Zap's assignment settings.
diff --git a/...github-actions/repo-gardening/src/tasks/update-board/automattic-label-team-assignments.js b/...github-actions/repo-gardening/src/tasks/update-board/automattic-label-team-assignments.js
@@ -21,12 +21,6 @@ export const automatticAssignments = {
 		slack_id: 'C01B6KEJ5GE',
 		board_id: 'https://github.com/orgs/Automattic/projects/718',
 	},
-	Newsletter: {
-		team: 'Zap',
-		labels: [ '[Block] Subscriptions', '[Block] Paywall', '[Feature] Subscriptions' ],
-		slack_id: 'C02NQ4HMJKV',
-		board_id: 'https://github.com/orgs/Automattic/projects/657',
-	},
 	Reader: {
 		team: 'Loop',
 		labels: [ '[Feature] Reader' ],
@@ -100,6 +94,12 @@ export const automatticAssignments = {
 		labels: [ '[Package] My Jetpack' ],
 		slack_id: 'C02TQF5VAJD',
 	},
+	Newsletter: {
+		team: 'Zap',
+		labels: [ '[Block] Subscriptions', '[Block] Paywall' ],
+		slack_id: 'C02NQ4HMJKV',
+		board_id: 'https://github.com/orgs/Automattic/projects/657',
+	},
 	Protect: {
 		team: 'Scan',
 		labels: [ '[Plugin] Protect', '[Feature] Protect', '[Package] WAF' ],

diff --git a/projects/js-packages/ai-client/CHANGELOG.md b/projects/js-packages/ai-client/CHANGELOG.md
@@ -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.6.0] - 2024-02-05
+### Added
+- Jetpack AI: Support floating error messaging on the AI Control component. [#35322]
+
+### Changed
+- Updated package dependencies. [#35384]
+
 ## [0.5.1] - 2024-01-29
 ### Changed
 - Update dependencies. [#35170]
@@ -199,6 +206,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies. [#31659]
 - Updated package dependencies. [#31785]
 
+[0.6.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/Automattic/jetpack-ai-client/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.4.1...v0.5.0
 [0.4.1]: https://github.com/Automattic/jetpack-ai-client/compare/v0.4.0...v0.4.1

diff --git a/projects/js-packages/ai-client/changelog/renovate-wordpress-monorepo b/projects/js-packages/ai-client/changelog/renovate-wordpress-monorepo
diff --git a/...ts/js-packages/ai-client/changelog/update-jetpack-ai-move-error-closer-to-assistant-input b/...ts/js-packages/ai-client/changelog/update-jetpack-ai-move-error-closer-to-assistant-input
diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json
@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.6.0-alpha",
+	"version": "0.6.0",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {

diff --git a/projects/js-packages/api/CHANGELOG.md b/projects/js-packages/api/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.16.9] - 2024-02-05
+### Changed
+- Updated package dependencies. [#35384]
+
 ## [0.16.8] - 2024-01-04
 ### Changed
 - Updated package dependencies. [#34815]
@@ -290,6 +294,7 @@
 - Add the API methods left behind by the previous PR.
 - Initial release of jetpack-api package
 
+[0.16.9]: https://github.com/Automattic/jetpack-api/compare/v0.16.8...v0.16.9
 [0.16.8]: https://github.com/Automattic/jetpack-api/compare/v0.16.7...v0.16.8
 [0.16.7]: https://github.com/Automattic/jetpack-api/compare/v0.16.6...v0.16.7
 [0.16.6]: https://github.com/Automattic/jetpack-api/compare/v0.16.5...v0.16.6

diff --git a/projects/js-packages/api/changelog/renovate-wordpress-monorepo b/projects/js-packages/api/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-api",
-	"version": "0.16.9-alpha",
+	"version": "0.16.9",
 	"description": "Jetpack Api Package",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/api/#readme",
 	"bugs": {

diff --git a/projects/js-packages/base-styles/CHANGELOG.md b/projects/js-packages/base-styles/CHANGELOG.md
@@ -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).
 
+## [0.6.16] - 2024-02-05
+### Changed
+- Updated package dependencies. [#35384]
+
 ## [0.6.15] - 2024-01-04
 ### Changed
 - Updated package dependencies. [#34815]
@@ -242,6 +246,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Use Node 16.7.0 in tooling. This shouldn't change the behavior of the code itself.
 
+[0.6.16]: https://github.com/Automattic/jetpack-base-styles/compare/0.6.15...0.6.16
 [0.6.15]: https://github.com/Automattic/jetpack-base-styles/compare/0.6.14...0.6.15
 [0.6.14]: https://github.com/Automattic/jetpack-base-styles/compare/0.6.13...0.6.14
 [0.6.13]: https://github.com/Automattic/jetpack-base-styles/compare/0.6.12...0.6.13

diff --git a/projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo b/projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/base-styles/package.json b/projects/js-packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-base-styles",
-	"version": "0.6.16-alpha",
+	"version": "0.6.16",
 	"description": "Jetpack components base styles",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/base-styles/#readme",
 	"bugs": {

diff --git a/projects/js-packages/boost-score-api/CHANGELOG.md b/projects/js-packages/boost-score-api/CHANGELOG.md
@@ -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).
 
+## [0.1.21] - 2024-02-05
+### Changed
+- Updated package dependencies. [#35384]
+
 ## [0.1.20] - 2024-01-29
 ### Fixed
 - Fix TypeScript type for a Boost Score prop [#35273]
@@ -95,6 +99,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Create package for the boost score bar API [#30781]
 
+[0.1.21]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.20...v0.1.21
 [0.1.20]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.19...v0.1.20
 [0.1.19]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.18...v0.1.19
 [0.1.18]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.17...v0.1.18

diff --git a/projects/js-packages/boost-score-api/changelog/renovate-wordpress-monorepo b/projects/js-packages/boost-score-api/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/boost-score-api/package.json b/projects/js-packages/boost-score-api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-boost-score-api",
-	"version": "0.1.21-alpha",
+	"version": "0.1.21",
 	"description": "A package to get the Jetpack Boost score of a site",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/boost-score-api/#readme",
 	"bugs": {

diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.48.1] - 2024-02-05
+### Changed
+- Update clicking an icon tooltip to cause the tooltip to show/hide instead of always showing. [#35312]
+- Updated package dependencies.
+
 ## [0.48.0] - 2024-01-29
 ### Changed
 - Move the UpsellBanner component to js-packages/components [#35228]
@@ -932,6 +937,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.48.1]: https://github.com/Automattic/jetpack-components/compare/0.48.0...0.48.1
 [0.48.0]: https://github.com/Automattic/jetpack-components/compare/0.47.0...0.48.0
 [0.47.0]: https://github.com/Automattic/jetpack-components/compare/0.46.0...0.47.0
 [0.46.0]: https://github.com/Automattic/jetpack-components/compare/0.45.10...0.46.0

diff --git a/projects/js-packages/components/changelog/renovate-js-unit-testing-packages b/projects/js-packages/components/changelog/renovate-js-unit-testing-packages
diff --git a/projects/js-packages/components/changelog/renovate-wordpress-monorepo b/projects/js-packages/components/changelog/renovate-wordpress-monorepo
diff --git a/...cts/js-packages/components/changelog/update-js-packages-icon-tooltip-toggle-on-icon-click b/...cts/js-packages/components/changelog/update-js-packages-icon-tooltip-toggle-on-icon-click
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.48.1-alpha",
+	"version": "0.48.1",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.32.0] - 2024-02-05
+### Changed
+- Allow using blog ID instead of site suffix in checkout URL. [#34996]
+- Allow using blog ID instead of site suffix in checkout URL. [#35004]
+- Updated package dependencies.
+
 ## [0.31.2] - 2024-01-29
 ### Changed
 - Update dependencies.
@@ -692,6 +698,7 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.32.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.31.2...v0.32.0
 [0.31.2]: https://github.com/Automattic/jetpack-connection-js/compare/v0.31.1...v0.31.2
 [0.31.1]: https://github.com/Automattic/jetpack-connection-js/compare/v0.31.0...v0.31.1
 [0.31.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.12...v0.31.0

diff --git a/projects/js-packages/connection/changelog/renovate-js-unit-testing-packages b/projects/js-packages/connection/changelog/renovate-js-unit-testing-packages
diff --git a/projects/js-packages/connection/changelog/renovate-wordpress-monorepo b/projects/js-packages/connection/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/connection/changelog/update-protect-2-wpcom-links-blog-id b/projects/js-packages/connection/changelog/update-protect-2-wpcom-links-blog-id
diff --git a/projects/js-packages/connection/changelog/update-videopress-wpcom-links-blog-id b/projects/js-packages/connection/changelog/update-videopress-wpcom-links-blog-id
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.32.0-alpha",
+	"version": "0.32.0",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {

diff --git a/projects/js-packages/i18n-check-webpack-plugin/README.md b/projects/js-packages/i18n-check-webpack-plugin/README.md
@@ -78,19 +78,11 @@ const
 	/* translators: This is a good example. */
 	example = __( 'Example', 'domain' );
 ```
-In some cases even the assignment may be dropped. In that case, you can attach the comment directly to the function call, or inside a multi-line function call:
+In some cases even the assignment may be dropped. In that case, you can attach the comment directly to the function call:
 ```js
 const example =
 	/* translators: This is a good example. */
 	__( 'Example', 'domain' );
-
-const example2 = __(
-	/* translators: This is a good example. */
-	'Example',
-	'domain'
-);
-
-const example3 = __( /* translators: This won't work. The comment must be on a line after the `__(`. */ 'Example', 'domain' );
 ```
 
 Similarly in jsx, a comment placed like this may wind up misplaced:

diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/fix-i18n-check-docs b/projects/js-packages/i18n-check-webpack-plugin/changelog/fix-i18n-check-docs
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+At some point a change in the toolchain (babel? terser?) broke one of the possible fixes for expression movement. Update the docs to stop recommending that fix.