Merge pull request #8 from happyprime/fix/updates-for-6.1

6.1 release branch

Author: jeremyfelt

README.md

@@ -20,6 +20,13 @@ If you find something we missed, [please let us know](https://github.com/happypr
 
 ## Changelog
 
+### 1.2.0
+
+* Update the list of blocks unregistered to include latest from Gutenberg and WordPress.
+* Update `wordpress/scripts` to 24.6.0.
+* Refactor how the list of blocks is managed to make future maintenance easier. Props @huubl.
+* Only unregister blocks that are registered. Props @huubl.
+
 ### 1.1.1
 
 * Unregister core comment blocks in the editor.

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-blocks', 'wp-dom-ready'), 'version' => 'f7caf480d7863b302b62');
+<?php return array('dependencies' => array('wp-blocks', 'wp-dom-ready'), 'version' => '105d3c0577a1f1b9d0cf');

build/index.js

@@ -18,6 +18,6 @@
   },
   "homepage": "https://github.com/happyprime/turn-comments-off#readme",
   "devDependencies": {
-    "@wordpress/scripts": "^23.3.0"
+    "@wordpress/scripts": "^24.6.0"
   }
 }

package-lock.json

@@ -2,7 +2,7 @@
 /**
  * Plugin Name:  Turn Comments Off
  * Description:  Turn comments off everywhere in WordPress.
- * Version:      1.1.1
+ * Version:      1.2.0
  * Plugin URI:   https://github.com/happyprime/turn-comments-off/
  * Author:       Happy Prime
  * Author URI:   https://happyprime.co
@@ -51,7 +51,7 @@
 
 // Remove comment blocks from the editor. (Twice to be sure!)
 add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\unregister_comment_blocks_javascript' );
-add_filter( 'allowed_block_types_all', __NAMESPACE__ . '\unregister_comment_blocks', 99, 1 );
+add_action( 'init', __NAMESPACE__ . '\unregister_comment_blocks', 99 );
 
 // And disable all comment related views in the admin.
 add_filter( 'wp_count_comments', __NAMESPACE__ . '\filter_wp_count_comments' );
@@ -109,39 +109,50 @@ function unregister_comment_blocks_javascript() {
  *
  * @since 1.1.0
  */
-function unregister_comment_blocks( $allowed_blocks ) {
-
-	// get all the registered blocks
-	$blocks = \WP_Block_Type_Registry::get_instance()->get_all_registered();
-
-	// disable comment blocks
-	unset( $blocks[ 'core/comment-author-name' ] );
-	unset( $blocks[ 'core/comment-content' ] );
-	unset( $blocks[ 'core/comment-date' ] );
-	unset( $blocks[ 'core/comment-edit-link' ] );
-	unset( $blocks[ 'core/comment-reply-link' ] );
-	unset( $blocks[ 'core/comment-template' ] );
-	unset( $blocks[ 'core/comments-pagination' ] );
-	unset( $blocks[ 'core/comments-pagination-next' ] );
-	unset( $blocks[ 'core/comments-pagination-numbers' ] );
-	unset( $blocks[ 'core/comments-pagination-previous' ] );
-	unset( $blocks[ 'core/comments-query-loop' ] );
-	unset( $blocks[ 'core/comments-title' ] );
-	unset( $blocks[ 'core/latest-comments' ] );
-	unset( $blocks[ 'core/post-comments-form' ] );
-	unset( $blocks[ 'core/post-comments-count' ] ); // Gutenberg only.
-	unset( $blocks[ 'core/post-comments-link' ] ); // Gutenberg only.
-
-	// return the new list of allowed blocks
-	return array_keys( $blocks );
+function unregister_comment_blocks() {
+
+	// Retrieve all registered blocks.
+	$registered_blocks = \WP_Block_Type_Registry::get_instance()->get_all_registered();
+
+	$blocks = [
+		'core/comments',
+		'core/comments-query-loop', // Replaced by core/comments in Gutenberg 13.7.
+
+		'core/comment-author-avatar',
+		'core/comment-author-name',
+		'core/comment-content',
+		'core/comment-date',
+		'core/comment-edit-link',
+		'core/comment-reply-link',
+		'core/comment-template',
+
+		'core/comments-pagination',
+		'core/comments-pagination-next',
+		'core/comments-pagination-numbers',
+		'core/comments-pagination-previous',
+		'core/comments-title',
+
+		'core/latest-comments',
+
+		'core/post-comment',
+		'core/post-comments-count',
+		'core/post-comments-form',
+		'core/post-comments-link',
+	];
+
+	foreach ( $blocks as $block ) {
+		if ( isset( $registered_blocks[ $block ] ) ) {
+			unregister_block_type( $block );
+		}
+	}
 }
 
 /**
  * Remove the "Comments" and Settings -> Discussion menus from the
  * side menu in the dashboard.
  */
 function remove_comments_menu_page() {
-	remove_menu_page('edit-comments.php');
+	remove_menu_page( 'edit-comments.php' );
 	remove_submenu_page( 'options-general.php', 'options-discussion.php' );
 }
 

package.json

@@ -2,8 +2,8 @@
 Contributors: happyprime, jeremyfelt, slocker, philcable, wpgirl369
 Tags: comments
 Requires at least: 5.9
-Tested up to: 6.0
-Stable tag: 1.1.1
+Tested up to: 6.1
+Stable tag: 1.2.0
 License: GPLv2 or later
 Requires PHP: 5.6
 
@@ -27,6 +27,13 @@ If you find something we missed, [please let us know](https://github.com/happypr
 
 ## Changelog
 
+### 1.2.0
+
+* Update the list of blocks unregistered to include latest from Gutenberg and WordPress.
+* Update `wordpress/scripts` to 24.6.0.
+* Refactor how the list of blocks is managed to make future maintenance easier. Props [@huubl](https://profiles.wordpress.org/huubl/).
+* Only unregister blocks that are registered. Props [@huubl](https://profiles.wordpress.org/huubl/).
+
 ### 1.1.1
 
 * Unregister core comment blocks in the editor.

plugin.php

@@ -1,33 +1,36 @@
-import { unregisterBlockType } from '@wordpress/blocks';
-import { getBlockType } from '@wordpress/blocks';
+import { getBlockType, unregisterBlockType } from '@wordpress/blocks';
 import domReady from '@wordpress/dom-ready';
 
 // Unregister comment-related blocks provided by WordPress core.
 domReady( () => {
 	const blocks = [
-		// Blocks that will usually show as available on posts and pages.
-		'core/latest-comments',
-		'core/comments-query-loop',
-		'core/post-comments-form',
+		'core/comments',
+		'core/comments-query-loop', // Replaced by core/comments in Gutenberg 13.7.
 
-		// Blocks used inside the comments query loop block.
+		'core/comment-author-avatar',
 		'core/comment-author-name',
 		'core/comment-content',
 		'core/comment-date',
 		'core/comment-edit-link',
 		'core/comment-reply-link',
 		'core/comment-template',
+
 		'core/comments-pagination',
 		'core/comments-pagination-next',
 		'core/comments-pagination-numbers',
 		'core/comments-pagination-previous',
 		'core/comments-title',
+
+		'core/latest-comments',
+
+		'core/post-comment',
 		'core/post-comments-count',
+		'core/post-comments-form',
 		'core/post-comments-link',
 	];
 
-	blocks.forEach( function ( block ) {
-		if ( getBlockType( block ) ) {
+	blocks.forEach( ( block ) => {
+		if ( undefined !== getBlockType( block ) ) {
 			unregisterBlockType( block );
 		}
 	} );