Merge remote-tracking branch 'upstream/trunk' into build/restore-deleted-files-preserving-history

Also updated the `.gitignore` to reset the changes from 22294af

Author: dmsnell

.gitignore

@@ -20,8 +20,11 @@ wp-tests-config.php
 /node_modules
 /npm-debug.log
 /build
+/gutenberg
 /tests/phpunit/build
 /wp-cli.local.yml
+/phpstan.neon
+/*.tsbuildinfo
 /jsdoc
 /composer.lock
 /vendor
@@ -30,16 +33,20 @@ wp-tests-config.php
 /src/wp-admin/css/colors/*/*.css
 /src/wp-admin/js
 /src/wp-includes/assets/*
-!/src/wp-includes/assets/script-loader-packages.min.php
-!/src/wp-includes/assets/script-modules-packages.min.php
+!/src/wp-includes/assets/script-loader.packages.min.php
+!/src/wp-includes/assets/script-modules.packages.min.php
 /src/wp-includes/js
 /src/wp-includes/css/dist
 /src/wp-includes/css/*.min.css
 /src/wp-includes/css/*-rtl.css
 /src/wp-includes/blocks/**/*.css
 /src/wp-includes/blocks/**/*.js
 /src/wp-includes/blocks/**/*.js.map
+!/src/wp-includes/blocks/index.php
+/src/wp-includes/icons
+/src/wp-includes/build
 /packagehash.txt
+/.gutenberg-hash
 /artifacts
 /setup.log
 /coverage