Merge branch 'trunk' into fix/65014-site-health-dashicons

Author: Webizito

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "0d133bf7e7437d65d68a06551f3d613a7d8e4361",
+		"sha": "e2970ba736edb99e08fb369d4fb0c378189468ee",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {

src/wp-includes/assets/script-loader-packages.php

@@ -100,7 +100,7 @@
 			'wp-url',
 			'wp-warning'
 		),
-		'version' => '0c1dfcebf759791c9a8b'
+		'version' => '2300d40abe29e438beda'
 	),
 	'block-library.js' => array(
 		'dependencies' => array(
@@ -142,7 +142,7 @@
 				'import' => 'dynamic'
 			)
 		),
-		'version' => 'd72ed53f961f90f21ed4'
+		'version' => '67d1a681ec0100a25d78'
 	),
 	'block-serialization-default-parser.js' => array(
 		'dependencies' => array(
@@ -428,7 +428,7 @@
 				'import' => 'static'
 			)
 		),
-		'version' => 'a688ac97344ffdfcca99'
+		'version' => 'd36eb0c37b644e4cd4c8'
 	),
 	'edit-widgets.js' => array(
 		'dependencies' => array(
@@ -519,7 +519,7 @@
 				'import' => 'static'
 			)
 		),
-		'version' => '49ff59c135229f1cc371'
+		'version' => '63782008412a6163c9f0'
 	),
 	'element.js' => array(
 		'dependencies' => array(
@@ -817,7 +817,7 @@
 			'wp-hooks',
 			'wp-private-apis'
 		),
-		'version' => '89ec294039260fd01952'
+		'version' => '8186bfbc15b827d261f5'
 	),
 	'theme.js' => array(
 		'dependencies' => array(

src/wp-includes/assets/script-modules-packages.php

@@ -166,7 +166,7 @@
 				'import' => 'static'
 			)
 		),
