Skip to content

Commit 524bf72

Browse files
committed
Merge branch 'trunk' into add/64944-with-sync-event
2 parents dad7083 + 05ef404 commit 524bf72

File tree

701 files changed

+6217
-3702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

701 files changed

+6217
-3702
lines changed

.eslintrc.js

-23
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,6 @@
44
const glob = require( 'glob' ).sync;
55
const { join } = require( 'path' );
66

7-
/**
8-
* Internal dependencies
9-
*/
10-
const { version } = require( './package' );
11-
12-
/**
13-
* Regular expression string matching a SemVer string with equal major/minor to
14-
* the current package version. Used in identifying deprecations.
15-
*
16-
* @type {string}
17-
*/
18-
const majorMinorRegExp =
19-
version.replace( /\.\d+$/, '' ).replace( /[\\^$.*+?()[\]{}|]/g, '\\$&' ) +
20-
'(\\.\\d+)?';
21-
227
/**
238
* The list of patterns matching files used only for development purposes.
249
*
@@ -92,14 +77,6 @@ const restrictedSyntax = [
9277
'ImportDeclaration[source.value=/^@wordpress\\u002F.+\\u002F/]',
9378
message: 'Path access on WordPress dependencies is not allowed.',
9479
},
95-
{
96-
selector:
97-
'CallExpression[callee.name="deprecated"] Property[key.name="version"][value.value=/' +
98-
majorMinorRegExp +
99-
'/]',
100-
message:
101-
'Deprecated functions must be removed before releasing this version.',
102-
},
10380
{
10481
selector:
10582
'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',

.github/CODEOWNERS

+2-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Blocks
1616
/packages/block-library @ajitbohra @fabiankaegy
17-
/packages/block-library/src/gallery @geriux
17+
/packages/block-library/src/gallery
1818
/packages/block-library/src/comment-template @michalczaplinski
1919
/packages/block-library/src/comments @michalczaplinski
2020
/packages/block-library/src/table-of-contents @ZebulanStanphill
@@ -138,10 +138,7 @@
138138
/lib/compat/*/html-api @dmsnell
139139
/lib/experimental/rest-api.php @timothybjacobs
140140
/lib/experimental/class-wp-rest-* @timothybjacobs
141-
/lib/experimental/class-wp-rest-block-editor-settings-controller.php @timothybjacobs @spacedmonkey @geriux
142-
143-
# Native
144-
/packages/components/src/mobile/global-styles-context @geriux
141+
/lib/experimental/class-wp-rest-block-editor-settings-controller.php @timothybjacobs @spacedmonkey
145142

146143
# Native (Unowned)
147144
*.native.js

.github/workflows/gradle-wrapper-validation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
with:
1212
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
1313
- name: Validate checksums
14-
uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
14+
uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2

.github/workflows/rnmobile-android-runner.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3030

3131
- name: Use desired version of Java
32-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
32+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
3333
with:
3434
distribution: 'corretto'
3535
java-version: '17'
@@ -48,7 +48,7 @@ jobs:
4848
run: npm run native test:e2e:setup
4949

5050
- name: Gradle cache
51-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
51+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
5252

5353
# AVD cache disabled as it caused emulator termination to hang indefinitely.
5454
# https://github.com/ReactiveCircus/android-emulator-runner/issues/385

.github/workflows/rnmobile-ios-runner.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3030

31-
- uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
31+
- uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
3232
with:
3333
# `.ruby-version` file location
3434
working-directory: packages/react-native-editor/ios

.github/workflows/stale-issue-gardening.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Update issues
39-
uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
39+
uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
4040
with:
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
4242
stale-issue-message: ${{ matrix.message }}

.github/workflows/storybook-check.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check Storybook build
2+
3+
on: pull_request
4+
5+
# Cancels all previous workflow runs for pull requests that have not completed.
6+
concurrency:
7+
# The concurrency group contains the workflow name and the branch name for pull requests
8+
# or the commit hash for any other events.
9+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
check:
14+
runs-on: ubuntu-latest
15+
if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
with:
21+
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
22+
23+
- name: Setup Node.js and install dependencies
24+
uses: ./.github/setup-node
25+
26+
- name: Build Storybook
27+
run: npm run storybook:build

.github/workflows/unit-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
# dependency versions are installed and cached.
189189
##
190190
- name: Set up PHP
191-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
191+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
192192
with:
193193
php-version: '${{ matrix.php }}'
194194
ini-file: development
@@ -283,7 +283,7 @@ jobs:
283283
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
284284

285285
- name: Set up PHP
286-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
286+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
287287
with:
288288
php-version: '7.4'
289289
coverage: none

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ results
1919
/test/e2e/artifacts
2020
/perf-envs
2121
/composer.lock
22+
/ts-traces
2223

