Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WordPress/gutenberg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac2b810af876809e0cc91e49d07522a56adbf62a
Choose a base ref
..
head repository: WordPress/gutenberg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a5f4a400958c1e5c3bbc0154de70178f4a8ce1f9
Choose a head ref
Showing 655 changed files with 16,756 additions and 6,397 deletions.
11 changes: 6 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -230,18 +230,19 @@ module.exports = {
extends: [ 'plugin:@wordpress/eslint-plugin/test-unit' ],
},
{
files: [
'packages/e2e-tests/**/*.js',
'packages/e2e-test-utils/**/*.js',
],
files: [ 'packages/e2e-test*/**/*.js' ],
excludedFiles: [ 'packages/e2e-test-utils-playwright/**/*.js' ],
extends: [ 'plugin:@wordpress/eslint-plugin/test-e2e' ],
rules: {
'jest/expect-expect': 'off',
},
},
{
files: [
'test/e2e/**/*.[tj]s',
'packages/e2e-test-utils-playwright/**/*.[tj]s',
],
extends: [ 'plugin:@wordpress/eslint-plugin/test-e2e-playwright' ],
extends: [ 'plugin:eslint-plugin-playwright/playwright-test' ],
rules: {
'@wordpress/no-global-active-element': 'off',
'@wordpress/no-global-get-selection': 'off',
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -132,12 +132,12 @@

# PHP
/lib @timothybjacobs @spacedmonkey
/lib/global-styles.php @timothybjacobs @spacedmonkey @oandregal
/lib/class-wp-rest-block-editor-settings-controller.php @timothybjacobs @spacedmonkey @geriux @antonis
/lib/compat/wordpress-5.9/kses.php @timothybjacobs @spacedmonkey @oandregal
/lib/compat/wordpress-5.9/theme.json @timothybjacobs @spacedmonkey @oandregal
/lib/compat/wordpress-5.9/theme-i18n.json @timothybjacobs @spacedmonkey @oandregal
/lib/compat/wordpress-6.0/theme-i18n.json @timothybjacobs @spacedmonkey @oandregal
/lib/compat/wordpress-5.9/class-wp-theme-json-gutenberg.php @timothybjacobs @spacedmonkey @oandregal
/lib/compat/wordpress-5.9/class-wp-theme-json-resolver-gutenberg.php @timothybjacobs @spacedmonkey @oandregal
/lib/experimental/class-wp-rest-block-editor-settings-controller.php @timothybjacobs @spacedmonkey @geriux
/phpunit/class-wp-theme-json-test.php @oandregal

# Web App
@@ -146,7 +146,7 @@
/lib/service-worker.js @ellatrix

# Native
/packages/components/src/mobile/global-styles-context @geriux @antonis
/packages/components/src/mobile/global-styles-context @geriux

# Native (Unowned)
*.native.js
46 changes: 42 additions & 4 deletions .github/report-flaky-tests/index.js
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ const metaData = {
if ( isTrunk ) {
const headCommit = github.context.sha;
const baseCommit = meta.baseCommit || github.context.sha;
meta.baseCommit = baseCommit;

try {
const { data } = await octokit.rest.repos.compareCommits( {
@@ -85,14 +86,51 @@ const metaData = {
}
}

let testResultsList = body
.slice(
body.indexOf( TEST_RESULTS_LIST.open ) +
TEST_RESULTS_LIST.open.length,
body.indexOf( TEST_RESULTS_LIST.close )
)
/**
* Split the text from:
* ```
* <!-- __TEST_RESULT__ --> Test result 1 <!-- /__TEST_RESULT__ -->
* ...
* <!-- __TEST_RESULT__ --> Test result 2 <!-- /__TEST_RESULT__ -->
* <!-- __TEST_RESULT__ --> Test result 3 <!-- /__TEST_RESULT__ -->
* ```
*
* into:
* ```
* [
* '<!-- __TEST_RESULT__ --> Test result 1 <!-- /__TEST_RESULT__ -->',
* '<!-- __TEST_RESULT__ --> Test result 2 <!-- /__TEST_RESULT__ -->',
* '<!-- __TEST_RESULT__ --> Test result 3 <!-- /__TEST_RESULT__ -->',
* ]
* ```
*/
.split(
new RegExp(
`(?<=${ TEST_RESULT.close })\n(?:\.\.\.\n)?(?=${ TEST_RESULT.open })`
)
);
// GitHub issues has character limits on issue's body,
// so we only preserve the first and the 9 latest results.
if ( testResultsList.length > 10 ) {
testResultsList = [
testResultsList[ 0 ],
'...',
...testResultsList.slice( -9 ),
];
}

// Reconstruct the body with the description + previous errors + new error.
body =
renderIssueDescription( { meta, testTitle, testPath } ) +
body.slice(
body.indexOf( TEST_RESULTS_LIST.open ),
body.indexOf( TEST_RESULTS_LIST.close )
) +
[
TEST_RESULTS_LIST.open,
...testResultsList,
renderTestErrorMessage( {
testRunner,
testPath,
4 changes: 3 additions & 1 deletion .github/workflows/static-checks.yml
Original file line number Diff line number Diff line change
@@ -32,9 +32,11 @@ jobs:

- name: Npm install
# A "full" install is executed, since `npm ci` does not always exit
# with an error status code if the lock file is inaccurate.
# with an error status code if the lock file is inaccurate. This also
# helps to catch dependencies not being installed with exact version.
#
# See: https://github.com/WordPress/gutenberg/issues/16157
# See: https://github.com/WordPress/gutenberg/pull/39865
run: npm install

- name: Lint JavaScript and Styles
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -41,9 +41,13 @@ Review the [Create a Block tutorial](/docs/getting-started/create-block/README.m

### Contribute to Gutenberg

Gutenberg is an open-source project and welcomes all contributors from code to design, from documentation to triage. The project is built by many contributors and volunteers and we'd love your help building it.
Gutenberg is an open-source project and welcomes all contributors from code to design, and from documentation to triage. The project is built by many contributors and volunteers and we'd love your help building it.

See the [Contributors Handbook](https://developer.wordpress.org/block-editor/contributors/) for all the details on how you can contribute. See [CONTRIBUTING.md](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) for the contributing guidelines.
See the [Contributors Handbook](https://developer.wordpress.org/block-editor/contributors/) for all the details on how you can contribute.

To get up and running quickly with **code contribution** see [Getting Started With Code Contribution](/docs/contributors/code/getting-started-with-code-contribution.md). Also check out the other resources available on the [Code Contributions](/docs/contributors/code/README.md) page.

In whichever way you wish to contribute please be sure to read the [Contributing Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) first.

As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/HEAD/CODE_OF_CONDUCT.md).

1 change: 1 addition & 0 deletions bin/build-plugin-zip.sh
Original file line number Diff line number Diff line change
@@ -86,6 +86,7 @@ build_files=$(
build/edit-widgets/blocks/*/block.json \
build/widgets/blocks/*.php \
build/widgets/blocks/*/block.json \
build/style-engine/*.php \
)


Loading