-		'version' => '105defe2f1526f8a43e8'
+		'version' => '42d3f09bba14cce3054d'
 	),
 	'connectors/index.js' => array(
 		'dependencies' => array(
@@ -177,7 +177,7 @@
 			'wp-i18n',
 			'wp-private-apis'
 		),
-		'version' => 'e973aa806299e3d70144'
+		'version' => '274797868955a828dfdc'
 	),
 	'core-abilities/index.js' => array(
 		'dependencies' => array(

src/wp-includes/build/routes/connectors-home/content.js

@@ -702,7 +702,7 @@ var import_element4 = __toESM(require_element());
 var import_i18n = __toESM(require_i18n());
 import { speak } from "@wordpress/a11y";
 function useConnectorPlugin({
-  pluginSlug,
+  file: pluginFileFromServer,
   settingName,
   connectorName,
   isInstalled,
@@ -714,6 +714,8 @@ function useConnectorPlugin({
   const [isBusy, setIsBusy] = (0, import_element4.useState)(false);
   const [connectedState, setConnectedState] = (0, import_element4.useState)(initialIsConnected);
   const [pluginStatusOverride, setPluginStatusOverride] = (0, import_element4.useState)(null);
+  const pluginBasename = pluginFileFromServer?.replace(/\.php$/, "");
+  const pluginSlug = pluginBasename?.includes("/") ? pluginBasename.split("/")[0] : pluginBasename;
   const {
     derivedPluginStatus,
     canManagePlugins,
@@ -728,7 +730,7 @@ function useConnectorPlugin({
         kind: "root",
         name: "plugin"
       });
-      if (!pluginSlug) {
+      if (!pluginFileFromServer) {
         const hasLoaded = store2.hasFinishedResolution(
           "getEntityRecord",
           ["root", "site"]
@@ -740,15 +742,14 @@ function useConnectorPlugin({
           canInstallPlugins: canCreate
         };
       }
-      const pluginId = `${pluginSlug}/plugin`;
       const plugin = store2.getEntityRecord(
         "root",
         "plugin",
-        pluginId
+        pluginBasename
       );
       const hasFinished = store2.hasFinishedResolution(
         "getEntityRecord",
-        ["root", "plugin", pluginId]
+        ["root", "plugin", pluginBasename]
       );
       if (!hasFinished) {
         return {
@@ -779,7 +780,7 @@ function useConnectorPlugin({
         canInstallPlugins: canCreate
       };
     },
-    [pluginSlug, settingName, isInstalled, isActivated]
+    [pluginBasename, settingName, isInstalled, isActivated]
   );
   const pluginStatus = pluginStatusOverride ?? derivedPluginStatus;
   const canActivatePlugins = canManagePlugins;
@@ -823,15 +824,18 @@ function useConnectorPlugin({
     }
   };
   const activatePlugin = async () => {
-    if (!pluginSlug) {
+    if (!pluginFileFromServer) {
       return;
     }
     setIsBusy(true);
     try {
       await saveEntityRecord(
         "root",
         "plugin",
-        { plugin: `${pluginSlug}/plugin`, status: "active" },
+        {
+          plugin: pluginBasename,
+          status: "active"
+        },
         { throwOnError: true }
       );
       setPluginStatusOverride("active");
@@ -1030,6 +1034,27 @@ var DefaultConnectorLogo = () => /* @__PURE__ */ React.createElement(
     }
   )
 );
+var AkismetLogo = () => /* @__PURE__ */ React.createElement(
+  "svg",
+  {
+    width: "40",
+    height: "40",
+    viewBox: "0 0 44 44",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg",
+    "aria-hidden": "true"
+  },
+  /* @__PURE__ */ React.createElement("rect", { width: "44", height: "44", fill: "#357B49", rx: "6" }),
+  /* @__PURE__ */ React.createElement(
+    "path",
+    {
+      fill: "#fff",
+      fillRule: "evenodd",
+      d: "m29.746 28.31-6.392-16.797c-.152-.397-.305-.672-.789-.675-.673 0-1.408.611-1.746 1.316l-7.378 16.154c-.072.16-.143.311-.214.454-.5.995-1.045 1.546-2.357 1.626a.399.399 0 0 0-.16.033l-.01.004a.399.399 0 0 0-.23.392v.01c0 .054.01.106.03.155l.004.01a.416.416 0 0 0 .394.252h6.212a.417.417 0 0 0 .307-.12.416.416 0 0 0 .124-.305.398.398 0 0 0-.105-.302.399.399 0 0 0-.294-.127c-.757 0-2.197-.062-2.197-1.164.02-.318.103-.63.245-.916l1.399-3.152c.52-1.163 1.654-1.163 2.572-1.163h5.843c.023 0 .044 0 .062.003.13.014.16.081.214.242l1.534 4.07a2.857 2.857 0 0 1 .216 1.04c0 .054-.003.104-.01.153-.09.726-.831.887-1.49.887a.4.4 0 0 0-.294.127l-.007.008-.007.008a.401.401 0 0 0-.092.286v.01c0 .054.01.106.03.155l.005.01a.42.42 0 0 0 .395.252h7.011a.413.413 0 0 0 .279-.13.412.412 0 0 0 .11-.297.387.387 0 0 0-.09-.294.388.388 0 0 0-.277-.135c-1.448-.122-2.295-.643-2.847-2.08Zm-11.985-5.844 2.847-6.304c.361-.728.659-1.486.889-2.265 0-.06.03-.092.06-.092s.061.032.061.091c.02.122.045.247.073.374.197.888.584 1.878.914 2.723l.176.453 1.684 4.529a.927.927 0 0 1 .092.4.473.473 0 0 1-.009.094c-.041.202-.228.272-.602.272h-6.063c-.122 0-.184-.03-.184-.092a.36.36 0 0 1 .062-.183Zm17.107-.721c0 .786-.446 1.231-1.25 1.231-.806 0-1.125-.409-1.125-1.034 0-.786.465-1.231 1.25-1.231.785 0 1.125.427 1.125 1.034ZM9.629 23.002c.803 0 1.25-.447 1.25-1.231 0-.607-.343-1.036-1.128-1.036-.785 0-1.25.447-1.25 1.231 0 .625.325 1.036 1.128 1.036Z",
+      clipRule: "evenodd"
+    }
+  )
+);
 var GeminiLogo = () => /* @__PURE__ */ React.createElement(
   "svg",
   {
@@ -1123,7 +1148,8 @@ function getConnectorData() {
 var CONNECTOR_LOGOS = {
   google: GeminiLogo,
   openai: OpenAILogo,
-  anthropic: ClaudeLogo
+  anthropic: ClaudeLogo,
+  akismet: AkismetLogo
 };
 function getConnectorLogo(connectorId, logoUrl) {
   if (logoUrl) {
@@ -1161,7 +1187,8 @@ function ApiKeyConnector({
   const auth = authentication?.method === "api_key" ? authentication : void 0;
   const settingName = auth?.settingName ?? "";
   const helpUrl = auth?.credentialsUrl ?? void 0;
-  const pluginSlug = plugin?.slug;
+  const pluginFile = plugin?.file?.replace(/\.php$/, "");
+  const pluginSlug = pluginFile?.includes("/") ? pluginFile.split("/")[0] : pluginFile;
   let helpLabel;
   try {
     if (helpUrl) {
@@ -1184,7 +1211,7 @@ function ApiKeyConnector({
     saveApiKey,
     removeApiKey
   } = useConnectorPlugin({
-    pluginSlug,
+    file: plugin?.file,
     settingName,
     connectorName: name,
     isInstalled: plugin?.isInstalled,
@@ -1259,16 +1286,20 @@ function registerDefaultConnectors() {
   const connectors = getConnectorData();
   const sanitize = (s) => s.replace(/[^a-z0-9-_]/gi, "-");
   for (const [connectorId, data] of Object.entries(connectors)) {
+    if (connectorId === "akismet" && !data.plugin?.isInstalled) {
+      continue;
+    }
     const { authentication } = data;
     const connectorName = sanitize(connectorId);
     const args = {
       name: data.name,
       description: data.description,
+      type: data.type,
       logo: getConnectorLogo(connectorId, data.logoUrl),
       authentication,
       plugin: data.plugin
     };
-    if (data.type === "ai_provider" && authentication.method === "api_key") {
+    if (authentication.method === "api_key") {
       args.render = ApiKeyConnector;
     }
     registerConnector(connectorName, args);
@@ -1562,6 +1593,7 @@ function ConnectorsPage() {
               slug: connector.slug,
               name: connector.name,
               description: connector.description,
+              type: connector.type,
               logo: connector.logo,
               authentication: connector.authentication,
               plugin: connector.plugin

src/wp-includes/build/routes/connectors-home/content.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-private-apis', 'wp-theme', 'wp-url'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/connectors', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => 'e598f70e4e13735c7300');
+<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-private-apis', 'wp-theme', 'wp-url'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/connectors', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => '067df442b07dc9245aee');

src/wp-includes/build/routes/connectors-home/content.min.js

@@ -71,8 +71,8 @@ final class WP_Connector_Registry {
 	 * For connectors with `api_key` authentication, a `setting_name` can be provided
 	 * explicitly. If omitted, one is automatically generated using the pattern
 	 * `connectors_{$type}_{$id}_api_key`, with hyphens in the type and ID normalized
-	 * to underscores (e.g., connector type `spam_filtering` with ID `akismet` produces
-	 * `connectors_spam_filtering_akismet_api_key`). This setting name is used for the
+	 * to underscores (e.g., connector type `spam_filtering` with ID `my_plugin` produces
+	 * `connectors_spam_filtering_my_plugin_api_key`). This setting name is used for the
 	 * Settings API registration and REST API exposure.
 	 *
 	 * Registering a connector with an ID that is already registered will trigger a
@@ -110,7 +110,7 @@ final class WP_Connector_Registry {
 	 *         Optional. Plugin data for install/activate UI.
 	 *
 	 *         @type string $file The plugin's main file path relative to the plugins
-	 *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+	 *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
 	 *     }
 	 * }
 	 * @return array|null The registered connector data on success, null on failure.

src/wp-includes/class-wp-connector-registry.php

@@ -59,7 +59,7 @@ function wp_is_connector_registered( string $id ): bool {
  *         Optional. Plugin data for install/activate UI.
  *
  *         @type string $file The plugin's main file path relative to the plugins
- *                            directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                            directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *     }
  * }
  * @phpstan-return ?array{
@@ -120,7 +120,7 @@ function wp_get_connector( string $id ): ?array {
  *             Optional. Plugin data for install/activate UI.
  *
  *             @type string $file The plugin's main file path relative to the plugins
- *                                directory (e.g. 'akismet/akismet.php' or 'hello.php').
+ *                                directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
  *         }
  *     }
  * }
@@ -210,25 +210,6 @@ function _wp_connectors_init(): void {
 		_wp_connectors_register_default_ai_providers( $registry );
 	}
 
-	// Non-AI default connectors.
-	$registry->register(
-		'akismet',
-		array(
-			'name'           => __( 'Akismet Anti-spam' ),
-			'description'    => __( 'Protect your site from spam.' ),
-			'type'           => 'spam_filtering',
-			'plugin'         => array(
-				'file' => 'akismet/akismet.php',
-			),
-			'authentication' => array(
-				'method'          => 'api_key',
-				'credentials_url' => 'https://akismet.com/get/',
-				'setting_name'    => 'wordpress_api_key',
-				'constant_name'   => 'WPCOM_API_KEY',
-			),
-		)
-	);
-
 	/**
 	 * Fires when the connector registry is ready for plugins to register connectors.
 	 *
@@ -417,9 +398,9 @@ function _wp_connectors_mask_api_key( string $key ): string {
  * @since 7.0.0
  * @access private
  *
- * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_akismet_api_key').
- * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'AKISMET_API_KEY').
- * @param string $constant_name Optional. PHP constant name to check (e.g., 'AKISMET_API_KEY').
+ * @param string $setting_name  The option name for the API key (e.g., 'connectors_spam_filtering_my_plugin_api_key').
+ * @param string $env_var_name  Optional. Environment variable name to check (e.g., 'MY_PLUGIN_API_KEY').
+ * @param string $constant_name Optional. PHP constant name to check (e.g., 'MY_PLUGIN_API_KEY').
  * @return string The key source: 'env', 'constant', 'database', or 'none'.
  */
 function _wp_connectors_get_api_key_source( string $setting_name, string $env_var_name = '', string $constant_name = '' ): string {

src/wp-includes/connectors.php

@@ -37,9 +37,8 @@ public function test_returns_expected_connector_keys(): void {
 		$this->assertArrayHasKey( 'google', $connectors );
 		$this->assertArrayHasKey( 'openai', $connectors );
 		$this->assertArrayHasKey( 'anthropic', $connectors );
-		$this->assertArrayHasKey( 'akismet', $connectors );
 		$this->assertArrayHasKey( 'mock-connectors-test', $connectors );
-		$this->assertCount( 5, $connectors );
+		$this->assertCount( 4, $connectors );
 	}
 
 	/**
@@ -57,7 +56,7 @@ public function test_each_connector_has_required_fields(): void {
 			$this->assertArrayHasKey( 'description', $connector_data, "Connector '{$connector_id}' is missing 'description'." );
 			$this->assertIsString( $connector_data['description'], "Connector '{$connector_id}' description should be a string." );
 			$this->assertArrayHasKey( 'type', $connector_data, "Connector '{$connector_id}' is missing 'type'." );
-			$this->assertContains( $connector_data['type'], array( 'ai_provider', 'spam_filtering' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
+			$this->assertContains( $connector_data['type'], array( 'ai_provider' ), "Connector '{$connector_id}' has unexpected type '{$connector_data['type']}'." );
 			$this->assertArrayHasKey( 'authentication', $connector_data, "Connector '{$connector_id}' is missing 'authentication'." );
 			$this->assertIsArray( $connector_data['authentication'], "Connector '{$connector_id}' authentication should be an array." );
 			$this->assertArrayHasKey( 'method', $connector_data['authentication'], "Connector '{$connector_id}' authentication is missing 'method'." );
@@ -80,16 +79,11 @@ public function test_api_key_connectors_have_setting_name_and_credentials_url():
 			++$api_key_count;
 
 			$this->assertArrayHasKey( 'setting_name', $connector_data['authentication'], "Connector '{$connector_id}' authentication is missing 'setting_name'." );
-
-			// AI providers use the connectors_ai_{id}_api_key convention.
-			// Non-AI connectors may use custom setting names.
-			if ( 'ai_provider' === $connector_data['type'] ) {
-				$this->assertSame(
-					'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
-					$connector_data['authentication']['setting_name'] ?? null,
-					"Connector '{$connector_id}' setting_name does not match expected format."
-				);
-			}
+			$this->assertSame(
+				'connectors_ai_' . str_replace( '-', '_', $connector_id ) . '_api_key',
+				$connector_data['authentication']['setting_name'] ?? null,
+				"Connector '{$connector_id}' setting_name does not match expected format."
+			);
 		}
 
 		$this->assertGreaterThan( 0, $api_key_count, 'At least one connector should use api_key authentication.' );