Skip to content

Commit 290c95b

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into try/block-supports-editable-root
# Conflicts: # packages/components/CHANGELOG.md # packages/dom/CHANGELOG.md
2 parents e945ef2 + 91c816e commit 290c95b

299 files changed

Lines changed: 1108 additions & 2393 deletions

File tree

Some content is hidden

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

.github/workflows/performance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ jobs:
7676
- name: Compare performance with base branch
7777
if: github.event_name == 'push'
7878
# The base hash used here need to be a commit that is compatible with the current WP version
79-
# The current one is dae102af1458310b05de3c1281b1654951a729ab and it needs to be updated every WP major release.
79+
# The current one is 28d414f1327652e2b49e784ddc12098768991c62 and it needs to be updated every WP major release.
8080
# It is used as a base comparison point to avoid fluctuation in the performance metrics.
8181
# See: https://developer.wordpress.org/block-editor/explanations/architecture/performance/#update-the-reference-commit.
8282
run: |
8383
WP_VERSION="$(awk -F ': ' '/^Tested up to/{print $2}' readme.txt)"
8484
IFS=. read -ra WP_VERSION_ARRAY <<< "$WP_VERSION"
8585
WP_MAJOR="${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
86-
npm exec --no release-cli -- perf "$GITHUB_SHA" dae102af1458310b05de3c1281b1654951a729ab --tests-branch "$GITHUB_SHA" --wp-version "$WP_MAJOR"
86+
npm exec --no release-cli -- perf "$GITHUB_SHA" 28d414f1327652e2b49e784ddc12098768991c62 --tests-branch "$GITHUB_SHA" --wp-version "$WP_MAJOR"
8787
8888
- name: Compare performance with custom branches
8989
if: github.event_name == 'workflow_dispatch'
@@ -119,7 +119,7 @@ jobs:
119119
CODEHEALTH_PROJECT_TOKEN: ${{ secrets.CODEHEALTH_PROJECT_TOKEN }}
120120
run: |
121121
COMMITTED_AT="$(git show -s "$GITHUB_SHA" --format="%cI")"
122-
npm run --workspace=tools/release log-performance-results -- "$CODEHEALTH_PROJECT_TOKEN" trunk "$GITHUB_SHA" dae102af1458310b05de3c1281b1654951a729ab "$COMMITTED_AT"
122+
npm run --workspace=tools/release log-performance-results -- "$CODEHEALTH_PROJECT_TOKEN" trunk "$GITHUB_SHA" 28d414f1327652e2b49e784ddc12098768991c62 "$COMMITTED_AT"
123123
124124
- name: Archive debug artifacts (screenshots, HTML snapshots)
125125
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.npmpackagejsonlintrc.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/**
2+
* Resolve the shared config from its workspace by path rather than by package name.
3+
* npm-package-json-lint resolves a bare `extends` name relative to each linted `package.json`,
4+
* which only reaches the config when it is hoisted to the root `node_modules`; a path resolved from this file works regardless of the install layout.
5+
*/
6+
module.exports = {
7+
extends: require.resolve( './packages/npm-package-json-lint-config' ),
8+
rules: {
9+
'description-format': [
10+
'error',
11+
{
12+
requireCapitalFirstLetter: true,
13+
requireEndingPeriod: true,
14+
},
15+
],
16+
'require-publishConfig': 'error',
17+
'require-repository-directory': 'error',
18+
'valid-values-author': [ 'error', [ 'The WordPress Contributors' ] ],
19+
'valid-values-publishConfig': [
20+
'error',
21+
[
22+
{
23+
access: 'public',
24+
},
25+
],
26+
],
27+
},
28+
overrides: [
29+
{
30+
patterns: [ './package.json' ],
31+
rules: {
32+
'require-publishConfig': 'off',
33+
'require-repository-directory': 'off',
34+
},
35+
},
36+
],
37+
};

.npmpackagejsonlintrc.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

docs/reference-guides/core-blocks/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,8 @@ Give special visual emphasis to a quote from your text.
807807

808808
- **Name:** [core/pullquote](https://developer.wordpress.org/block-editor/reference-guides/core-blocks/core-blocks-text/core-block-pullquote/)
809809
- **Category:** [text](https://developer.wordpress.org/block-editor/reference-guides/core-blocks/core-blocks-text/)
810-
- **Supports:** align (full, left, right, wide), anchor, background (backgroundImage, backgroundSize), color (background, gradients, link, text), dimensions (minHeight), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight)
811-
- **Attributes:** citation, textAlign, value
810+
- **Supports:** align (full, left, right, wide), anchor, background (backgroundImage, backgroundSize), color (background, gradients, link, text), dimensions (minHeight), interactivity (clientNavigation), spacing (margin, padding), typography (fontSize, lineHeight, textAlign)
811+
- **Attributes:** citation, value
812812

813813
## Query Loop
814814

gutenberg.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Gutenberg
44
* Plugin URI: https://github.com/WordPress/gutenberg
55
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
6-
* Requires at least: 6.8
6+
* Requires at least: 6.9
77
* Requires PHP: 7.4
88
* Version: 23.4.0-rc.1
99
* Author: Gutenberg Team
@@ -12,7 +12,7 @@
1212
* @package gutenberg
1313
*/
1414

15-
defined( 'GUTENBERG_MINIMUM_WP_VERSION' ) or define( 'GUTENBERG_MINIMUM_WP_VERSION', '6.8' );
15+
defined( 'GUTENBERG_MINIMUM_WP_VERSION' ) or define( 'GUTENBERG_MINIMUM_WP_VERSION', '6.9' );
1616

1717
gutenberg_pre_init();
1818

0 commit comments

Comments
 (0)