From df25bf5a04f971b8a75c80db65fa3c0be81487f0 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Thu, 23 Nov 2023 09:42:47 +0100
Subject: [PATCH 01/16] Add server-side block class names to the list blocks

---
 lib/blocks.php                                |  4 +-
 .../block-library/src/list-item/index.php     | 47 ++++++++++++++++++
 packages/block-library/src/list/index.php     | 48 +++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 packages/block-library/src/list-item/index.php
 create mode 100644 packages/block-library/src/list/index.php

diff --git a/lib/blocks.php b/lib/blocks.php
index 698b5d6873748f..5bdfe757f9d9e9 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -26,8 +26,6 @@ function gutenberg_reregister_core_block_types() {
 				'form-submit-button',
 				'group',
 				'html',
-				'list',
-				'list-item',
 				'media-text',
 				'missing',
 				'more',
@@ -77,6 +75,8 @@ function gutenberg_reregister_core_block_types() {
 				'heading.php'                      => 'core/heading',
 				'latest-comments.php'              => 'core/latest-comments',
 				'latest-posts.php'                 => 'core/latest-posts',
+				'list.php'                         => 'core/list',
+				'list-item.php'                    => 'core/list-item',
 				'loginout.php'                     => 'core/loginout',
 				'navigation.php'                   => 'core/navigation',
 				'navigation-link.php'              => 'core/navigation-link',
diff --git a/packages/block-library/src/list-item/index.php b/packages/block-library/src/list-item/index.php
new file mode 100644
index 00000000000000..82f4cbab6d8fb6
--- /dev/null
+++ b/packages/block-library/src/list-item/index.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Adds the wp-block-list-item class to the rendered list item block.
+ * @package WordPress
+ */
+
+/**
+ * Adds a wp-block-list-item class to the list item block.
+ * For example, <li> would be transformed to <li class="wp-block-list-item">.
+ * 
+ * @see https://github.com/WordPress/gutenberg/issues/12420
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_list_item_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$processor = new WP_HTML_Tag_Processor( $content );
+
+	while ( $processor->next_tag() ) {
+		if ( 'LI' === $processor->get_tag() ) {
+			$processor->add_class( 'wp-block-list-item' );
+			break;
+		}
+	}
+
+	return $processor->get_updated_html();
+}
+
+/**
+ * Registers the `core/list-item` block on server.
+ */
+function register_block_core_list_item() {
+	register_block_type_from_metadata(
+		__DIR__ . '/list-item',
+		array(
+			'render_callback' => 'block_core_list_item_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_list_item' );
diff --git a/packages/block-library/src/list/index.php b/packages/block-library/src/list/index.php
new file mode 100644
index 00000000000000..5b663fdd557a84
--- /dev/null
+++ b/packages/block-library/src/list/index.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Adds the wp-block-list class to the rendered list block.
+ * @package WordPress
+ */
+
+/**
+ * Adds a wp-block-list class to the list block.
+ * For example, <ol> would be transformed to <ol class="wp-block-list">.
+ * 
+ * @see https://github.com/WordPress/gutenberg/issues/12420
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_list_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$processor = new WP_HTML_Tag_Processor( $content );
+
+	$list_tags = array( 'OL', 'UL' );
+	while ( $processor->next_tag() ) {
+		if ( in_array( $processor->get_tag(), $list_tags, true ) ) {
+			$processor->add_class( 'wp-block-list' );
+			break;
+		}
+	}
+
+	return $processor->get_updated_html();
+}
+
+/**
+ * Registers the `core/list` block on server.
+ */
+function register_block_core_list() {
+	register_block_type_from_metadata(
+		__DIR__ . '/list',
+		array(
+			'render_callback' => 'block_core_list_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_list' );

From 01105c7f9e493a6cfbbadf9b2c4676fe70703268 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Thu, 23 Nov 2023 10:02:51 +0100
Subject: [PATCH 02/16] fix CS issues

---
 packages/block-library/src/list-item/index.php | 3 ++-
 packages/block-library/src/list/index.php      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/list-item/index.php b/packages/block-library/src/list-item/index.php
index 82f4cbab6d8fb6..b4e0585d241c02 100644
--- a/packages/block-library/src/list-item/index.php
+++ b/packages/block-library/src/list-item/index.php
@@ -1,13 +1,14 @@
 <?php
 /**
  * Adds the wp-block-list-item class to the rendered list item block.
+ *
  * @package WordPress
  */
 
 /**
  * Adds a wp-block-list-item class to the list item block.
  * For example, <li> would be transformed to <li class="wp-block-list-item">.
- * 
+ *
  * @see https://github.com/WordPress/gutenberg/issues/12420
  *
  * @param array  $attributes Attributes of the block being rendered.
diff --git a/packages/block-library/src/list/index.php b/packages/block-library/src/list/index.php
index 5b663fdd557a84..931a6e9550e5cd 100644
--- a/packages/block-library/src/list/index.php
+++ b/packages/block-library/src/list/index.php
@@ -1,13 +1,14 @@
 <?php
 /**
  * Adds the wp-block-list class to the rendered list block.
+ *
  * @package WordPress
  */
 
 /**
  * Adds a wp-block-list class to the list block.
  * For example, <ol> would be transformed to <ol class="wp-block-list">.
- * 
+ *
  * @see https://github.com/WordPress/gutenberg/issues/12420
  *
  * @param array  $attributes Attributes of the block being rendered.

From b870eed372fba91062b7b3e5f7993700623787fc Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Fri, 24 Nov 2023 09:55:27 +0100
Subject: [PATCH 03/16] Deprecate the block version that has the className
 block support set to false.

---
 docs/reference-guides/core-blocks.md          |  4 +-
 .../block-library/src/list-item/block.json    |  2 +-
 .../block-library/src/list-item/deprecated.js | 55 ++++++++++++
 packages/block-library/src/list-item/index.js |  2 +
 packages/block-library/src/list/block.json    |  2 +-
 packages/block-library/src/list/deprecated.js | 89 ++++++++++++++++++-
 post-content.php                              | 14 +--
 .../blocks-raw-handling.test.js.snap          | 12 +--
 test/integration/blocks-raw-handling.test.js  | 24 ++---
 .../fixtures/blocks/core__list-item.html      |  2 +-
 .../blocks/core__list-item.parsed.json        |  6 +-
 .../blocks/core__list-item.serialized.html    |  2 +-
 .../blocks/core__list-item_deprecated-v1.html |  3 +
 .../blocks/core__list-item_deprecated-v1.json | 10 +++
 .../core__list-item_deprecated-v1.parsed.json | 11 +++
 ...e__list-item_deprecated-v1.serialized.html |  3 +
 .../core__list__deprecated-v0.serialized.html |  8 +-
 ...list__deprecated-v1-nested.serialized.html | 24 ++---
 .../core__list__deprecated-v1.serialized.html | 14 +--
 .../core__list__deprecated-v2.parsed.json     | 10 ++-
 .../core__list__deprecated-v2.serialized.html |  4 +-
 .../fixtures/blocks/core__list__ul.html       | 14 +--
 .../blocks/core__list__ul.parsed.json         | 34 ++++---
 .../blocks/core__list__ul.serialized.html     | 14 +--
 .../fixtures/documents/apple-out.html         | 20 ++---
 .../fixtures/documents/evernote-out.html      | 24 ++---
 .../documents/google-docs-list-only-out.html  | 14 +--
 .../fixtures/documents/google-docs-out.html   | 20 ++---
 .../google-docs-with-comments-out.html        | 20 ++---
 .../fixtures/documents/markdown-out.html      | 20 ++---
 .../fixtures/documents/ms-word-list-out.html  |  8 +-
 .../documents/ms-word-online-out.html         | 18 ++--
 .../fixtures/documents/ms-word-out.html       | 20 ++---
 33 files changed, 356 insertions(+), 171 deletions(-)
 create mode 100644 packages/block-library/src/list-item/deprecated.js
 create mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
 create mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
 create mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 10f0f76d9eb0d7..8e54b26f66ec79 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -405,7 +405,7 @@ Create a bulleted or numbered list. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/list
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
+-	**Supports:** __unstablePasteTextInline, anchor, className, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** ordered, placeholder, reversed, start, type, values
 
 ## List item
@@ -415,7 +415,7 @@ Create a list item. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/
 -	**Name:** core/list-item
 -	**Category:** text
 -	**Parent:** core/list
--	**Supports:** typography (fontSize, lineHeight), ~~className~~
+-	**Supports:** className, typography (fontSize, lineHeight)
 -	**Attributes:** content, placeholder
 
 ## Login/out
diff --git a/packages/block-library/src/list-item/block.json b/packages/block-library/src/list-item/block.json
index 41221f1c31772e..16817e523cb6b6 100644
--- a/packages/block-library/src/list-item/block.json
+++ b/packages/block-library/src/list-item/block.json
@@ -20,7 +20,7 @@
 		}
 	},
 	"supports": {
-		"className": false,
+		"className": true,
 		"__experimentalSelector": "li",
 		"typography": {
 			"fontSize": true,
diff --git a/packages/block-library/src/list-item/deprecated.js b/packages/block-library/src/list-item/deprecated.js
new file mode 100644
index 00000000000000..a748a3693ae887
--- /dev/null
+++ b/packages/block-library/src/list-item/deprecated.js
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { RichText, InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+
+// Version without block support 'className: true'.
+const v1 = {
+	attributes: {
+		placeholder: {
+			type: 'string',
+		},
+		content: {
+			type: 'string',
+			source: 'html',
+			selector: 'li',
+			default: '',
+			__experimentalRole: 'content',
+		},
+	},
+	supports: {
+		className: false,
+		__experimentalSelector: 'li',
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontWeight: true,
+			__experimentalFontStyle: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalLetterSpacing: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+	},
+	save( { attributes } ) {
+		return (
+			<li { ...useBlockProps.save() }>
+				<RichText.Content value={ attributes.content } />
+				<InnerBlocks.Content />
+			</li>
+		);
+	},
+};
+
+/**
+ * New deprecations need to be placed first
+ * for them to have higher priority.
+ *
+ * Old deprecations may need to be updated as well.
+ *
+ * See block-deprecation.md
+ */
+export default [ v1 ];
diff --git a/packages/block-library/src/list-item/index.js b/packages/block-library/src/list-item/index.js
index 00adc1c2c40266..e593c518680f56 100644
--- a/packages/block-library/src/list-item/index.js
+++ b/packages/block-library/src/list-item/index.js
@@ -11,6 +11,7 @@ import metadata from './block.json';
 import edit from './edit';
 import save from './save';
 import transforms from './transforms';
+import deprecated from './deprecated';
 
 const { name } = metadata;
 
@@ -27,6 +28,7 @@ export const settings = {
 		};
 	},
 	transforms,
+	deprecated,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index e2fb9e4c9e3b0d..c2847db5d8c500 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -37,7 +37,7 @@
 	},
 	"supports": {
 		"anchor": true,
-		"className": false,
+		"className": true,
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/packages/block-library/src/list/deprecated.js b/packages/block-library/src/list/deprecated.js
index cecc17430f65e5..edb04dff27c904 100644
--- a/packages/block-library/src/list/deprecated.js
+++ b/packages/block-library/src/list/deprecated.js
@@ -219,6 +219,93 @@ const v2 = {
 	migrate: migrateTypeToInlineStyle,
 };
 
+// Version without block support 'className: true'.
+const v3 = {
+	attributes: {
+		ordered: {
+			type: 'boolean',
+			default: false,
+			__experimentalRole: 'content',
+		},
+		values: {
+			type: 'string',
+			source: 'html',
+			selector: 'ol,ul',
+			multiline: 'li',
+			__unstableMultilineWrapperTags: [ 'ol', 'ul' ],
+			default: '',
+			__experimentalRole: 'content',
+		},
+		type: {
+			type: 'string',
+		},
+		start: {
+			type: 'number',
+		},
+		reversed: {
+			type: 'boolean',
+		},
+		placeholder: {
+			type: 'string',
+		},
+	},
+	supports: {
+		anchor: true,
+		className: false,
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+			__experimentalFontFamily: true,
+			__experimentalFontWeight: true,
+			__experimentalFontStyle: true,
+			__experimentalTextTransform: true,
+			__experimentalTextDecoration: true,
+			__experimentalLetterSpacing: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		color: {
+			gradients: true,
+			link: true,
+			__experimentalDefaultControls: {
+				background: true,
+				text: true,
+			},
+		},
+		spacing: {
+			margin: true,
+			padding: true,
+			__experimentalDefaultControls: {
+				margin: false,
+				padding: false,
+			},
+		},
+		__unstablePasteTextInline: true,
+		__experimentalSelector: 'ol,ul',
+		__experimentalOnMerge: 'true',
+		__experimentalSlashInserter: true,
+	},
+	save( { attributes } ) {
+		const { ordered, type, reversed, start } = attributes;
+		const TagName = ordered ? 'ol' : 'ul';
+		return (
+			<TagName
+				{ ...useBlockProps.save( {
+					reversed,
+					start,
+					style: {
+						listStyleType:
+							ordered && type !== 'decimal' ? type : undefined,
+					},
+				} ) }
+			>
+				<InnerBlocks.Content />
+			</TagName>
+		);
+	},
+};
+
 /**
  * New deprecations need to be placed first
  * for them to have higher priority.
@@ -227,4 +314,4 @@ const v2 = {
  *
  * See block-deprecation.md
  */
-export default [ v2, v1, v0 ];
+export default [ v3, v2, v1, v0 ];
diff --git a/post-content.php b/post-content.php
index 0bdeb30733f6cd..5545a05e87835d 100644
--- a/post-content.php
+++ b/post-content.php
@@ -61,13 +61,13 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul>
-	<li><?php _e( 'Text &amp; Headings', 'gutenberg' ); ?></li>
-	<li><?php _e( 'Images &amp; Videos', 'gutenberg' ); ?></li>
-	<li><?php _e( 'Galleries', 'gutenberg' ); ?></li>
-	<li><?php _e( 'Embeds, like YouTube, Tweets, or other WordPress posts.', 'gutenberg' ); ?></li>
-	<li><?php _e( 'Layout blocks, like Buttons, Hero Images, Separators, etc.', 'gutenberg' ); ?></li>
-	<li><?php _e( 'And <em>Lists</em> like this one of course :)', 'gutenberg' ); ?></li>
+<ul class="wp-block-list">
+	<li class="wp-block-list-item"><?php _e( 'Text &amp; Headings', 'gutenberg' ); ?></li>
+	<li class="wp-block-list-item"><?php _e( 'Images &amp; Videos', 'gutenberg' ); ?></li>
+	<li class="wp-block-list-item"><?php _e( 'Galleries', 'gutenberg' ); ?></li>
+	<li class="wp-block-list-item"><?php _e( 'Embeds, like YouTube, Tweets, or other WordPress posts.', 'gutenberg' ); ?></li>
+	<li class="wp-block-list-item"><?php _e( 'Layout blocks, like Buttons, Hero Images, Separators, etc.', 'gutenberg' ); ?></li>
+	<li class="wp-block-list-item"><?php _e( 'And <em>Lists</em> like this one of course :)', 'gutenberg' ); ?></li>
 </ul>
 <!-- /wp:list -->
 
diff --git a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
index 071870a4208174..59bcba07275ecd 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
@@ -135,8 +135,8 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 <!-- /wp:html -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>Item</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
@@ -177,10 +177,10 @@ exports[`rawHandler should convert a caption shortcode with link 1`] = `
 
 exports[`rawHandler should convert a list with attributes 1`] = `
 "<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
-<ol reversed start="2" style="list-style-type:lower-roman"><!-- wp:list-item -->
-<li>1<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
-<ol reversed start="2" style="list-style-type:lower-roman"><!-- wp:list-item -->
-<li>1</li>
+<ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
+<ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ol>
diff --git a/test/integration/blocks-raw-handling.test.js b/test/integration/blocks-raw-handling.test.js
index 229fa0ba7761c8..810bcc0ef34012 100644
--- a/test/integration/blocks-raw-handling.test.js
+++ b/test/integration/blocks-raw-handling.test.js
@@ -177,16 +177,16 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
-		<li>one</li>
+		"<ul class="wp-block-list"><!-- wp:list-item -->
+		<li class="wp-block-list-item">one</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>two</li>
+		<li class="wp-block-list-item">two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>three</li>
+		<li class="wp-block-list-item">three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
@@ -202,16 +202,16 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
-		<li>one</li>
+		"<ul class="wp-block-list"><!-- wp:list-item -->
+		<li class="wp-block-list-item">one</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>two</li>
+		<li class="wp-block-list-item">two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>three</li>
+		<li class="wp-block-list-item">three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
@@ -318,16 +318,16 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
-		<li>One</li>
+		"<ul class="wp-block-list"><!-- wp:list-item -->
+		<li class="wp-block-list-item">One</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>Two</li>
+		<li class="wp-block-list-item">Two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li>Three</li>
+		<li class="wp-block-list-item">Three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
diff --git a/test/integration/fixtures/blocks/core__list-item.html b/test/integration/fixtures/blocks/core__list-item.html
index abeec57ef91988..8eb9e4d57a9163 100644
--- a/test/integration/fixtures/blocks/core__list-item.html
+++ b/test/integration/fixtures/blocks/core__list-item.html
@@ -1,3 +1,3 @@
 <!-- wp:list-item -->
-<li>Text &amp; Headings</li>
+<li class="wp-block-list-item">Text &amp; Headings</li>
 <!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item.parsed.json b/test/integration/fixtures/blocks/core__list-item.parsed.json
index 29966c6490c59d..0fff75693189be 100644
--- a/test/integration/fixtures/blocks/core__list-item.parsed.json
+++ b/test/integration/fixtures/blocks/core__list-item.parsed.json
@@ -3,7 +3,9 @@
 		"blockName": "core/list-item",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<li>Text &amp; Headings</li>\n",
-		"innerContent": [ "\n<li>Text &amp; Headings</li>\n" ]
+		"innerHTML": "\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n",
+		"innerContent": [
+			"\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__list-item.serialized.html b/test/integration/fixtures/blocks/core__list-item.serialized.html
index abeec57ef91988..8eb9e4d57a9163 100644
--- a/test/integration/fixtures/blocks/core__list-item.serialized.html
+++ b/test/integration/fixtures/blocks/core__list-item.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:list-item -->
-<li>Text &amp; Headings</li>
+<li class="wp-block-list-item">Text &amp; Headings</li>
 <!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
new file mode 100644
index 00000000000000..ab37d5ca5c6b60
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
@@ -0,0 +1,3 @@
+<!-- wp:list-item -->
+<li>Text</li>
+<!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
new file mode 100644
index 00000000000000..1a3ec89bddd541
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
@@ -0,0 +1,10 @@
+[
+	{
+		"name": "core/list-item",
+		"isValid": true,
+		"attributes": {
+			"content": "Text"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
new file mode 100644
index 00000000000000..cbd204b60a1c2a
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/list-item",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<li>Text</li>\n",
+		"innerContent": [
+			"\n<li>Text</li>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html
new file mode 100644
index 00000000000000..8cc90706933a09
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:list-item -->
+<li class="wp-block-list-item">Text</li>
+<!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
index fa50fb5db17e7b..eda1daa690bcf7 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
@@ -1,13 +1,13 @@
 <!-- wp:list {"fontFamily":"cambria-georgia"} -->
-<ul class="has-cambria-georgia-font-family"><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list has-cambria-georgia-font-family"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>three</li>
+<li class="wp-block-list-item">three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
index 61e33d3dc0e156..be1d0f220331ab 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
@@ -1,26 +1,26 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li><strong>Item</strong><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
index c09708d51db0bb..81b32227abecc8 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Text &amp; Headings</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Images &amp; Videos</li>
+<li class="wp-block-list-item">Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Galleries</li>
+<li class="wp-block-list-item">Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>And <em>Lists</em> like this one of course :)</li>
+<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
index 7ddda9e08da5ab..f8c9354e9f44e6 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
@@ -11,10 +11,16 @@
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<li>Item 1</li>\n\t",
-				"innerContent": [ "\n\t<li>Item 1</li>\n\t" ]
+				"innerContent": [
+					"\n\t<li>Item 1</li>\n\t"
+				]
 			}
 		],
 		"innerHTML": "\n<ol type=\"A\">\n\t\n</ol>\n",
-		"innerContent": [ "\n<ol type=\"A\">\n\t", null, "\n</ol>\n" ]
+		"innerContent": [
+			"\n<ol type=\"A\">\n\t",
+			null,
+			"\n</ol>\n"
+		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
index 44c97ca29209cf..f7906a4ed961bd 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list {"ordered":true,"type":"upper-alpha"} -->
-<ol style="list-style-type:upper-alpha"><!-- wp:list-item -->
-<li>Item 1</li>
+<ol style="list-style-type:upper-alpha" class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Item 1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__ul.html b/test/integration/fixtures/blocks/core__list__ul.html
index c09708d51db0bb..81b32227abecc8 100644
--- a/test/integration/fixtures/blocks/core__list__ul.html
+++ b/test/integration/fixtures/blocks/core__list__ul.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Text &amp; Headings</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Images &amp; Videos</li>
+<li class="wp-block-list-item">Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Galleries</li>
+<li class="wp-block-list-item">Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>And <em>Lists</em> like this one of course :)</li>
+<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__ul.parsed.json b/test/integration/fixtures/blocks/core__list__ul.parsed.json
index 2853bc5558ebe3..1f11425b02d03f 100644
--- a/test/integration/fixtures/blocks/core__list__ul.parsed.json
+++ b/test/integration/fixtures/blocks/core__list__ul.parsed.json
@@ -7,54 +7,60 @@
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>Text &amp; Headings</li>\n",
-				"innerContent": [ "\n<li>Text &amp; Headings</li>\n" ]
+				"innerHTML": "\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n",
+				"innerContent": [
+					"\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n"
+				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>Images &amp; Videos</li>\n",
-				"innerContent": [ "\n<li>Images &amp; Videos</li>\n" ]
+				"innerHTML": "\n<li class=\"wp-block-list-item\">Images &amp; Videos</li>\n",
+				"innerContent": [
+					"\n<li class=\"wp-block-list-item\">Images &amp; Videos</li>\n"
+				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>Galleries</li>\n",
-				"innerContent": [ "\n<li>Galleries</li>\n" ]
+				"innerHTML": "\n<li class=\"wp-block-list-item\">Galleries</li>\n",
+				"innerContent": [
+					"\n<li class=\"wp-block-list-item\">Galleries</li>\n"
+				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n",
+				"innerHTML": "\n<li class=\"wp-block-list-item\">Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n",
 				"innerContent": [
-					"\n<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n"
+					"\n<li class=\"wp-block-list-item\">Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n"
 				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n",
+				"innerHTML": "\n<li class=\"wp-block-list-item\">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n",
 				"innerContent": [
-					"\n<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n"
+					"\n<li class=\"wp-block-list-item\">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n"
 				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li>And <em>Lists</em> like this one of course :)</li>\n",
+				"innerHTML": "\n<li class=\"wp-block-list-item\">And <em>Lists</em> like this one of course :)</li>\n",
 				"innerContent": [
-					"\n<li>And <em>Lists</em> like this one of course :)</li>\n"
+					"\n<li class=\"wp-block-list-item\">And <em>Lists</em> like this one of course :)</li>\n"
 				]
 			}
 		],
-		"innerHTML": "\n<ul>\n\n\n\n\n\n\n\n\n\n</ul>\n",
+		"innerHTML": "\n<ul class=\"wp-block-list\">\n\n\n\n\n\n\n\n\n\n</ul>\n",
 		"innerContent": [
-			"\n<ul>",
+			"\n<ul class=\"wp-block-list\">",
 			null,
 			"\n\n",
 			null,
diff --git a/test/integration/fixtures/blocks/core__list__ul.serialized.html b/test/integration/fixtures/blocks/core__list__ul.serialized.html
index c09708d51db0bb..81b32227abecc8 100644
--- a/test/integration/fixtures/blocks/core__list__ul.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__ul.serialized.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Text &amp; Headings</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Images &amp; Videos</li>
+<li class="wp-block-list-item">Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Galleries</li>
+<li class="wp-block-list-item">Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>And <em>Lists</em> like this one of course :)</li>
+<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/documents/apple-out.html b/test/integration/fixtures/documents/apple-out.html
index d873c942ea9ce1..23c300f562db8b 100644
--- a/test/integration/fixtures/documents/apple-out.html
+++ b/test/integration/fixtures/documents/apple-out.html
@@ -11,34 +11,34 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>One</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/evernote-out.html b/test/integration/fixtures/documents/evernote-out.html
index 19102ab70dc487..9ecb4f8a566aa6 100644
--- a/test/integration/fixtures/documents/evernote-out.html
+++ b/test/integration/fixtures/documents/evernote-out.html
@@ -7,38 +7,38 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>An</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">An</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Unordered<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Unordered<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
-<ol start="1"><!-- wp:list-item -->
-<li>One</li>
+<ol start="1" class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Two<!-- wp:list {"ordered":true} -->
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/google-docs-list-only-out.html b/test/integration/fixtures/documents/google-docs-list-only-out.html
index 642dc168bb5bb9..fa60c750496888 100644
--- a/test/integration/fixtures/documents/google-docs-list-only-out.html
+++ b/test/integration/fixtures/documents/google-docs-list-only-out.html
@@ -1,21 +1,21 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>My first list item<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A sub list item</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">My first list item<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A sub list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>A second sub list item</li>
+<li class="wp-block-list-item">A second sub list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>My second list item</li>
+<li class="wp-block-list-item">My second list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>My third list item</li>
+<li class="wp-block-list-item">My third list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
\ No newline at end of file
diff --git a/test/integration/fixtures/documents/google-docs-out.html b/test/integration/fixtures/documents/google-docs-out.html
index e88311fab7b1f6..9c8f6d335d606a 100644
--- a/test/integration/fixtures/documents/google-docs-out.html
+++ b/test/integration/fixtures/documents/google-docs-out.html
@@ -11,34 +11,34 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>One</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/google-docs-with-comments-out.html b/test/integration/fixtures/documents/google-docs-with-comments-out.html
index e88311fab7b1f6..9c8f6d335d606a 100644
--- a/test/integration/fixtures/documents/google-docs-with-comments-out.html
+++ b/test/integration/fixtures/documents/google-docs-with-comments-out.html
@@ -11,34 +11,34 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>One</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/markdown-out.html b/test/integration/fixtures/documents/markdown-out.html
index 31fa8dacbebf0a..8a7542b7f8b7fd 100644
--- a/test/integration/fixtures/documents/markdown-out.html
+++ b/test/integration/fixtures/documents/markdown-out.html
@@ -15,34 +15,34 @@ <h2 class="wp-block-heading">Lists</h2>
 <!-- /wp:heading -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>One</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-list-out.html b/test/integration/fixtures/documents/ms-word-list-out.html
index f57946f64bc985..10388ac4f848d2 100644
--- a/test/integration/fixtures/documents/ms-word-list-out.html
+++ b/test/integration/fixtures/documents/ms-word-list-out.html
@@ -7,16 +7,16 @@ <h3 class="wp-block-heading"><a>This is a headline?</a></h3>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>One</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-online-out.html b/test/integration/fixtures/documents/ms-word-online-out.html
index 398281520f2542..66a20db9825c36 100644
--- a/test/integration/fixtures/documents/ms-word-online-out.html
+++ b/test/integration/fixtures/documents/ms-word-online-out.html
@@ -7,34 +7,34 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A&nbsp;</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted&nbsp;</li>
+<li class="wp-block-list-item">Bulleted&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Indented&nbsp;</li>
+<li class="wp-block-list-item">Indented&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List&nbsp;</li>
+<li class="wp-block-list-item">List&nbsp;</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
-<ol start="1"><!-- wp:list-item -->
-<li>One&nbsp;</li>
+<ol start="1" class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two&nbsp;</li>
+<li class="wp-block-list-item">Two&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three&nbsp;</li>
+<li class="wp-block-list-item">Three&nbsp;</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-out.html b/test/integration/fixtures/documents/ms-word-out.html
index 98992494032b3e..02d092ce6f7a72 100644
--- a/test/integration/fixtures/documents/ms-word-out.html
+++ b/test/integration/fixtures/documents/ms-word-out.html
@@ -19,34 +19,34 @@ <h2 class="wp-block-heading">This is a heading level 2</h2>
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Bulleted<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>Indented</li>
+<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>List</li>
+<li class="wp-block-list-item">List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>One</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Two</li>
+<li class="wp-block-list-item">Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Three</li>
+<li class="wp-block-list-item">Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 

From 71332b453e59f0361fb3837a2b6ff93ec7048c94 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Fri, 24 Nov 2023 13:48:42 +0100
Subject: [PATCH 04/16] Try to update tests by adding bock class names

---
 test/e2e/specs/editor/blocks/list.spec.js | 342 +++++++++++-----------
 1 file changed, 171 insertions(+), 171 deletions(-)

diff --git a/test/e2e/specs/editor/blocks/list.spec.js b/test/e2e/specs/editor/blocks/list.spec.js
index 48d50a862a50b4..52cd7033b6f1bb 100644
--- a/test/e2e/specs/editor/blocks/list.spec.js
+++ b/test/e2e/specs/editor/blocks/list.spec.js
@@ -23,12 +23,12 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( 'Another list item' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>A list item</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>Another list item</li>
+<li class="wp-block-list-item">Another list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -48,8 +48,8 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '* ' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>test</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -67,8 +67,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>A list item</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">A list item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -234,8 +234,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>I’m a list</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">I’m a list</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -253,8 +253,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>test</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -279,12 +279,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -305,12 +305,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -338,12 +338,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one<br>...</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one<br>...</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -403,12 +403,12 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></blockquote>
 <!-- /wp:quote -->`
@@ -427,8 +427,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -443,12 +443,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -468,16 +468,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li></li>
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -486,8 +486,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -496,8 +496,8 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>two</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -511,16 +511,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li></li>
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>two</li>
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -607,8 +607,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>one</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
@@ -617,8 +617,8 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>two</li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -635,14 +635,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>two</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>three</li>
+<li class="wp-block-list-item">three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -661,10 +661,10 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>one<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">one<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -678,8 +678,8 @@ test.describe( 'List (@firefox)', () => {
 		await editor.clickBlockToolbarButton( 'Ordered' );
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li></li>
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -699,10 +699,10 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list {"ordered":true} -->
+<ol class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -724,8 +724,8 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>aaa</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">aaa</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -745,10 +745,10 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -759,12 +759,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>1</li>
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -782,12 +782,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>i</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -800,14 +800,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>i</li>
+<li class="wp-block-list-item">i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -821,16 +821,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<liclass="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>i</li>
+<li class="wp-block-list-item">i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -852,12 +852,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>b<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>c</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">b<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -871,14 +871,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>b<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>c</li>
+<li class="wp-block-list-item">b<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -897,8 +897,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<br></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<br></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -920,16 +920,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>b<br></li>
+<li class="wp-block-list-item">b<br></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>c</li>
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -951,12 +951,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>i</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -970,14 +970,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li></li>
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -988,16 +988,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li></li>
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1006,10 +1006,10 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1021,12 +1021,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li></li>
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1035,8 +1035,8 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1068,14 +1068,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>2<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<li class="wp-block-list-item">2<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1098,12 +1098,12 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li> </li>
+<li class="wp-block-list-item"> </li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1152,14 +1152,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>2</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>3</li>
+<li class="wp-block-list-item">3</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1178,14 +1178,14 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>2</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>3</li>
+<li class="wp-block-list-item">3</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1213,8 +1213,8 @@ test.describe( 'List (@firefox)', () => {
 <!-- /wp:paragraph -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>2</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1238,15 +1238,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
 <ol><!-- wp:list-item -->
-<li>1</li>
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>2</li>
+<li class="wp-block-list-item">2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>3</li>
+<li class="wp-block-list-item">3</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -1269,16 +1269,16 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>b</li>
+<li class="wp-block-list-item">b</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>c</li>
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1295,8 +1295,8 @@ test.describe( 'List (@firefox)', () => {
 		// Add empty list block
 		await page.getByPlaceholder( 'Start writing with text or HTML' )
 			.fill( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 
@@ -1305,8 +1305,8 @@ test.describe( 'List (@firefox)', () => {
 
 		// Verify no WSOD and content is proper.
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );
@@ -1326,18 +1326,18 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '* c' );
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>b</li>
+<li class="wp-block-list-item">b</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>c</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 
@@ -1345,16 +1345,16 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.press( 'Backspace' );
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>a</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>b</li>
+<li class="wp-block-list-item">b</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>c</li>
+<li class="wp-block-list-item">c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );
@@ -1368,8 +1368,8 @@ test.describe( 'List (@firefox)', () => {
 		await page.keyboard.type( '1' );
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li></li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item"></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -1409,12 +1409,12 @@ test.describe( 'List (@firefox)', () => {
 		await page.getByRole( 'menuitem', { name: 'List' } ).click();
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
-<li>1</li>
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li class="wp-block-list-item">1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li>2</li>
+<li class="wp-block-list-item">2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );

From e9dd9931ea7ec9b41de16a7bc96df25f12156e3b Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 06:59:19 +0100
Subject: [PATCH 05/16] Revert list-item changes

---
 docs/reference-guides/core-blocks.md          |   2 +-
 lib/blocks.php                                |   2 +-
 .../block-library/src/list-item/block.json    |   2 +-
 .../block-library/src/list-item/deprecated.js |  55 -----
 packages/block-library/src/list-item/index.js |   2 -
 .../block-library/src/list-item/index.php     |  48 -----
 post-content.php                              |  12 +-
 test/e2e/specs/editor/blocks/list.spec.js     | 204 +++++++++---------
 .../blocks-raw-handling.test.js.snap          |   6 +-
 test/integration/blocks-raw-handling.test.js  |  18 +-
 .../fixtures/blocks/core__list-item.html      |   2 +-
 .../blocks/core__list-item.parsed.json        |   6 +-
 .../blocks/core__list-item.serialized.html    |   2 +-
 .../blocks/core__list-item_deprecated-v1.html |   3 -
 .../blocks/core__list-item_deprecated-v1.json |  10 -
 .../core__list-item_deprecated-v1.parsed.json |  11 -
 ...e__list-item_deprecated-v1.serialized.html |   3 -
 .../core__list__deprecated-v0.serialized.html |   6 +-
 ...list__deprecated-v1-nested.serialized.html |  14 +-
 .../core__list__deprecated-v1.serialized.html |  12 +-
 .../core__list__deprecated-v2.parsed.json     |  10 +-
 .../core__list__deprecated-v2.serialized.html |   2 +-
 .../fixtures/blocks/core__list__ul.html       |  12 +-
 .../blocks/core__list__ul.parsed.json         |  30 ++-
 .../blocks/core__list__ul.serialized.html     |  12 +-
 .../fixtures/documents/apple-out.html         |  14 +-
 .../fixtures/documents/evernote-out.html      |  16 +-
 .../documents/google-docs-list-only-out.html  |  10 +-
 .../fixtures/documents/google-docs-out.html   |  14 +-
 .../google-docs-with-comments-out.html        |  14 +-
 .../fixtures/documents/markdown-out.html      |  14 +-
 .../fixtures/documents/ms-word-list-out.html  |   6 +-
 .../documents/ms-word-online-out.html         |  14 +-
 .../fixtures/documents/ms-word-out.html       |  14 +-
 34 files changed, 228 insertions(+), 374 deletions(-)
 delete mode 100644 packages/block-library/src/list-item/deprecated.js
 delete mode 100644 packages/block-library/src/list-item/index.php
 delete mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
 delete mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
 delete mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 8e54b26f66ec79..4f598f95c4a9a2 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -415,7 +415,7 @@ Create a list item. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/
 -	**Name:** core/list-item
 -	**Category:** text
 -	**Parent:** core/list
--	**Supports:** className, typography (fontSize, lineHeight)
+-	**Supports:** typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** content, placeholder
 
 ## Login/out
diff --git a/lib/blocks.php b/lib/blocks.php
index 5bdfe757f9d9e9..e8b899d5a97daf 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -26,6 +26,7 @@ function gutenberg_reregister_core_block_types() {
 				'form-submit-button',
 				'group',
 				'html',
+				'list-item',
 				'media-text',
 				'missing',
 				'more',
@@ -76,7 +77,6 @@ function gutenberg_reregister_core_block_types() {
 				'latest-comments.php'              => 'core/latest-comments',
 				'latest-posts.php'                 => 'core/latest-posts',
 				'list.php'                         => 'core/list',
-				'list-item.php'                    => 'core/list-item',
 				'loginout.php'                     => 'core/loginout',
 				'navigation.php'                   => 'core/navigation',
 				'navigation-link.php'              => 'core/navigation-link',
diff --git a/packages/block-library/src/list-item/block.json b/packages/block-library/src/list-item/block.json
index 16817e523cb6b6..41221f1c31772e 100644
--- a/packages/block-library/src/list-item/block.json
+++ b/packages/block-library/src/list-item/block.json
@@ -20,7 +20,7 @@
 		}
 	},
 	"supports": {
-		"className": true,
+		"className": false,
 		"__experimentalSelector": "li",
 		"typography": {
 			"fontSize": true,
diff --git a/packages/block-library/src/list-item/deprecated.js b/packages/block-library/src/list-item/deprecated.js
deleted file mode 100644
index a748a3693ae887..00000000000000
--- a/packages/block-library/src/list-item/deprecated.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { RichText, InnerBlocks, useBlockProps } from '@wordpress/block-editor';
-
-// Version without block support 'className: true'.
-const v1 = {
-	attributes: {
-		placeholder: {
-			type: 'string',
-		},
-		content: {
-			type: 'string',
-			source: 'html',
-			selector: 'li',
-			default: '',
-			__experimentalRole: 'content',
-		},
-	},
-	supports: {
-		className: false,
-		__experimentalSelector: 'li',
-		typography: {
-			fontSize: true,
-			lineHeight: true,
-			__experimentalFontFamily: true,
-			__experimentalFontWeight: true,
-			__experimentalFontStyle: true,
-			__experimentalTextTransform: true,
-			__experimentalTextDecoration: true,
-			__experimentalLetterSpacing: true,
-			__experimentalDefaultControls: {
-				fontSize: true,
-			},
-		},
-	},
-	save( { attributes } ) {
-		return (
-			<li { ...useBlockProps.save() }>
-				<RichText.Content value={ attributes.content } />
-				<InnerBlocks.Content />
-			</li>
-		);
-	},
-};
-
-/**
- * New deprecations need to be placed first
- * for them to have higher priority.
- *
- * Old deprecations may need to be updated as well.
- *
- * See block-deprecation.md
- */
-export default [ v1 ];
diff --git a/packages/block-library/src/list-item/index.js b/packages/block-library/src/list-item/index.js
index e593c518680f56..00adc1c2c40266 100644
--- a/packages/block-library/src/list-item/index.js
+++ b/packages/block-library/src/list-item/index.js
@@ -11,7 +11,6 @@ import metadata from './block.json';
 import edit from './edit';
 import save from './save';
 import transforms from './transforms';
-import deprecated from './deprecated';
 
 const { name } = metadata;
 
@@ -28,7 +27,6 @@ export const settings = {
 		};
 	},
 	transforms,
-	deprecated,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/list-item/index.php b/packages/block-library/src/list-item/index.php
deleted file mode 100644
index b4e0585d241c02..00000000000000
--- a/packages/block-library/src/list-item/index.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Adds the wp-block-list-item class to the rendered list item block.
- *
- * @package WordPress
- */
-
-/**
- * Adds a wp-block-list-item class to the list item block.
- * For example, <li> would be transformed to <li class="wp-block-list-item">.
- *
- * @see https://github.com/WordPress/gutenberg/issues/12420
- *
- * @param array  $attributes Attributes of the block being rendered.
- * @param string $content Content of the block being rendered.
- *
- * @return string The content of the block being rendered.
- */
-function block_core_list_item_render( $attributes, $content ) {
-	if ( ! $content ) {
-		return $content;
-	}
-
-	$processor = new WP_HTML_Tag_Processor( $content );
-
-	while ( $processor->next_tag() ) {
-		if ( 'LI' === $processor->get_tag() ) {
-			$processor->add_class( 'wp-block-list-item' );
-			break;
-		}
-	}
-
-	return $processor->get_updated_html();
-}
-
-/**
- * Registers the `core/list-item` block on server.
- */
-function register_block_core_list_item() {
-	register_block_type_from_metadata(
-		__DIR__ . '/list-item',
-		array(
-			'render_callback' => 'block_core_list_item_render',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_list_item' );
diff --git a/post-content.php b/post-content.php
index 5545a05e87835d..3c9b18087b0e84 100644
--- a/post-content.php
+++ b/post-content.php
@@ -62,12 +62,12 @@
 
 <!-- wp:list -->
 <ul class="wp-block-list">
-	<li class="wp-block-list-item"><?php _e( 'Text &amp; Headings', 'gutenberg' ); ?></li>
-	<li class="wp-block-list-item"><?php _e( 'Images &amp; Videos', 'gutenberg' ); ?></li>
-	<li class="wp-block-list-item"><?php _e( 'Galleries', 'gutenberg' ); ?></li>
-	<li class="wp-block-list-item"><?php _e( 'Embeds, like YouTube, Tweets, or other WordPress posts.', 'gutenberg' ); ?></li>
-	<li class="wp-block-list-item"><?php _e( 'Layout blocks, like Buttons, Hero Images, Separators, etc.', 'gutenberg' ); ?></li>
-	<li class="wp-block-list-item"><?php _e( 'And <em>Lists</em> like this one of course :)', 'gutenberg' ); ?></li>
+	<li><?php _e( 'Text &amp; Headings', 'gutenberg' ); ?></li>
+	<li><?php _e( 'Images &amp; Videos', 'gutenberg' ); ?></li>
+	<li><?php _e( 'Galleries', 'gutenberg' ); ?></li>
+	<li><?php _e( 'Embeds, like YouTube, Tweets, or other WordPress posts.', 'gutenberg' ); ?></li>
+	<li><?php _e( 'Layout blocks, like Buttons, Hero Images, Separators, etc.', 'gutenberg' ); ?></li>
+	<li><?php _e( 'And <em>Lists</em> like this one of course :)', 'gutenberg' ); ?></li>
 </ul>
 <!-- /wp:list -->
 
diff --git a/test/e2e/specs/editor/blocks/list.spec.js b/test/e2e/specs/editor/blocks/list.spec.js
index 52cd7033b6f1bb..06bbc0bdf618b0 100644
--- a/test/e2e/specs/editor/blocks/list.spec.js
+++ b/test/e2e/specs/editor/blocks/list.spec.js
@@ -24,11 +24,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A list item</li>
+<li>A list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Another list item</li>
+<li>Another list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -49,7 +49,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">test</li>
+<li>test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -68,7 +68,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A list item</li>
+<li>A list item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -235,7 +235,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">I’m a list</li>
+<li>I’m a list</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -254,7 +254,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">test</li>
+<li>test</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -280,11 +280,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -306,11 +306,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -339,11 +339,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one<br>...</li>
+<li>one<br>...</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -404,11 +404,11 @@ test.describe( 'List (@firefox)', () => {
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></blockquote>
 <!-- /wp:quote -->`
@@ -428,7 +428,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -444,11 +444,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -469,15 +469,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -487,7 +487,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -497,7 +497,7 @@ test.describe( 'List (@firefox)', () => {
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -512,15 +512,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -608,7 +608,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
@@ -618,7 +618,7 @@ test.describe( 'List (@firefox)', () => {
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -636,13 +636,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one<!-- wp:list -->
+<li>one<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">three</li>
+<li>three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -662,9 +662,9 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">one<!-- wp:list -->
+<li>one<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -679,7 +679,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -700,9 +700,9 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list {"ordered":true} -->
+<li>a<!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -725,7 +725,7 @@ test.describe( 'List (@firefox)', () => {
 			`<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">aaa</li>
+<li>aaa</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -746,9 +746,9 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -760,11 +760,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -783,11 +783,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">i</li>
+<li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -801,13 +801,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">i</li>
+<li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -822,15 +822,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<liclass="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">i</li>
+<li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -853,11 +853,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">b<!-- wp:list -->
+<li>b<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -872,13 +872,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">b<!-- wp:list -->
+<li>b<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -898,7 +898,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<br></li>
+<li>a<br></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -921,15 +921,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">b<br></li>
+<li>b<br></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -952,11 +952,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a<!-- wp:list -->
+<li>a<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">i</li>
+<li>i</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -971,13 +971,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -989,15 +989,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1007,9 +1007,9 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1022,11 +1022,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1036,7 +1036,7 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1069,13 +1069,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">2<!-- wp:list -->
+<li>2<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1099,11 +1099,11 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"> </li>
+<li> </li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1153,13 +1153,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">2</li>
+<li>2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">3</li>
+<li>3</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1179,13 +1179,13 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list -->
+<li>1<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">2</li>
+<li>2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">3</li>
+<li>3</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
@@ -1214,7 +1214,7 @@ test.describe( 'List (@firefox)', () => {
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">2</li>
+<li>2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1238,15 +1238,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
 <ol><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">2</li>
+<li>2</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">3</li>
+<li>3</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->`
 		);
@@ -1270,15 +1270,15 @@ test.describe( 'List (@firefox)', () => {
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">b</li>
+<li>b</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->`
 		);
@@ -1296,7 +1296,7 @@ test.describe( 'List (@firefox)', () => {
 		await page.getByPlaceholder( 'Start writing with text or HTML' )
 			.fill( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 
@@ -1306,7 +1306,7 @@ test.describe( 'List (@firefox)', () => {
 		// Verify no WSOD and content is proper.
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );
@@ -1327,17 +1327,17 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">b</li>
+<li>b</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 
@@ -1346,15 +1346,15 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">a</li>
+<li>a</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">b</li>
+<li>b</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">c</li>
+<li>c</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );
@@ -1369,7 +1369,7 @@ test.describe( 'List (@firefox)', () => {
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"></li>
+<li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
@@ -1410,11 +1410,11 @@ test.describe( 'List (@firefox)', () => {
 
 		expect( await editor.getEditedPostContent() ).toBe( `<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">2</li>
+<li>2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );
 	} );
diff --git a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
index 59bcba07275ecd..291f280e2f697e 100644
--- a/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
+++ b/test/integration/__snapshots__/blocks-raw-handling.test.js.snap
@@ -136,7 +136,7 @@ exports[`rawHandler should convert HTML post to blocks with minimal content chan
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Item</li>
+<li>Item</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
@@ -178,9 +178,9 @@ exports[`rawHandler should convert a caption shortcode with link 1`] = `
 exports[`rawHandler should convert a list with attributes 1`] = `
 "<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
 <ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
+<li>1<!-- wp:list {"ordered":true,"type":"lower-roman","start":2,"reversed":true} -->
 <ol reversed start="2" style="list-style-type:lower-roman" class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">1</li>
+<li>1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ol>
diff --git a/test/integration/blocks-raw-handling.test.js b/test/integration/blocks-raw-handling.test.js
index 810bcc0ef34012..ac571f2bf4243d 100644
--- a/test/integration/blocks-raw-handling.test.js
+++ b/test/integration/blocks-raw-handling.test.js
@@ -178,15 +178,15 @@ describe( 'Blocks raw handling', () => {
 
 		expect( filtered ).toMatchInlineSnapshot( `
 		"<ul class="wp-block-list"><!-- wp:list-item -->
-		<li class="wp-block-list-item">one</li>
+		<li>one</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">two</li>
+		<li>two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">three</li>
+		<li>three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
@@ -203,15 +203,15 @@ describe( 'Blocks raw handling', () => {
 
 		expect( filtered ).toMatchInlineSnapshot( `
 		"<ul class="wp-block-list"><!-- wp:list-item -->
-		<li class="wp-block-list-item">one</li>
+		<li>one</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">two</li>
+		<li>two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">three</li>
+		<li>three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
@@ -319,15 +319,15 @@ describe( 'Blocks raw handling', () => {
 
 		expect( filtered ).toMatchInlineSnapshot( `
 		"<ul class="wp-block-list"><!-- wp:list-item -->
-		<li class="wp-block-list-item">One</li>
+		<li>One</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">Two</li>
+		<li>Two</li>
 		<!-- /wp:list-item -->
 
 		<!-- wp:list-item -->
-		<li class="wp-block-list-item">Three</li>
+		<li>Three</li>
 		<!-- /wp:list-item --></ul>"
 	` );
 		expect( console ).toHaveLogged();
diff --git a/test/integration/fixtures/blocks/core__list-item.html b/test/integration/fixtures/blocks/core__list-item.html
index 8eb9e4d57a9163..abeec57ef91988 100644
--- a/test/integration/fixtures/blocks/core__list-item.html
+++ b/test/integration/fixtures/blocks/core__list-item.html
@@ -1,3 +1,3 @@
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Text &amp; Headings</li>
+<li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item.parsed.json b/test/integration/fixtures/blocks/core__list-item.parsed.json
index 0fff75693189be..29966c6490c59d 100644
--- a/test/integration/fixtures/blocks/core__list-item.parsed.json
+++ b/test/integration/fixtures/blocks/core__list-item.parsed.json
@@ -3,9 +3,7 @@
 		"blockName": "core/list-item",
 		"attrs": {},
 		"innerBlocks": [],
-		"innerHTML": "\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n",
-		"innerContent": [
-			"\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n"
-		]
+		"innerHTML": "\n<li>Text &amp; Headings</li>\n",
+		"innerContent": [ "\n<li>Text &amp; Headings</li>\n" ]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__list-item.serialized.html b/test/integration/fixtures/blocks/core__list-item.serialized.html
index 8eb9e4d57a9163..abeec57ef91988 100644
--- a/test/integration/fixtures/blocks/core__list-item.serialized.html
+++ b/test/integration/fixtures/blocks/core__list-item.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Text &amp; Headings</li>
+<li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
deleted file mode 100644
index ab37d5ca5c6b60..00000000000000
--- a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:list-item -->
-<li>Text</li>
-<!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
deleted file mode 100644
index 1a3ec89bddd541..00000000000000
--- a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-	{
-		"name": "core/list-item",
-		"isValid": true,
-		"attributes": {
-			"content": "Text"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
deleted file mode 100644
index cbd204b60a1c2a..00000000000000
--- a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.parsed.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-	{
-		"blockName": "core/list-item",
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n<li>Text</li>\n",
-		"innerContent": [
-			"\n<li>Text</li>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html
deleted file mode 100644
index 8cc90706933a09..00000000000000
--- a/test/integration/fixtures/blocks/core__list-item_deprecated-v1.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:list-item -->
-<li class="wp-block-list-item">Text</li>
-<!-- /wp:list-item -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
index eda1daa690bcf7..ad0919beb9bde4 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v0.serialized.html
@@ -1,13 +1,13 @@
 <!-- wp:list {"fontFamily":"cambria-georgia"} -->
 <ul class="wp-block-list has-cambria-georgia-font-family"><!-- wp:list-item -->
-<li class="wp-block-list-item">one</li>
+<li>one</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">two</li>
+<li>two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">three</li>
+<li>three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
index be1d0f220331ab..39a3efa2eabed8 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1-nested.serialized.html
@@ -1,26 +1,26 @@
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<li><strong>Item</strong><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<li><strong>Item</strong><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<li><strong>Item</strong><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item"><strong>Item</strong><!-- wp:list -->
+<li><strong>Item</strong><!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item"><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
+<li><a rel="noreferrer noopener" href="#" target="_blank">Item</a></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item --></ul>
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
index 81b32227abecc8..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v1.serialized.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Text &amp; Headings</li>
+<li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Images &amp; Videos</li>
+<li>Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Galleries</li>
+<li>Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
+<li>And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json b/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
index f8c9354e9f44e6..7ddda9e08da5ab 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v2.parsed.json
@@ -11,16 +11,10 @@
 				"attrs": {},
 				"innerBlocks": [],
 				"innerHTML": "\n\t<li>Item 1</li>\n\t",
-				"innerContent": [
-					"\n\t<li>Item 1</li>\n\t"
-				]
+				"innerContent": [ "\n\t<li>Item 1</li>\n\t" ]
 			}
 		],
 		"innerHTML": "\n<ol type=\"A\">\n\t\n</ol>\n",
-		"innerContent": [
-			"\n<ol type=\"A\">\n\t",
-			null,
-			"\n</ol>\n"
-		]
+		"innerContent": [ "\n<ol type=\"A\">\n\t", null, "\n</ol>\n" ]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
index f7906a4ed961bd..6fdf3ad84feeb9 100644
--- a/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v2.serialized.html
@@ -1,5 +1,5 @@
 <!-- wp:list {"ordered":true,"type":"upper-alpha"} -->
 <ol style="list-style-type:upper-alpha" class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Item 1</li>
+<li>Item 1</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__ul.html b/test/integration/fixtures/blocks/core__list__ul.html
index 81b32227abecc8..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__ul.html
+++ b/test/integration/fixtures/blocks/core__list__ul.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Text &amp; Headings</li>
+<li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Images &amp; Videos</li>
+<li>Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Galleries</li>
+<li>Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
+<li>And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/blocks/core__list__ul.parsed.json b/test/integration/fixtures/blocks/core__list__ul.parsed.json
index 1f11425b02d03f..4639b007c777b7 100644
--- a/test/integration/fixtures/blocks/core__list__ul.parsed.json
+++ b/test/integration/fixtures/blocks/core__list__ul.parsed.json
@@ -7,54 +7,48 @@
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n",
-				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">Text &amp; Headings</li>\n"
-				]
+				"innerHTML": "\n<li>Text &amp; Headings</li>\n",
+				"innerContent": [ "\n<li>Text &amp; Headings</li>\n" ]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">Images &amp; Videos</li>\n",
-				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">Images &amp; Videos</li>\n"
-				]
+				"innerHTML": "\n<li>Images &amp; Videos</li>\n",
+				"innerContent": [ "\n<li>Images &amp; Videos</li>\n" ]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">Galleries</li>\n",
-				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">Galleries</li>\n"
-				]
+				"innerHTML": "\n<li>Galleries</li>\n",
+				"innerContent": [ "\n<li>Galleries</li>\n" ]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n",
+				"innerHTML": "\n<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n",
 				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n"
+					"\n<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>\n"
 				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n",
+				"innerHTML": "\n<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n",
 				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n"
+					"\n<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>\n"
 				]
 			},
 			{
 				"blockName": "core/list-item",
 				"attrs": {},
 				"innerBlocks": [],
-				"innerHTML": "\n<li class=\"wp-block-list-item\">And <em>Lists</em> like this one of course :)</li>\n",
+				"innerHTML": "\n<li>And <em>Lists</em> like this one of course :)</li>\n",
 				"innerContent": [
-					"\n<li class=\"wp-block-list-item\">And <em>Lists</em> like this one of course :)</li>\n"
+					"\n<li>And <em>Lists</em> like this one of course :)</li>\n"
 				]
 			}
 		],
diff --git a/test/integration/fixtures/blocks/core__list__ul.serialized.html b/test/integration/fixtures/blocks/core__list__ul.serialized.html
index 81b32227abecc8..4d74394771fcb5 100644
--- a/test/integration/fixtures/blocks/core__list__ul.serialized.html
+++ b/test/integration/fixtures/blocks/core__list__ul.serialized.html
@@ -1,25 +1,25 @@
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Text &amp; Headings</li>
+<li>Text &amp; Headings</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Images &amp; Videos</li>
+<li>Images &amp; Videos</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Galleries</li>
+<li>Galleries</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">And <em>Lists</em> like this one of course :)</li>
+<li>And <em>Lists</em> like this one of course :)</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
diff --git a/test/integration/fixtures/documents/apple-out.html b/test/integration/fixtures/documents/apple-out.html
index 23c300f562db8b..9fe4c1b1bbcf32 100644
--- a/test/integration/fixtures/documents/apple-out.html
+++ b/test/integration/fixtures/documents/apple-out.html
@@ -12,33 +12,33 @@
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A</li>
+<li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<li>Bulleted<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/evernote-out.html b/test/integration/fixtures/documents/evernote-out.html
index 9ecb4f8a566aa6..e58a205bd7787d 100644
--- a/test/integration/fixtures/documents/evernote-out.html
+++ b/test/integration/fixtures/documents/evernote-out.html
@@ -8,37 +8,37 @@
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">An</li>
+<li>An</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Unordered<!-- wp:list -->
+<li>Unordered<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
 <ol start="1" class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two<!-- wp:list {"ordered":true} -->
+<li>Two<!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/google-docs-list-only-out.html b/test/integration/fixtures/documents/google-docs-list-only-out.html
index fa60c750496888..ec14d44d2b9224 100644
--- a/test/integration/fixtures/documents/google-docs-list-only-out.html
+++ b/test/integration/fixtures/documents/google-docs-list-only-out.html
@@ -1,21 +1,21 @@
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">My first list item<!-- wp:list -->
+<li>My first list item<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A sub list item</li>
+<li>A sub list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">A second sub list item</li>
+<li>A second sub list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">My second list item</li>
+<li>My second list item</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">My third list item</li>
+<li>My third list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
\ No newline at end of file
diff --git a/test/integration/fixtures/documents/google-docs-out.html b/test/integration/fixtures/documents/google-docs-out.html
index 9c8f6d335d606a..e00e9d922c1bab 100644
--- a/test/integration/fixtures/documents/google-docs-out.html
+++ b/test/integration/fixtures/documents/google-docs-out.html
@@ -12,33 +12,33 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A</li>
+<li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<li>Bulleted<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/google-docs-with-comments-out.html b/test/integration/fixtures/documents/google-docs-with-comments-out.html
index 9c8f6d335d606a..e00e9d922c1bab 100644
--- a/test/integration/fixtures/documents/google-docs-with-comments-out.html
+++ b/test/integration/fixtures/documents/google-docs-with-comments-out.html
@@ -12,33 +12,33 @@ <h2 class="wp-block-heading">This is a <em>heading</em></h2>
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A</li>
+<li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<li>Bulleted<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/markdown-out.html b/test/integration/fixtures/documents/markdown-out.html
index 8a7542b7f8b7fd..958f4a9d764e42 100644
--- a/test/integration/fixtures/documents/markdown-out.html
+++ b/test/integration/fixtures/documents/markdown-out.html
@@ -16,33 +16,33 @@ <h2 class="wp-block-heading">Lists</h2>
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A</li>
+<li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<li>Bulleted<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-list-out.html b/test/integration/fixtures/documents/ms-word-list-out.html
index 10388ac4f848d2..2e55413b159a6a 100644
--- a/test/integration/fixtures/documents/ms-word-list-out.html
+++ b/test/integration/fixtures/documents/ms-word-list-out.html
@@ -8,15 +8,15 @@ <h3 class="wp-block-heading"><a>This is a headline?</a></h3>
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-online-out.html b/test/integration/fixtures/documents/ms-word-online-out.html
index 66a20db9825c36..7ee5bf7b83e7d0 100644
--- a/test/integration/fixtures/documents/ms-word-online-out.html
+++ b/test/integration/fixtures/documents/ms-word-online-out.html
@@ -8,33 +8,33 @@
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A&nbsp;</li>
+<li>A&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted&nbsp;</li>
+<li>Bulleted&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Indented&nbsp;</li>
+<li>Indented&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List&nbsp;</li>
+<li>List&nbsp;</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true,"start":1} -->
 <ol start="1" class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One&nbsp;</li>
+<li>One&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two&nbsp;</li>
+<li>Two&nbsp;</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three&nbsp;</li>
+<li>Three&nbsp;</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 
diff --git a/test/integration/fixtures/documents/ms-word-out.html b/test/integration/fixtures/documents/ms-word-out.html
index 02d092ce6f7a72..0b37d15db9577f 100644
--- a/test/integration/fixtures/documents/ms-word-out.html
+++ b/test/integration/fixtures/documents/ms-word-out.html
@@ -20,33 +20,33 @@ <h2 class="wp-block-heading">This is a heading level 2</h2>
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">A</li>
+<li>A</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Bulleted<!-- wp:list -->
+<li>Bulleted<!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">Indented</li>
+<li>Indented</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">List</li>
+<li>List</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
 
 <!-- wp:list {"ordered":true} -->
 <ol class="wp-block-list"><!-- wp:list-item -->
-<li class="wp-block-list-item">One</li>
+<li>One</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Two</li>
+<li>Two</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
-<li class="wp-block-list-item">Three</li>
+<li>Three</li>
 <!-- /wp:list-item --></ol>
 <!-- /wp:list -->
 

From 9f7b68f84c01c090d148a66fa6d19764c07bd95f Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 08:11:08 +0100
Subject: [PATCH 06/16] Remove the experimental selector from block.json

---
 packages/block-library/src/list/block.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index c2847db5d8c500..b0dab438e9e1aa 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -68,7 +68,6 @@
 			}
 		},
 		"__unstablePasteTextInline": true,
-		"__experimentalSelector": "ol,ul",
 		"__experimentalOnMerge": true,
 		"__experimentalSlashInserter": true
 	},

From eb6341c83eda8e96767a84bbcd0c17a95cdf5063 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 08:36:16 +0100
Subject: [PATCH 07/16] Add fixture for deprecation v3

---
 .../core__list__deprecated-v3-css-class.html  |  3 +
 .../core__list__deprecated-v3-css-class.json  | 60 +++++++++++++++++++
 ..._list__deprecated-v3-css-class.parsed.json | 11 ++++
 ...t__deprecated-v3-css-class.serialized.html | 25 ++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html
 create mode 100644 test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json
 create mode 100644 test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html

diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html
new file mode 100644
index 00000000000000..aef6bf669f2c98
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.html
@@ -0,0 +1,3 @@
+<!-- wp:core/list -->
+<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>
+<!-- /wp:core/list -->
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json
new file mode 100644
index 00000000000000..80cd87e4eb69e8
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.json
@@ -0,0 +1,60 @@
+[
+	{
+		"name": "core/list",
+		"isValid": true,
+		"attributes": {
+			"ordered": false,
+			"values": ""
+		},
+		"innerBlocks": [
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Text &amp; Headings"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Images &amp; Videos"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Galleries"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Embeds, like YouTube, Tweets, or other WordPress posts."
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "Layout blocks, like Buttons, Hero Images, Separators, etc."
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/list-item",
+				"isValid": true,
+				"attributes": {
+					"content": "And <em>Lists</em> like this one of course :)"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json
new file mode 100644
index 00000000000000..427f4c3a975cfd
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.parsed.json
@@ -0,0 +1,11 @@
+[
+	{
+		"blockName": "core/list",
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n",
+		"innerContent": [
+			"\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html
new file mode 100644
index 00000000000000..4d74394771fcb5
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__list__deprecated-v3-css-class.serialized.html
@@ -0,0 +1,25 @@
+<!-- wp:list -->
+<ul class="wp-block-list"><!-- wp:list-item -->
+<li>Text &amp; Headings</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Images &amp; Videos</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Galleries</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Embeds, like YouTube, Tweets, or other WordPress posts.</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li>
+<!-- /wp:list-item -->
+
+<!-- wp:list-item -->
+<li>And <em>Lists</em> like this one of course :)</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->

From b1d4d0d703a09e336652c94c9606709e09b5c7b4 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 08:46:46 +0100
Subject: [PATCH 08/16] Update list class names in test files

---
 test/e2e/specs/editor/blocks/list.spec.js                       | 2 +-
 ...y-cut-paste-should-paste-preformatted-in-list-1-chromium.txt | 2 +-
 test/e2e/specs/editor/various/writing-flow.spec.js              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/e2e/specs/editor/blocks/list.spec.js b/test/e2e/specs/editor/blocks/list.spec.js
index 06bbc0bdf618b0..8e10145f72fbc2 100644
--- a/test/e2e/specs/editor/blocks/list.spec.js
+++ b/test/e2e/specs/editor/blocks/list.spec.js
@@ -1237,7 +1237,7 @@ test.describe( 'List (@firefox)', () => {
 
 		await expect.poll( editor.getEditedPostContent ).toBe(
 			`<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>1</li>
 <!-- /wp:list-item -->
 
diff --git a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
index 002e7a19200283..d46df0dfb55d44 100644
--- a/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
+++ b/test/e2e/specs/editor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
@@ -1,5 +1,5 @@
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>xy</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->
\ No newline at end of file
diff --git a/test/e2e/specs/editor/various/writing-flow.spec.js b/test/e2e/specs/editor/various/writing-flow.spec.js
index a248915a21fcba..dff7fb978949f6 100644
--- a/test/e2e/specs/editor/various/writing-flow.spec.js
+++ b/test/e2e/specs/editor/various/writing-flow.spec.js
@@ -356,7 +356,7 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
 		await page.keyboard.type( 'a' );
 		await page.keyboard.press( 'Backspace' );
 		await expect.poll( editor.getEditedPostContent ).toBe( `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->` );

From a205584b409428b86826ba6f42fe98ea5680e94c Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 09:38:29 +0100
Subject: [PATCH 09/16] Update list class names in native test files

---
 .../__snapshots__/transforms.native.js.snap   |  2 +-
 .../test/__snapshots__/edit.native.js.snap    | 22 ++++-----
 .../__snapshots__/transforms.native.js.snap   |  6 +--
 .../src/list/test/edit.native.js              | 48 +++++++++----------
 .../src/list/test/transforms.native.js        |  2 +-
 .../__snapshots__/transforms.native.js.snap   |  2 +-
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
index 4f6512b3f86625..c773f863077715 100644
--- a/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/heading/test/__snapshots__/transforms.native.js.snap
@@ -20,7 +20,7 @@ exports[`Heading block transforms to Group block 1`] = `
 
 exports[`Heading block transforms to List block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Example text</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
diff --git a/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
index 1bc5cf6ce937f8..058ccc6b9ca635 100644
--- a/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/list/test/__snapshots__/edit.native.js.snap
@@ -2,7 +2,7 @@
 
 exports[`List block adds one item to the list 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First list item</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
@@ -10,9 +10,9 @@ exports[`List block adds one item to the list 1`] = `
 
 exports[`List block changes the indentation level 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 2</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list --></li>
@@ -22,7 +22,7 @@ exports[`List block changes the indentation level 1`] = `
 
 exports[`List block changes to ordered list 1`] = `
 "<!-- wp:list {"ordered":true} -->
-<ol><!-- wp:list-item -->
+<ol class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -38,7 +38,7 @@ exports[`List block changes to ordered list 1`] = `
 
 exports[`List block changes to reverse ordered list 1`] = `
 "<!-- wp:list {"ordered":true,"reversed":true} -->
-<ol reversed><!-- wp:list-item -->
+<ol reversed class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -54,7 +54,7 @@ exports[`List block changes to reverse ordered list 1`] = `
 
 exports[`List block inserts block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li></li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"
@@ -62,7 +62,7 @@ exports[`List block inserts block 1`] = `
 
 exports[`List block removes the indentation level 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -74,7 +74,7 @@ exports[`List block removes the indentation level 1`] = `
 
 exports[`List block sets a start value to an ordered list 1`] = `
 "<!-- wp:list {"ordered":true,"start":25} -->
-<ol start="25"><!-- wp:list-item -->
+<ol start="25" class="wp-block-list"><!-- wp:list-item -->
 <li>Item 1</li>
 <!-- /wp:list-item -->
 
@@ -90,19 +90,19 @@ exports[`List block sets a start value to an ordered list 1`] = `
 
 exports[`List block shows different indentation levels 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>List item 1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>List item 2<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>List item nested 1</li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
 <li>List item nested 2<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Extra item 1</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
index 723d19a658366f..9e28f1c77de943 100644
--- a/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/list/test/__snapshots__/transforms.native.js.snap
@@ -4,7 +4,7 @@ exports[`List block transforms to Columns block 1`] = `
 "<!-- wp:columns -->
 <div class="wp-block-columns"><!-- wp:column {"width":"100%"} -->
 <div class="wp-block-column" style="flex-basis:100%"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
@@ -23,7 +23,7 @@ exports[`List block transforms to Columns block 1`] = `
 exports[`List block transforms to Group block 1`] = `
 "<!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
@@ -69,7 +69,7 @@ exports[`List block transforms to Paragraph block 1`] = `
 exports[`List block transforms to Quote block 1`] = `
 "<!-- wp:quote -->
 <blockquote class="wp-block-quote"><!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/edit.native.js b/packages/block-library/src/list/test/edit.native.js
index 1f7296db98c8c3..a33bce32e5bca0 100644
--- a/packages/block-library/src/list/test/edit.native.js
+++ b/packages/block-library/src/list/test/edit.native.js
@@ -60,7 +60,7 @@ describe( 'List block', () => {
 
 	it( 'adds one item to the list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li></li><!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
 
@@ -88,17 +88,17 @@ describe( 'List block', () => {
 
 	it( 'shows different indentation levels', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>List item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>List item 2<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>List item nested 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>List item nested 2<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Extra item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -140,7 +140,7 @@ describe( 'List block', () => {
 
 	it( 'changes the indentation level', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -183,9 +183,9 @@ describe( 'List block', () => {
 
 	it( 'removes the indentation level', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 2</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list --></li>
@@ -230,7 +230,7 @@ describe( 'List block', () => {
 
 	it( 'changes to ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -258,7 +258,7 @@ describe( 'List block', () => {
 
 	it( 'changes to reverse ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -299,7 +299,7 @@ describe( 'List block', () => {
 
 	it( 'sets a start value to an ordered list', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Item 1</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -342,7 +342,7 @@ describe( 'List block', () => {
 	it( 'splits empty list items into paragraphs', async () => {
 		// Arrange
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li><!-- /wp:list-item -->
 		<!-- wp:list-item -->
 		<li>Two</li><!-- /wp:list-item --></ul>
@@ -370,7 +370,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->
@@ -380,7 +380,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->"
@@ -389,7 +389,7 @@ describe( 'List block', () => {
 
 	it( 'merges paragraphs into list items', async () => {
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->
@@ -399,7 +399,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Three</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -417,7 +417,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -435,7 +435,7 @@ describe( 'List block', () => {
 	it( 'merges lists into lists', async () => {
 		// Arrange
 		const initialHtml = `<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -445,7 +445,7 @@ describe( 'List block', () => {
 		<!-- /wp:list -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Three</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -466,7 +466,7 @@ describe( 'List block', () => {
 		// Assert
 		expect( getEditorHtml() ).toMatchInlineSnapshot( `
 		"<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 
@@ -486,7 +486,7 @@ describe( 'List block', () => {
 		<p>A quick brown fox.</p>
 		<!-- /wp:paragraph -->
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li><!-- /wp:list-item --><!-- wp:list-item -->
 		<li>Two</li><!-- /wp:list-item --></ul>
 		<!-- /wp:list -->`;
@@ -527,7 +527,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item --></ul>
 		<!-- /wp:list -->"
@@ -539,9 +539,9 @@ describe( 'List block', () => {
 		<p>A quick brown fox.</p>
 		<!-- /wp:paragraph -->
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item -->
 		<!-- wp:list-item -->
@@ -591,7 +591,7 @@ describe( 'List block', () => {
 		<!-- /wp:paragraph -->
 
 		<!-- wp:list -->
-		<ul><!-- wp:list-item -->
+		<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>Two</li>
 		<!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/list/test/transforms.native.js b/packages/block-library/src/list/test/transforms.native.js
index dd8ec5ccd2c772..538d5b7ed0193e 100644
--- a/packages/block-library/src/list/test/transforms.native.js
+++ b/packages/block-library/src/list/test/transforms.native.js
@@ -12,7 +12,7 @@ import {
 const block = 'List';
 const initialHtml = `
 <!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>First Item</li>
 <!-- /wp:list-item -->
 
diff --git a/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap b/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
index b0855c02bd0e96..3a2a928b81f5e8 100644
--- a/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
+++ b/packages/block-library/src/paragraph/test/__snapshots__/transforms.native.js.snap
@@ -32,7 +32,7 @@ exports[`Paragraph block transforms to Heading block 1`] = `
 
 exports[`Paragraph block transforms to List block 1`] = `
 "<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>Example text</li>
 <!-- /wp:list-item --></ul>
 <!-- /wp:list -->"

From ba7bb784c50a31c2115edf6b15045d5ff1a502b7 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Mon, 27 Nov 2023 12:19:30 +0100
Subject: [PATCH 10/16] change experimentalSelector for the list-item block

---
 packages/block-library/src/list-item/block.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/list-item/block.json b/packages/block-library/src/list-item/block.json
index 41221f1c31772e..d562ef113ea0e7 100644
--- a/packages/block-library/src/list-item/block.json
+++ b/packages/block-library/src/list-item/block.json
@@ -21,7 +21,7 @@
 	},
 	"supports": {
 		"className": false,
-		"__experimentalSelector": "li",
+		"__experimentalSelector": ".wp-block-list > li",
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,

From a44b0da35bcc186164a051d4162dc30ea163e37e Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Tue, 2 Jan 2024 10:50:08 +0100
Subject: [PATCH 11/16] Try to fix spacing CS issues in test fixture

---
 test/integration/fixtures/documents/ms-word-online-out.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/fixtures/documents/ms-word-online-out.html b/test/integration/fixtures/documents/ms-word-online-out.html
index e571ca784660a2..98cc96fce609b7 100644
--- a/test/integration/fixtures/documents/ms-word-online-out.html
+++ b/test/integration/fixtures/documents/ms-word-online-out.html
@@ -8,7 +8,7 @@
 
 <!-- wp:list -->
 <ul class="wp-block-list"><!-- wp:list-item -->
-<li>A </li>
+<li>A </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->
@@ -26,7 +26,7 @@
 
 <!-- wp:list {"ordered":true,"start":1} -->
 <ol start="1" class="wp-block-list"><!-- wp:list-item -->
-<li>One </li>
+<li>One </li>
 <!-- /wp:list-item -->
 
 <!-- wp:list-item -->

From 20fd490a6835874f02622a7335ef6e2730af98a4 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Tue, 2 Jan 2024 12:14:37 +0100
Subject: [PATCH 12/16] Update blocks-raw-handling.native.js

---
 test/native/integration/blocks-raw-handling.native.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/native/integration/blocks-raw-handling.native.js b/test/native/integration/blocks-raw-handling.native.js
index 5f21ca035fbf9d..6fae0e72be0cac 100644
--- a/test/native/integration/blocks-raw-handling.native.js
+++ b/test/native/integration/blocks-raw-handling.native.js
@@ -187,7 +187,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -212,7 +212,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>one</li>
 		<!-- /wp:list-item -->
 
@@ -309,7 +309,7 @@ describe( 'Blocks raw handling', () => {
 
 	it( 'should treat single list item as inline text', () => {
 		const filtered = pasteHandler( {
-			HTML: '<ul><li>Some <strong>bold</strong> text.</li></ul>',
+			HTML: '<ul class="wp-block-list"><li>Some <strong>bold</strong> text.</li></ul>',
 			plainText: 'Some <strong>bold</strong> text.\n',
 			mode: 'AUTO',
 		} );
@@ -320,7 +320,7 @@ describe( 'Blocks raw handling', () => {
 
 	it( 'should treat multiple list items as a block', () => {
 		const filtered = pasteHandler( {
-			HTML: '<ul><li>One</li><li>Two</li><li>Three</li></ul>',
+			HTML: '<ul class="wp-block-list"><li>One</li><li>Two</li><li>Three</li></ul>',
 			plainText: 'One\nTwo\nThree\n',
 			mode: 'AUTO',
 		} )
@@ -328,7 +328,7 @@ describe( 'Blocks raw handling', () => {
 			.join( '' );
 
 		expect( filtered ).toMatchInlineSnapshot( `
-		"<ul><!-- wp:list-item -->
+		"<ul class="wp-block-list"><!-- wp:list-item -->
 		<li>One</li>
 		<!-- /wp:list-item -->
 

From c2c5a9417fa7e2fe1f73f65555f19afbe16199da Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Tue, 27 Feb 2024 17:33:55 +0100
Subject: [PATCH 13/16] Update core-blocks.md

---
 docs/reference-guides/core-blocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 0d14e07a74142e..c35e3a674e563d 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -405,7 +405,7 @@ Create a bulleted or numbered list. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/list
 -	**Category:** text
--	**Supports:** __unstablePasteTextInline, anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
+-	**Supports:** __unstablePasteTextInline, anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** ordered, placeholder, reversed, start, type, values
 
 ## List item

From a126c43b3bce1c41778d0943a2427467a91b6369 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Fri, 12 Apr 2024 15:47:11 +0200
Subject: [PATCH 14/16] Remove index.php from the list block

---
 docs/reference-guides/core-blocks.md       |  2 +-
 lib/blocks.php                             |  2 +-
 packages/block-library/src/list/block.json |  1 -
 packages/block-library/src/list/index.php  | 49 ----------------------
 4 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 packages/block-library/src/list/index.php

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 6ed0da925fe1f2..f81c1a7a1d3eaa 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -415,7 +415,7 @@ Create a bulleted or numbered list. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/list
 -	**Category:** text
 -	**Allowed Blocks:** core/list-item
--	**Supports:** __unstablePasteTextInline, anchor, className, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** __unstablePasteTextInline, anchor, color (background, gradients, link, text), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** ordered, placeholder, reversed, start, type, values
 
 ## List item
diff --git a/lib/blocks.php b/lib/blocks.php
index 679219cc6ff774..eed9142db436a0 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -26,6 +26,7 @@ function gutenberg_reregister_core_block_types() {
 				'form-submit-button',
 				'group',
 				'html',
+				'list',
 				'list-item',
 				'missing',
 				'more',
@@ -75,7 +76,6 @@ function gutenberg_reregister_core_block_types() {
 				'heading.php'                      => 'core/heading',
 				'latest-comments.php'              => 'core/latest-comments',
 				'latest-posts.php'                 => 'core/latest-posts',
-				'list.php'                         => 'core/list',
 				'loginout.php'                     => 'core/loginout',
 				'media-text.php'                   => 'core/media-text',
 				'navigation.php'                   => 'core/navigation',
diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json
index 28eedd07975b54..157aaf7c0cf633 100644
--- a/packages/block-library/src/list/block.json
+++ b/packages/block-library/src/list/block.json
@@ -39,7 +39,6 @@
 	"supports": {
 		"anchor": true,
 		"html": false,
-		"className": true,
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/packages/block-library/src/list/index.php b/packages/block-library/src/list/index.php
deleted file mode 100644
index 931a6e9550e5cd..00000000000000
--- a/packages/block-library/src/list/index.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Adds the wp-block-list class to the rendered list block.
- *
- * @package WordPress
- */
-
-/**
- * Adds a wp-block-list class to the list block.
- * For example, <ol> would be transformed to <ol class="wp-block-list">.
- *
- * @see https://github.com/WordPress/gutenberg/issues/12420
- *
- * @param array  $attributes Attributes of the block being rendered.
- * @param string $content Content of the block being rendered.
- *
- * @return string The content of the block being rendered.
- */
-function block_core_list_render( $attributes, $content ) {
-	if ( ! $content ) {
-		return $content;
-	}
-
-	$processor = new WP_HTML_Tag_Processor( $content );
-
-	$list_tags = array( 'OL', 'UL' );
-	while ( $processor->next_tag() ) {
-		if ( in_array( $processor->get_tag(), $list_tags, true ) ) {
-			$processor->add_class( 'wp-block-list' );
-			break;
-		}
-	}
-
-	return $processor->get_updated_html();
-}
-
-/**
- * Registers the `core/list` block on server.
- */
-function register_block_core_list() {
-	register_block_type_from_metadata(
-		__DIR__ . '/list',
-		array(
-			'render_callback' => 'block_core_list_render',
-		)
-	);
-}
-
-add_action( 'init', 'register_block_core_list' );

From 18684f10578a62be08bbbc469fa2f39790469c46 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Fri, 19 Apr 2024 10:28:20 +0200
Subject: [PATCH 15/16] e2e Specs: Add the block class name to the markup in
 list.spec.js.

---
 test/e2e/specs/editor/blocks/list.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/blocks/list.spec.js b/test/e2e/specs/editor/blocks/list.spec.js
index 5858b3b66ef8f6..7c42ad7989aff9 100644
--- a/test/e2e/specs/editor/blocks/list.spec.js
+++ b/test/e2e/specs/editor/blocks/list.spec.js
@@ -24,7 +24,7 @@ test.describe( 'List (@firefox)', () => {
 		await pageUtils.pressKeys( 'primary+v' );
 
 		const copied = `<!-- wp:list -->
-<ul><!-- wp:list-item -->
+<ul class="wp-block-list"><!-- wp:list-item -->
 <li>one</li>
 <!-- /wp:list-item -->
 

From a242f0a54cf887c7d678a5585ac13b8916ad1943 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Wed, 8 May 2024 06:52:37 +0200
Subject: [PATCH 16/16] Re-add the index.php file.

---
 lib/blocks.php                            |  2 +-
 packages/block-library/src/list/index.php | 54 +++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 packages/block-library/src/list/index.php

diff --git a/lib/blocks.php b/lib/blocks.php
index eed9142db436a0..679219cc6ff774 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -26,7 +26,6 @@ function gutenberg_reregister_core_block_types() {
 				'form-submit-button',
 				'group',
 				'html',
-				'list',
 				'list-item',
 				'missing',
 				'more',
@@ -76,6 +75,7 @@ function gutenberg_reregister_core_block_types() {
 				'heading.php'                      => 'core/heading',
 				'latest-comments.php'              => 'core/latest-comments',
 				'latest-posts.php'                 => 'core/latest-posts',
+				'list.php'                         => 'core/list',
 				'loginout.php'                     => 'core/loginout',
 				'media-text.php'                   => 'core/media-text',
 				'navigation.php'                   => 'core/navigation',
diff --git a/packages/block-library/src/list/index.php b/packages/block-library/src/list/index.php
new file mode 100644
index 00000000000000..1bffd813248575
--- /dev/null
+++ b/packages/block-library/src/list/index.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Adds the wp-block-list class to the rendered list block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Adds the wp-block-list class to the rendered list block.
+ * Ensures that pre-existing list blocks use the class name on the front.
+ * For example, <ol> is transformed to <ol class="wp-block-list">.
+ *
+ * @since 6.6.0
+ *
+ * @see https://github.com/WordPress/gutenberg/issues/12420
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_list_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$processor = new WP_HTML_Tag_Processor( $content );
+
+	$list_tags = array( 'OL', 'UL' );
+	while ( $processor->next_tag() ) {
+		if ( in_array( $processor->get_tag(), $list_tags, true ) ) {
+			$processor->add_class( 'wp-block-list' );
+			break;
+		}
+	}
+
+	return $processor->get_updated_html();
+}
+
+/**
+ * Registers the `core/list` block on server.
+ *
+ * @since 6.6.0
+ */
+function register_block_core_list() {
+	register_block_type_from_metadata(
+		__DIR__ . '/list',
+		array(
+			'render_callback' => 'block_core_list_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_list' );