2324
# The /.cache folder is needed for phpcs to cache results between runs, while other .cache folders must be ignored
2425
# It is not possible to re-include a file if a parent directory of that file is excluded

backport-changelog/6.8/8123.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
https://github.com/WordPress/wordpress-develop/pull/8123
2+
3+
* https://github.com/WordPress/gutenberg/pull/68549
4+
* https://github.com/WordPress/gutenberg/pull/68745

backport-changelog/readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The filename is the Core PR number.
2020

2121
For example, if your Core PR number is `1234` and is slated to be part of the WordPress 6.9 release, the filename will be `1234.md`, and will be placed in the `/backport-changelog/6.9` directory.
2222

23-
The content of the markdown file should be the Github URL of the Core PR, followed by a list of Gutenberg PR Github URLs whose changes are backported in the Core PR.
23+
The content of the markdown file should be the GitHub URL of the Core PR, followed by a list of Gutenberg PR GitHub URLs whose changes are backported in the Core PR.
2424

2525
A single Core PR may contain changes from one or multiple Gutenberg PRs.
2626

@@ -51,7 +51,7 @@ For the backport changelog, Gutenberg uses individual files as opposed to a sing
5151

5252
Some Gutenberg PRs may be flagged as needing a core backport PR when they don't, for example when the PR contains minor comment changes, or the changes already exist in Core.
5353

54-
For individual PRs, there are two Github labels that can be used to exclude a PR from the backport changelog CI check:
54+
For individual PRs, there are two GitHub labels that can be used to exclude a PR from the backport changelog CI check:
5555

5656
- `Backport from WordPress Core` - Indicates that the PR is a backport from WordPress Core and doesn't need a Core PR.
5757
- `No Core Sync Required` - Indicates that any changes do not need to be synced to WordPress Core.

bin/api-docs/gen-block-lib-list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ function processObjWithInnerKeys( obj ) {
108108
* not disabled. So adding { color: 'link' } support also brings along
109109
* background and text.
110110
*
111-
* @param {Object} supports - keys supported by blokc
111+
* @param {Object} supports - keys supported by block
112112
* @return {Object} supports augmented with defaults
113113
*/
114114
function augmentSupports( supports ) {
115115
if ( 'color' in supports ) {
116-
// If backgroud or text is not specified (true or false)
116+
// If background or text is not specified (true or false)
117117
// then add it as true.a
118118
if ( ! ( 'background' in supports.color ) ) {
119119
supports.color.background = true;

bin/generate-gutenberg-php.php

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/**
1616
* Prints `define` statements for the production version of `gutenberg.php`
1717
* (the plugin entry point).
18+
*
19+
* @global string $plugin_version The version number of the plugin.
1820
*/
1921
function print_production_defines() {
2022
global $plugin_version;

bin/plugin/commands/changelog.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const LABEL_TYPE_MAPPING = {
8888
};
8989

9090
/**
91-
* Mapping of label names to arbitary features in the release notes.
91+
* Mapping of label names to arbitrary features in the release notes.
9292
*
9393
* Mapping a given label to a feature will guarantee it will be categorised
9494
* under that feature name in the changelog within each section.
@@ -274,7 +274,7 @@ function mapLabelsToFeatures( labels ) {
274274
*
275275
* @param {string[]} labels Label names.
276276
*
277-
* @return {boolean} whether or not the issue's is labbeled as block specific
277+
* @return {boolean} whether or not the issue's is labeled as block specific
278278
*/
279279
function getIsBlockSpecificIssue( labels ) {
280280
return !! labels.find( ( label ) => label.startsWith( '[Block] ' ) );
@@ -343,7 +343,7 @@ function getIssueFeature( issue ) {
343343

344344
// 1. Prefer explicit mapping of label to feature.
345345
if ( featureCandidates.length ) {
346-
// Get occurances of the feature labels.
346+
// Get occurrences of the feature labels.
347347
const featureCounts = featureCandidates.reduce(
348348
/**
349349
* @param {Record<string,number>} acc Accumulator
@@ -941,7 +941,7 @@ function skipCreatedByBots( pullRequests ) {
941941
}
942942

943943
/**
944-
* Produces the formatted markdown for the contributor props seciton.
944+
* Produces the formatted markdown for the contributor props section.
945945
*
946946
* @param {IssuesListForRepoResponseItem[]} pullRequests List of pull requests.
947947
*

bin/plugin/commands/test/changelog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ describe( 'getIssueFeature', () => {
260260
name: '[Package] This package',
261261
},
262262
{
263-
name: '[Feature] Cool Feature', // Should have priority despite prescence of block specific label.
263+
name: '[Feature] Cool Feature', // Should have priority despite presence of block specific label.
264264
},
265265
{
266266
name: '[Package] Another One',

0 commit comments

Comments
 (0)