Separate experimental flags for feature and transport

lib/client-assets.php

@@ -213,7 +213,10 @@ function gutenberg_register_packages_scripts( $scripts ) {
 				break;
 
 			case 'wp-core-data':
-				if ( gutenberg_is_experiment_enabled( 'gutenberg-sync-collaboration' ) ) {
+				if (
+					gutenberg_is_experiment_enabled( 'gutenberg-sync-collaboration' ) &&
+					gutenberg_is_experiment_enabled( 'gutenberg-sync-collaboration-webrtc-provider' )
+				) {
 					array_push( $dependencies, 'wp-sync' );
 				}
 				break;

lib/experimental/sync/class-gutenberg-http-signaling-server.php

@@ -19,7 +19,7 @@ class Gutenberg_HTTP_Signaling_Server {
 	 */
 	public static function init() {
 		$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-		if ( ! $gutenberg_experiments || ! array_key_exists( 'gutenberg-sync-collaboration', $gutenberg_experiments ) ) {
+		if ( ! $gutenberg_experiments || ! array_key_exists( 'gutenberg-sync-collaboration-webrtc-provider', $gutenberg_experiments ) ) {
 			return;
 		}
 		add_action( 'wp_ajax_gutenberg_signaling_server', array( __CLASS__, 'do_wp_ajax_action' ) );

lib/experiments-page.php

@@ -129,16 +129,28 @@ function gutenberg_initialize_experiments_settings() {
 
 	add_settings_field(
 		'gutenberg-sync-collaboration',
-		__( 'Collaboration: add real time editing', 'gutenberg' ),
+		__( 'Collaboration: enable real-time collaboration', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Enables live collaboration and offline persistence between peers.', 'gutenberg' ),
+			'label' => __( 'Enables real-time collaboration between peers (requires provider).', 'gutenberg' ),
 			'id'    => 'gutenberg-sync-collaboration',
 		)
 	);
 
+	add_settings_field(
+		'gutenberg-sync-collaboration-webrtc-provider',
+		__( 'Collaboration: WebRTC provider', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Enables the WebRTC provider for real-time collaboration.', 'gutenberg' ),
+			'id'    => 'gutenberg-sync-collaboration-webrtc-provider',
+		)
+	);
+
 	add_settings_field(
 		'gutenberg-color-randomizer',
 		__( 'Color randomizer', 'gutenberg' ),