648.0.before.diff

diff --git a/.nvmrc b/.nvmrc
index b009dfb9d9..c2f6421352 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-lts/*
+10.22.1
diff --git a/.travis.yml b/.travis.yml
index bd1980aab9..d99d9498cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,7 +80,7 @@ before_script:
   fi
 - npm --version
 - node --version
-- nvm install 10.13.0
+- nvm install
 - npm install -g grunt-cli
 - npm install
 - npm prune
diff --git a/package.json b/package.json
index 4f758ba25b..f5b3684900 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"engines": {
-		"node": "10.13.0",
-		"npm": "6.1.0"
+		"node": "10.22.1",
+		"npm": "6.14.8"
 	},
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

648.1.after.diff

Index: .nvmrc
===================================================================
--- .nvmrc	(revision 49280)
+++ .nvmrc	(working copy)
@@ -1 +1 @@
-lts/*
+10.22.1
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 49280)
+++ .travis.yml	(working copy)
@@ -80,7 +80,7 @@
   fi
 - npm --version
 - node --version
-- nvm install 10.13.0
+- nvm install
 - npm install -g grunt-cli
 - npm install
 - npm prune
Index: package-lock.json
===================================================================
--- package-lock.json	(revision 49280)
+++ package-lock.json	(working copy)
@@ -322,21 +322,21 @@
 			"integrity": "sha512-PAORaQ6nCYVYQskh7rEDmgKqKt/lKCnLJjDUIAAPtE6QdgXXeOz5IJsgC/fEZ/8w6aOz0yBramevxCJifVg3Bg==",
 			"requires": {
 				"@babel/runtime": "^7.3.1",
-				"@wordpress/autop": "^2.2.0",
-				"@wordpress/blob": "^2.3.0",
-				"@wordpress/block-editor": "^2.0.3",
-				"@wordpress/blocks": "^6.2.5",
-				"@wordpress/components": "^7.3.2",
-				"@wordpress/compose": "^3.2.0",
-				"@wordpress/core-data": "^2.2.2",
-				"@wordpress/data": "^4.4.0",
-				"@wordpress/deprecated": "^2.2.0",
-				"@wordpress/editor": "^9.2.6",
-				"@wordpress/element": "^2.3.0",
-				"@wordpress/html-entities": "^2.2.0",
-				"@wordpress/i18n": "^3.3.0",
-				"@wordpress/keycodes": "^2.2.0",
-				"@wordpress/viewport": "^2.3.0",
+				"@wordpress/autop": "file:https:/registry.npmjs.org/@wordpress/autop/-/autop-2.2.0.tgz",
+				"@wordpress/blob": "file:https:/registry.npmjs.org/@wordpress/blob/-/blob-2.3.0.tgz",
+				"@wordpress/block-editor": "file:https:/registry.npmjs.org/@wordpress/block-editor/-/block-editor-2.0.3.tgz",
+				"@wordpress/blocks": "file:https:/registry.npmjs.org/@wordpress/blocks/-/blocks-6.2.5.tgz",
+				"@wordpress/components": "file:https:/registry.npmjs.org/@wordpress/components/-/components-7.3.2.tgz",
+				"@wordpress/compose": "file:https:/registry.npmjs.org/@wordpress/compose/-/compose-3.2.0.tgz",
+				"@wordpress/core-data": "file:https:/registry.npmjs.org/@wordpress/core-data/-/core-data-2.2.2.tgz",
+				"@wordpress/data": "file:https:/registry.npmjs.org/@wordpress/data/-/data-4.4.0.tgz",
+				"@wordpress/deprecated": "file:https:/registry.npmjs.org/@wordpress/deprecated/-/deprecated-2.2.0.tgz",
+				"@wordpress/editor": "file:https:/registry.npmjs.org/@wordpress/editor/-/editor-9.2.6.tgz",
+				"@wordpress/element": "file:https:/registry.npmjs.org/@wordpress/element/-/element-2.3.0.tgz",
+				"@wordpress/html-entities": "file:https:/registry.npmjs.org/@wordpress/html-entities/-/html-entities-2.2.0.tgz",
+				"@wordpress/i18n": "file:https:/registry.npmjs.org/@wordpress/i18n/-/i18n-3.3.0.tgz",
+				"@wordpress/keycodes": "file:https:/registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.2.0.tgz",
+				"@wordpress/viewport": "file:https:/registry.npmjs.org/@wordpress/viewport/-/viewport-2.3.0.tgz",
 				"classnames": "^2.2.5",
 				"fast-average-color": "4.3.0",
 				"lodash": "^4.17.11",
@@ -516,25 +516,25 @@
 			"integrity": "sha512-1H7DuAD438FPTo+ETttaGuhBLcr3TQcTcxyZbfmhhT27HIgiGTfBa3cDN3zQFdhdyEf38EpP6rwu9yc1CKf3QA==",
 			"requires": {
 				"@babel/runtime": "^7.3.1",
-				"@wordpress/a11y": "^2.2.0",
-				"@wordpress/api-fetch": "^3.1.2",
-				"@wordpress/block-editor": "^2.0.3",
-				"@wordpress/block-library": "^2.4.6",
-				"@wordpress/blocks": "^6.2.5",
-				"@wordpress/components": "^7.3.2",
-				"@wordpress/compose": "^3.2.0",
-				"@wordpress/core-data": "^2.2.2",
-				"@wordpress/data": "^4.4.0",
-				"@wordpress/editor": "^9.2.6",
-				"@wordpress/element": "^2.3.0",
-				"@wordpress/format-library": "^1.4.6",
-				"@wordpress/hooks": "^2.2.0",
-				"@wordpress/i18n": "^3.3.0",
-				"@wordpress/keycodes": "^2.2.0",
-				"@wordpress/nux": "^3.2.5",
-				"@wordpress/plugins": "^2.2.0",
-				"@wordpress/url": "^2.5.0",
-				"@wordpress/viewport": "^2.3.0",
+				"@wordpress/a11y": "file:https:/registry.npmjs.org/@wordpress/a11y/-/a11y-2.2.0.tgz",
+				"@wordpress/api-fetch": "file:https:/registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-3.1.2.tgz",
+				"@wordpress/block-editor": "file:https:/registry.npmjs.org/@wordpress/block-editor/-/block-editor-2.0.3.tgz",
+				"@wordpress/block-library": "file:https:/registry.npmjs.org/@wordpress/block-library/-/block-library-2.4.7.tgz",
+				"@wordpress/blocks": "file:https:/registry.npmjs.org/@wordpress/blocks/-/blocks-6.2.5.tgz",
+				"@wordpress/components": "file:https:/registry.npmjs.org/@wordpress/components/-/components-7.3.2.tgz",
+				"@wordpress/compose": "file:https:/registry.npmjs.org/@wordpress/compose/-/compose-3.2.0.tgz",
+				"@wordpress/core-data": "file:https:/registry.npmjs.org/@wordpress/core-data/-/core-data-2.2.2.tgz",
+				"@wordpress/data": "file:https:/registry.npmjs.org/@wordpress/data/-/data-4.4.0.tgz",
+				"@wordpress/editor": "file:https:/registry.npmjs.org/@wordpress/editor/-/editor-9.2.6.tgz",
+				"@wordpress/element": "file:https:/registry.npmjs.org/@wordpress/element/-/element-2.3.0.tgz",
+				"@wordpress/format-library": "file:https:/registry.npmjs.org/@wordpress/format-library/-/format-library-1.4.6.tgz",
+				"@wordpress/hooks": "file:https:/registry.npmjs.org/@wordpress/hooks/-/hooks-2.2.0.tgz",
+				"@wordpress/i18n": "file:https:/registry.npmjs.org/@wordpress/i18n/-/i18n-3.3.0.tgz",
+				"@wordpress/keycodes": "file:https:/registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.2.0.tgz",
+				"@wordpress/nux": "file:https:/registry.npmjs.org/@wordpress/nux/-/nux-3.2.5.tgz",
+				"@wordpress/plugins": "file:https:/registry.npmjs.org/@wordpress/plugins/-/plugins-2.2.0.tgz",
+				"@wordpress/url": "file:https:/registry.npmjs.org/@wordpress/url/-/url-2.5.0.tgz",
+				"@wordpress/viewport": "file:https:/registry.npmjs.org/@wordpress/viewport/-/viewport-2.3.0.tgz",
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.11",
 				"refx": "^3.0.0"
Index: package.json
===================================================================
--- package.json	(revision 49280)
+++ package.json	(working copy)
@@ -7,8 +7,8 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"engines": {
-		"node": "10.13.0",
-		"npm": "6.1.0"
+		"node": "10.22.1",
+		"npm": "6.14.8"
 	},
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
Index: src/wp-includes/blocks/rss.php
===================================================================
--- src/wp-includes/blocks/rss.php	(revision 49280)
+++ src/wp-includes/blocks/rss.php	(working copy)
@@ -80,7 +80,7 @@
 	}
 
 	$classes           = 'grid' === $attributes['blockLayout'] ? ' is-grid columns-' . $attributes['columns'] : '';
-	$list_items_markup = sprintf( "<ul class='%s'>%s</ul>", esc_attr( 'wp-block-rss' . $classes ), $list_items );
+	$list_items_markup = sprintf( "<ul class='%s'>%s</ul>", esc_attr( $class ), $list_items );
 
 	// PHP 5.2 compatibility. See: http://simplepie.org/wiki/faq/i_m_getting_memory_leaks.
 	$rss->__destruct();
@@ -93,8 +93,7 @@
  * Registers the `core/rss` block on server.
  */
 function register_block_core_rss() {
-	register_block_type(
-		'core/rss',
+	register_block_type( 'core/rss',
 		array(
 			'attributes'      => array(
 				'columns'        => array(