Merge branch 'trunk' into html-api/refactor-make-clickable

WordPress · Sep 27, 2024 · 773a06f · 773a06f
2 parents 381a748 + 2550224
commit 773a06f
Show file tree

Hide file tree

Showing 57 changed files with 1,618 additions and 1,106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@ wp-tests-config.php
 /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/js
 /src/wp-includes/css/dist
 /src/wp-includes/css/*.min.css

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -56,6 +56,7 @@ module.exports = function(grunt) {
 			'wp-includes/css/dist',
 			'wp-includes/blocks/**/*.css',
 			'!wp-includes/assets/script-loader-packages.min.php',
+			'!wp-includes/assets/script-modules-packages.min.php',
 		],
 
 		// Prepend `dir` to `file`, and keep `!` in place.

diff --git a/composer.json b/composer.json
@@ -25,7 +25,8 @@
 	"config": {
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true
-		}
+		},
+		"lock": false
 	},
 	"scripts": {
 		"compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",