Skip to content

Commit

Permalink
Merge branch 'trunk' into button-default-40px
Browse files Browse the repository at this point in the history
  • Loading branch information
mirka authored May 9, 2023
2 parents 6ef8a53 + af8d651 commit 5d6cdd5
Show file tree
Hide file tree
Showing 343 changed files with 8,751 additions and 3,956 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ const restrictedImports = [
'lowerCase',
'map',
'mapKeys',
'mapValues',
'maxBy',
'memoize',
'merge',
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Documentation
/docs @ajitbohra @ryanwelcher @juanmaguitar @fabiankaegy
/docs @ajitbohra @ryanwelcher @juanmaguitar @fabiankaegy @ndiego

# Schemas
/schemas/json @ajlende
Expand Down Expand Up @@ -57,7 +57,7 @@
# Tooling
/bin @ntwb @nerrad @ajitbohra
/bin/api-docs @ntwb @nerrad @ajitbohra
/docs/tool @ajitbohra
/docs/tool @ajitbohra @ndiego
/packages/babel-plugin-import-jsx-pragma @ntwb @nerrad @ajitbohra
/packages/babel-plugin-makepot @ntwb @nerrad @ajitbohra
/packages/babel-preset-default @gziolo @ntwb @nerrad @ajitbohra
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-components-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
exit 1
fi
pr_link_pattern="\(\[#${PR_NUMBER}\]\(https://github\.com/WordPress/gutenberg/pull/${PR_NUMBER}\)\)"
pr_link_grep_pattern="(\[#${PR_NUMBER}\](https://github\.com/WordPress/gutenberg/pull/${PR_NUMBER}))"
pr_link_pattern="\[#${PR_NUMBER}\]\(https://github\.com/WordPress/gutenberg/pull/${PR_NUMBER}\)"
pr_link_grep_pattern="\[#${PR_NUMBER}\](https://github\.com/WordPress/gutenberg/pull/${PR_NUMBER})"
unreleased_section=$(sed -n '/^## Unreleased$/,/^## /p' "${changelog_path}")
Expand Down
8 changes: 6 additions & 2 deletions bin/packages/build-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,13 @@ async function buildCSS( file ) {
'animations',
'z-index',
]
// Editor styles should be excluded from the default CSS vars output.
// Editor and component styles should be excluded from the default CSS vars output.
.concat(
file.includes( 'common.scss' ) || ! file.includes( 'block-library' )
file.includes( 'common.scss' ) ||
! (
file.includes( 'block-library' ) ||
file.includes( 'components' )
)
? [ 'default-custom-properties' ]
: []
)
Expand Down
4 changes: 4 additions & 0 deletions bin/plugin/commands/changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,10 @@ function getContributorProps( pullRequests ) {
getContributorPropsMarkdownList,
] )( pullRequests );

if ( ! contributorsList ) {
return '';
}

