Skip to content

Commit

Permalink
Merge branch 'add/a11y-script-module' into interactivity-router/pass-…
Browse files Browse the repository at this point in the history
…i18n-with-script-module-data
  • Loading branch information
sirreal committed Sep 24, 2024
2 parents 2d8401f + d6201e3 commit 007480f
Show file tree
Hide file tree
Showing 228 changed files with 10,189 additions and 4,742 deletions.
File renamed without changes.
3 changes: 1 addition & 2 deletions .github/workflows/phpunit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@ jobs:
memcached: false
# Report test results to the Host Test Results.
- os: ubuntu-latest
php: '7.4'
db-type: 'mysql'
db-version: '5.7'
db-version: '8.0'
tests-domain: 'example.org'
multisite: false
memcached: false
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# gitignore file for WordPress Core

# Configuration files with possibly sensitive information
.env
wp-config.php
wp-tests-config.php
.htaccess
Expand Down Expand Up @@ -30,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
Expand Down
2 changes: 2 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -1151,6 +1152,7 @@ module.exports = function(grunt) {
flatten: true,
src: [
BUILD_DIR + 'wp-includes/js/dist/block-editor.js',
BUILD_DIR + 'wp-includes/js/dist/commands.js',
],
dest: BUILD_DIR + 'wp-includes/js/dist/'
}
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
"ext-dom": "*"
},
"require-dev": {
"squizlabs/php_codesniffer": "3.9.0",
"squizlabs/php_codesniffer": "3.10.3",
"wp-coding-standards/wpcs": "~3.1.0",
"phpcompatibility/phpcompatibility-wp": "~2.1.3",
"yoast/phpunit-polyfills": "^1.1.0"
},
"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",
Expand Down
Loading

0 comments on commit 007480f

Please sign in to comment.