Connection: Load connection JS bundle via connection PHP package (#38…

…877) * Mark connection js package being external to extract it as a dependency * Bundle connection js package inside php connection package * Register connect bundle as a script handle for dependents to use * Add changelog * Fix E2E tests * Fix more e2e tests * Fix jetpack-admin css dependency because it does not use Assets::register_script * Update webpack.config.js Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> --------- Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10676566246 Upstream-Ref: Automattic/jetpack@33068b8
Automattic · Sep 3, 2024 · 184027d · 184027d
1 parent 444d54e
commit 184027d
Show file tree

Hide file tree

Showing 74 changed files with 245 additions and 177 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-blaze/build/editor.asset.php b/vendor/automattic/jetpack-blaze/build/editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '44386680b1ea0c6eb99d');
+<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '87b12b704edf22f91a29');
diff --git a/vendor/automattic/jetpack-blaze/build/editor.js b/vendor/automattic/jetpack-blaze/build/editor.js
diff --git a/vendor/automattic/jetpack-blaze/composer.json b/vendor/automattic/jetpack-blaze/composer.json
@@ -6,7 +6,7 @@
 	"require": {
 		"php": ">=7.0",
 		"automattic/jetpack-assets": "^2.3.5",
-		"automattic/jetpack-connection": "^2.12.5",
+		"automattic/jetpack-connection": "^2.13.0-alpha",
 		"automattic/jetpack-constants": "^2.0.4",
 		"automattic/jetpack-plans": "^0.4.8",
 		"automattic/jetpack-redirect": "^2.0.3",

diff --git a/vendor/automattic/jetpack-connection/CHANGELOG.md b/vendor/automattic/jetpack-connection/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).
 
+## [2.13.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Updated connection js to load its bundle via connection package
+
 ## [2.12.5] - 2024-08-29
 ### Changed
 - Sync: Remove the checksum for active plugins if present when sync is not active, so it gets recalculated when sync gets activated [#39098]
@@ -1167,6 +1174,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[2.13.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v2.12.5...v2.13.0-alpha
 [2.12.5]: https://github.com/Automattic/jetpack-connection/compare/v2.12.4...v2.12.5
 [2.12.4]: https://github.com/Automattic/jetpack-connection/compare/v2.12.3...v2.12.4
 [2.12.3]: https://github.com/Automattic/jetpack-connection/compare/v2.12.2...v2.12.3

diff --git a/vendor/automattic/jetpack-connection/composer.json b/vendor/automattic/jetpack-connection/composer.json
@@ -59,7 +59,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.12.x-dev"
+			"dev-trunk": "2.13.x-dev"
 		},
 		"dependencies": {
 			"test-only": [

diff --git a/vendor/automattic/jetpack-connection/dist/identity-crisis.asset.php b/vendor/automattic/jetpack-connection/dist/identity-crisis.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'a57e6a841c06301bc4cd');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'f6bce0e6b8e0527839ee');
diff --git a/vendor/automattic/jetpack-connection/dist/identity-crisis.js b/vendor/automattic/jetpack-connection/dist/identity-crisis.js
diff --git a/...ttic/jetpack-connection/dist/images/disconnect-confirm-dc9fe8f5c68cfd1320e0.jpg b/...ttic/jetpack-connection/dist/images/disconnect-confirm-dc9fe8f5c68cfd1320e0.jpg
diff --git a/...attic/jetpack-connection/dist/images/disconnect-thanks-5873bfac56a9bd7322cd.jpg b/...attic/jetpack-connection/dist/images/disconnect-thanks-5873bfac56a9bd7322cd.jpg
diff --git a/vendor/automattic/jetpack-connection/dist/jetpack-connection.asset.php b/vendor/automattic/jetpack-connection/dist/jetpack-connection.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '633f5b84c0735e749fc1');
diff --git a/vendor/automattic/jetpack-connection/dist/jetpack-connection.css b/vendor/automattic/jetpack-connection/dist/jetpack-connection.css
diff --git a/vendor/automattic/jetpack-connection/dist/jetpack-connection.js b/vendor/automattic/jetpack-connection/dist/jetpack-connection.js
diff --git a/vendor/automattic/jetpack-connection/dist/jetpack-connection.js.LICENSE.txt b/vendor/automattic/jetpack-connection/dist/jetpack-connection.js.LICENSE.txt
@@ -0,0 +1,7 @@
+/*
+ * Exposes number format capability
+ *
+ * @copyright Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io) and Contributors (http://phpjs.org/authors).
+ * @license See CREDITS.md
+ * @see https://github.com/kvz/phpjs/blob/ffe1356af23a6f2512c84c954dd4e828e92579fa/functions/strings/number_format.js
+ */
diff --git a/vendor/automattic/jetpack-connection/dist/jetpack-connection.rtl.css b/vendor/automattic/jetpack-connection/dist/jetpack-connection.rtl.css
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('jetpack-script-data', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '44386680b1ea0c6eb99d');
		<?php return array('dependencies' => array('jetpack-connection', 'lodash', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '87b12b704edf22f91a29');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '633f5b84c0735e749fc1');