return (
'## First time contributors' +
'\n\n' +
Expand Down
21 changes: 18 additions & 3 deletions bin/plugin/commands/performance.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
const fs = require( 'fs' );
const path = require( 'path' );
const { mapValues } = require( 'lodash' );
const SimpleGit = require( 'simple-git' );

/**
Expand Down Expand Up @@ -475,10 +474,26 @@ async function runPerformanceTests( branches, options ) {
( r ) => r[ branch ][ dataPoint ]
);
} );
const medians = mapValues( resultsByDataPoint, median );
// @ts-ignore
const medians = Object.fromEntries(
Object.entries( resultsByDataPoint ).map(
( [ dataPoint, dataPointResults ] ) => [
dataPoint,
median( dataPointResults ),
]
)
);

// Format results as times.
results[ testSuite ][ branch ] = mapValues( medians, formatTime );
// @ts-ignore
results[ testSuite ][ branch ] = Object.fromEntries(
Object.entries( medians ).map(
( [ dataPoint, dataPointMedian ] ) => [
dataPoint,
formatTime( dataPointMedian ),
]
)
);
}
}

Expand Down
5 changes: 5 additions & 0 deletions bin/plugin/commands/test/changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,11 @@ describe( 'getContributorProps', () => {
// npm run other:changelog -- --milestone="Gutenberg 11.3"
expect( getContributorProps( pullRequests ) ).toMatchSnapshot();
} );
test( 'do not include first time contributors section if there are not any', () => {
expect(
getContributorProps( pullRequests.slice( 0, 4 ) )
).toMatchInlineSnapshot( `""` );
} );
} );

describe( 'getContributorList', () => {
Expand Down
11 changes: 7 additions & 4 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
== Changelog ==

= 15.7.0-rc.1 =


= 15.7.0 =

## Changelog

Expand Down Expand Up @@ -57,6 +55,8 @@
- Adjust copy of Site Logo Block. ([49540](https://github.com/WordPress/gutenberg/pull/49540))
- Adapt flex child controls for Spacer. ([49362](https://github.com/WordPress/gutenberg/pull/49362))
- Social Icon: Update the `link` and `mail` block variation's icons. ([49952](https://github.com/WordPress/gutenberg/pull/49952))
- Cover: Re-instate overflow:Hidden rule to fix issue with border radius. ([50209](https://github.com/WordPress/gutenberg/pull/50209))
- Fix site logo preview image size with long filenames. ([50242](https://github.com/WordPress/gutenberg/pull/50242))

#### Components
- CheckboxControl: Add support custom IDs. ([49977](https://github.com/WordPress/gutenberg/pull/49977))
Expand All @@ -76,6 +76,7 @@
- Do not add unregistered style variations to the theme.json schema. ([49807](https://github.com/WordPress/gutenberg/pull/49807))
- Update preset styles to use Selectors API. ([49427](https://github.com/WordPress/gutenberg/pull/49427))
- Change the 'WP_Theme_JSON_Data_Gutenberg' class directory. ([50062](https://github.com/WordPress/gutenberg/pull/50062))
- Layout: Fix issue where saving user global styles included layout definitions in layout settings. ([50268](https://github.com/WordPress/gutenberg/pull/50268))

#### Site Editor
- Fix screen flash when deleting templates in templates list. ([48449](https://github.com/WordPress/gutenberg/pull/48449))
Expand All @@ -88,7 +89,7 @@
- Correctly return 'isResolving' from 'useAlternativeTemplateParts' hook. ([49921](https://github.com/WordPress/gutenberg/pull/49921))

#### Patterns
- Increase dimensions of the pattern modal that appears when creating a new page. ([49859](https://github.com/WordPress/gutenberg/pull/49859))
- Increase the dimensions of the pattern modal that appears when creating a new page. ([49859](https://github.com/WordPress/gutenberg/pull/49859))
- Update full screen modal dimensions, and pattern grids. ([49894](https://github.com/WordPress/gutenberg/pull/49894))
- Increase pattern modal dimensions when creating a new template. ([49722](https://github.com/WordPress/gutenberg/pull/49722))

Expand Down Expand Up @@ -206,6 +207,8 @@ The following contributors merged PRs in this release:
@aaronrobertshaw @adamziel @ajlende @alexstine @andrewserong @annziel @aurooba @bdurette @bph @carolinan @chad1008 @chintu51 @courtneyr-dev @dcalhoun @derekblank @draganescu @ellatrix @fluiddot @gaambo @geriux @getdave @gigitux @guarani @gvgvgvijayan @gziolo @hellofromtonya @jameskoster @jasmussen @jeryj @jhnstn @jsnajdr @juanmaguitar @kevin940726 @m0hanraj @MaggieCabrera @MahendraBishnoi29 @Mamaduka @masteradhoc @mburridge @mcsf @mikachan @mirka @mokagio @mtias @ndiego @noahtallen @ntsekouras @oandregal @ObliviousHarmony @priethor @ramonjd @scruffian @SiobhyB @Soean @sque89 @t-hamano @talldan @tellthemachines @tyrann0us @tyxla @Wtower @youknowriad @zzap




= 15.6.2 =


Expand Down
24 changes: 4 additions & 20 deletions docs/contributors/code/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ We release a new major version approximately every two weeks. The current and ne

- **On the date of the current milestone**, we publish a release candidate and make it available for plugin authors and users to test. If any regressions are found with a release candidate, a new one can be published. On this date, all remaining PRs on the milestone are moved automatically to the next release. Release candidates should be versioned incrementally, starting with `-rc.1`, then `-rc.2`, and so on. [Preparation of the release post starts here](/docs/block-editor/contributors/code/release/#writing-the-release-notes-and-post) and spans until the final release.

- **One week after the first release candidate**, the stable version is created based on the last release candidate and any necessary regression fixes. Once the stable version is released, the release post is published, including a [performance audit](/docs/block-editor/contributors/testing-overview/#performance-testing).
- **One week after the first release candidate**, the stable version is created based on the last release candidate and any necessary regression fixes. Once the stable version is released and the release post is published.

If critical bugs are discovered on stable versions of the plugin, patch versions can be released at any time.

Expand Down Expand Up @@ -103,8 +103,7 @@ Documenting the release is a group effort between the release manager, Gutenberg
1. Curating the changelog - Wednesday after the RC release to Friday
2. Selecting the release highlights - Friday to Monday
3. Drafting the release post - Monday to Wednesday
4. Running the performance tests - Wednesday right after the stable release
5. Publishing the post - Wednesday after stable release
4. Publishing the post - Wednesday after stable release

#### 1. Curating the changelog

Expand Down Expand Up @@ -140,21 +139,6 @@ When possible, the highlighted changes in the release post should include an ani

These visual assets should maintain consistency with previous release posts; using lean, white themes helps in this regard and visually integrate well with the [make.wordpress.org/core](https://make.wordpress.org/core/) blog aesthetics. Including copyrighted material should be avoided, and browser plugins that can be seen in the browser canvas (spell checkers, form fillers, etc.) disabled when capturing the assets.

#### 4. Running the performance tests

The post should also include a performance audit at the end, comparing the current Gutenberg release with both the previous one and the latest WordPress major version. There are GitHub worfklows in place to do this comparison as part of the Continuous Integration setup, so the performance audit results can be found at the workflow run generated by the release commit in the [Performance Tests workflows](https://github.com/WordPress/gutenberg/actions/workflows/performance.yml) page, with the job name `Compare performance with current WordPress Core and previous Gutenberg versions`.

If the GitHub workflow fails, the performance audit can be executed locally using `bin/plugin/cli.js perf` and passing the branches to run the performance suite against as parameters. In addition, the current major WP version can be passed to avoid running tests against the WP `trunk`. Example:

```
node ./bin/plugin/cli.js perf release/x.y release/x.z wp/a.b --wp-version wp.major
```

The performance values usually displayed in the release post are:

- Time to the first block (test named `firstBlock`)
- KeyPress Event (typing) (test named `type`)

#### 5. Publishing the post

Once the post content is ready, an author already having permissions to post in [make.wordpress.org/core](https://make.wordpress.org/core/) will create a new draft and import the content; this post should be published after the actual release, helping external media to echo and amplify the release news. Remember asking for peer review is encouraged by the [make/core posting guidelines](https://make.wordpress.org/core/handbook/best-practices/post-comment-guidelines/#peer-review)!
Expand All @@ -165,7 +149,7 @@ Occasionally it's necessary to create a minor release (i.e. X.Y.**Z**) of the Pl

As you proceed with the following process, it's worth bearing in mind that such minor releases are not created as branches in their own right (e.g. `release/12.5.0`) but are simply [tags](https://github.com/WordPress/gutenberg/releases/tag/v12.5.1).

The method for minor releases is nearly identical to the main Plugin release process (see above) but has some notable exceptions. Please make sure to read _the whole_ of this guide before proceeding.
The method for minor releases is nearly identical to the main Plugin release process (see above) but has some notable exceptions. Please make sure to read _the entire_ guide before proceeding.

#### Updating the release branch

Expand Down Expand Up @@ -217,7 +201,7 @@ This is expected. The draft release will contain only the plugin zip. Only once

> Do I need to publish point releases to WordPress.org?
Yes. The method for this is identical to the main Plugin release process. You will need a Gutenberg Core team member to approve the release workflow.
Yes. The method for this is identical to the main Plugin release process. You will need a member of the Gutenberg Core team the Gutenberg Release team to approve the release workflow.

> The release process failed to cherry-pick version bump commit to the trunk branch.
Expand Down
18 changes: 9 additions & 9 deletions docs/explanations/architecture/performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Performance is a key feature for editor applications and the Block editor is not

To ensure the block editor stays performant across releases and development, we monitor some key metrics using [performance benchmark job](#the-performance-benchmark-job).

**Loading Time:** The time it takes to load an editor page. This includes time the server takes to respond, times to first paint, first contentful paint, DOM content load complete, load complete and first block render.
**Typing Time:** The time it takes for the browser to respond while typing on the editor.
**Block Selection Time:** The time it takes for the browser to respond after a user selects block. (Inserting a block is also equivalent to selecting a block. Monitoring the selection is sufficient to cover both metrics).
- **Loading Time:** The time it takes to load an editor page. This includes time the server takes to respond, times to first paint, first contentful paint, DOM content load complete, load complete and first block render.
- **Typing Time:** The time it takes for the browser to respond while typing on the editor.
- **Block Selection Time:** The time it takes for the browser to respond after a user selects block. (Inserting a block is also equivalent to selecting a block. Monitoring the selection is sufficient to cover both metrics).

## Key Performance Decisions and Solutions

Expand Down Expand Up @@ -53,12 +53,12 @@ To achieve that the command first prepares the following folder structure:

Once the directory above is in place, the performance command loop over the performance test suites (post editor and site editor) and does the following:

1- Start the environment for branch1
2- Run the performance test for the current suite
3- Stop the environment for branch1
4- Repeat the first 3 steps for all other branches
5- Repeat the previous 4 steps 3 times.
6- Compute medians for all the performance metrics of the current suite.
1. Start the environment for `branch1`
2. Run the performance test for the current suite
3. Stop the environment for `branch1`
4. Repeat the first 3 steps for all other branches
5. Repeat the previous 4 steps 3 times.
6. Compute medians for all the performance metrics of the current suite.

Once all the test suites are executed, a summary report is printed.

Expand Down
2 changes: 1 addition & 1 deletion docs/explanations/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ This is the canonical list of keyboard shortcuts:
<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>Z</kbd></td>
</tr>
<tr>
<td>Show or hide the settings sidebar.</td>
<td>Show or hide the Settings sidebar.</td>
<td><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>,</kbd></td>
<td><kbd>⇧</kbd><kbd>⌘</kbd><kbd>,</kbd></td>
</tr>
Expand Down
Loading

0 comments on commit 5d6cdd5

Please sign in to comment.