Move real-time collaboration code to lib/experimental/collaboration

lib/compat/wordpress-7.1/rest-api.php

@@ -73,27 +73,3 @@ function gutenberg_override_attachments_rest_controller( $args, $post_type ) {
 	return $args;
 }
 add_filter( 'register_post_type_args', 'gutenberg_override_attachments_rest_controller', 10, 2 );
-
-/**
- * Overrides the default REST controller for autosaves to fix real-time
- * collaboration on draft posts.
- *
- * When RTC is enabled, draft autosaves from all users update the post directly
- * instead of creating per-user autosave revisions depending on post lock and
- * assigned author.
- *
- * Only overrides when autosave_rest_controller_class is not explicitly set,
- * i.e. when WP_REST_Autosaves_Controller would be used by default. Post types
- * with their own specialized autosave controller (e.g. templates) are left alone.
- *
- * @param array $args Array of arguments for registering a post type.
- * @return array Modified array of arguments.
- */
-function gutenberg_override_autosaves_rest_controller( $args ) {
-	if ( empty( $args['autosave_rest_controller_class'] ) ) {
-		$args['autosave_rest_controller_class'] = 'Gutenberg_REST_Autosaves_Controller';
-	}
-	return $args;
-}
-
-add_filter( 'register_post_type_args', 'gutenberg_override_autosaves_rest_controller', 10, 1 );

lib/compat/wordpress-7.1/collaboration.php → lib/experimental/collaboration/collaboration.php

@@ -580,8 +580,8 @@ function gutenberg_post_list_collaboration_row_actions( $actions, $post ) {
 		. '<span class="join-action-text"><a href="%1$s" aria-label="%4$s">%5$s</a></span>',
 		esc_url( get_edit_post_link( $post->ID ) ),
 		/* translators: %s: Post title. */
-		esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-		__( 'Edit' ),
+		esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;', 'default' ), $title ) ),
+		__( 'Edit', 'default' ),
 		/* translators: %s: Post title. */
 		esc_attr( sprintf( __( 'Join editing &#8220;%s&#8221;', 'gutenberg' ), $title ) ),
 		/* translators: Action link text for a singular post in the post list. Can be any type of post. */

lib/experimental/collaboration/rest-api.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * REST API compatibility functions for real-time collaboration.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Overrides the default REST controller for autosaves to fix real-time
+ * collaboration on draft posts.
+ *
+ * When RTC is enabled, draft autosaves from all users update the post directly
+ * instead of creating per-user autosave revisions depending on post lock and
+ * assigned author.
+ *
+ * Only overrides when autosave_rest_controller_class is not explicitly set,
+ * i.e. when WP_REST_Autosaves_Controller would be used by default. Post types
+ * with their own specialized autosave controller (e.g. templates) are left alone.
+ *
+ * @param array $args Array of arguments for registering a post type.
+ * @return array Modified array of arguments.
+ */
+function gutenberg_override_autosaves_rest_controller( $args ) {
+	if ( empty( $args['autosave_rest_controller_class'] ) ) {
+		$args['autosave_rest_controller_class'] = 'Gutenberg_REST_Autosaves_Controller';
+	}
+	return $args;
+}
+
+add_filter( 'register_post_type_args', 'gutenberg_override_autosaves_rest_controller', 10, 1 );

lib/load.php

@@ -67,28 +67,29 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/compat/wordpress-7.0/global-styles.php';
 
 	// WordPress 7.1 compat.
-	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-autosaves-controller.php';
 	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-attachments-controller-7-1.php';
 	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-view-config-data.php';
 	require __DIR__ . '/compat/wordpress-7.1/view-config-api.php';
 	require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-view-config-controller-7-1.php';
 	require __DIR__ . '/compat/wordpress-7.1/class-wp-icon-collections-registry.php';
 	require __DIR__ . '/compat/wordpress-7.1/class-wp-rest-icon-collections-controller.php';
 	require __DIR__ . '/compat/wordpress-7.1/rest-api.php';
-	require __DIR__ . '/compat/wordpress-7.1/collaboration.php';
 	require __DIR__ . '/compat/wordpress-7.1/block-bindings.php';
 	require __DIR__ . '/compat/wordpress-7.1/query-block.php';
 	require __DIR__ . '/compat/wordpress-7.1/block-comments.php';
 
+	// Real-time collaboration.
+	require __DIR__ . '/experimental/collaboration/class-gutenberg-rest-autosaves-controller.php';
+	require __DIR__ . '/experimental/collaboration/rest-api.php';
+	require __DIR__ . '/experimental/collaboration/collaboration.php';
+
 	// Plugin specific code.
 	require_once __DIR__ . '/class-wp-rest-global-styles-controller-gutenberg.php';
 	require_once __DIR__ . '/class-wp-rest-edit-site-export-controller-gutenberg.php';
 	require_once __DIR__ . '/class-wp-icons-registry-gutenberg.php';
 	require_once __DIR__ . '/class-wp-rest-icons-controller-gutenberg.php';
 	require_once __DIR__ . '/rest-api.php';
 
-	// Experimental autosaves controller override for real-time collaboration.
-
 	require_once __DIR__ . '/experimental/rest-api.php';
 	require_once __DIR__ . '/experimental/kses-allowed-html.php';
 
@@ -127,7 +128,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-7.1/media.php';
 require __DIR__ . '/compat/wordpress-7.1/preload.php';
 require __DIR__ . '/compat/wordpress-7.1/icons.php';
-require __DIR__ . '/compat/wordpress-7.1/meta-box-rtc-compat.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
@@ -137,6 +137,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/script-modules.php';
 require __DIR__ . '/experimental/pages/site-editor.php';
 require __DIR__ . '/experimental/extensible-site-editor.php';
+require __DIR__ . '/experimental/collaboration/meta-box-rtc-compat.php';
+
 if ( gutenberg_is_experiment_enabled( 'gutenberg-dataform-inspector' ) ) {
 	require __DIR__ . '/experimental/dataform-inspector-preload.php';
 }