Skip to content

Commit 87f5a56

Browse files
committed
prep build 07/09
2 parents 904f233 + 4ccb0f1 commit 87f5a56

File tree

90 files changed

+1043
-465
lines changed

Some content is hidden

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

90 files changed

+1043
-465
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/packages/block-library/src/comment-template @michalczaplinski
1919
/packages/block-library/src/comments @michalczaplinski
2020
/packages/block-library/src/table-of-contents @ZebulanStanphill
21-
/packages/block-library/src/image @artemiomorales @michalczaplinski
21+
/packages/block-library/src/image @artemiomorales
2222

2323
# Duotone
2424
/lib/block-supports/duotone.php

.github/workflows/check-backport-changelog.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,15 @@ on:
1818
- '!packages/e2e-tests/**'
1919
jobs:
2020
check:
21-
name: Check CHANGELOG diff
21+
name: Check for a Core backport changelog entry
2222
runs-on: ubuntu-latest
23+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'No Core Sync Required') && !contains(github.event.pull_request.labels.*.name, 'Backport from WordPress Core') }}
2324
steps:
24-
- name: 'Get PR commit count'
25-
run: echo "PR_COMMIT_COUNT=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
26-
- name: Checkout code
27-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2826
with:
2927
ref: ${{ github.event.pull_request.head.ref }}
3028
repository: ${{ github.event.pull_request.head.repo.full_name }}
31-
fetch-depth: ${{ env.PR_COMMIT_COUNT }}
32-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
33-
- name: 'Fetch relevant history from origin'
34-
run: git fetch origin ${{ github.event.pull_request.base.ref }}
35-
- name: Check CHANGELOG status
36-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'No Core Sync Required') && !contains(github.event.pull_request.labels.*.name, 'Backport from WordPress Core') }}
29+
- name: Check the changelog folder
3730
env:
3831
PR_NUMBER: ${{ github.event.number }}
3932
run: |
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Sync Core Backport Issue
2+
3+
on:
4+
push:
5+
branches:
6+
- trunk
7+
8+
jobs:
9+
sync-backport-changelog:
10+
name: Sync Core Backport Issue
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
with:
15+
fetch-depth: 2 # Fetch the last two commits to compare changes
16+
- name: Check for changes in backport-changelog
17+
run: |
18+
git diff --quiet HEAD^ HEAD -- backport-changelog || echo "changes=true" >> $GITHUB_OUTPUT
19+
- name: Sync Issue
20+
if: env.changes == 'true'
21+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
22+
with:
23+
script: |
24+
const labelName = '🤖 Sync Backport Changelog';
25+
const issues = await github.paginate(github.rest.issues.listForRepo, {
26+
owner: context.repo.owner,
27+
repo: context.repo.repo,
28+
labels: [labelName],
29+
state: 'open',
30+
per_page: 1,
31+
});
32+
33+
if (issues.length === 0) {
34+
console.log(`No issues found with the "${labelName}" label.`);
35+
return;
36+
}
37+
38+
const [latestIssue] = issues;
39+
const versionMatch = latestIssue.title.match(/(\d+\.\d+)/);
40+
if (!versionMatch) {
41+
console.log('Could not find a version number in the latest issue title.');
42+
return;
43+
}
44+
45+
const version = versionMatch[1];
46+
console.log(`Latest version: ${version}`);
47+
48+
const { execSync } = require('child_process');
49+
const processedChangelog = execSync(`awk '/./ {print ($0 ~ /^[-*]/ ? " " : "- ") $0}' backport-changelog/${version}/*.md`).toString().trim();
50+
51+
const startDelimiter = '<!-- START TRUNK BACKPORT CHANGELOG -->';
52+
const endDelimiter = '<!-- END TRUNK BACKPORT CHANGELOG -->';
53+
const autoGeneratedContent = `${startDelimiter}\n${processedChangelog}\n${endDelimiter}`;
54+
55+
const regex = new RegExp(`${startDelimiter}[\\s\\S]*${endDelimiter}`);
56+
let newBody;
57+
58+
if (regex.test(latestIssue.body)) {
59+
// If delimiters exist, replace the content between them
60+
newBody = latestIssue.body.replace(regex, autoGeneratedContent);
61+
} else {
62+
// If delimiters don't exist, append the new content at the end
63+
newBody = `${latestIssue.body}\n\n${autoGeneratedContent}`;
64+
}
65+
66+
if (newBody.trim() !== latestIssue.body.trim()) {
67+
await github.rest.issues.update({
68+
owner: context.repo.owner,
69+
repo: context.repo.repo,
70+
issue_number: latestIssue.number,
71+
body: newBody
72+
});
73+
console.log('Issue description updated successfully.');
74+
} else {
75+
console.log('Issue description is already up to date.');
76+
}

.wp-env.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "./schemas/json/wp-env.json",
23
"core": "WordPress/WordPress",
34
"plugins": [ "." ],
45
"themes": [ "./test/emptytheme" ],

backport-changelog/6.7/6910.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ https://github.com/WordPress/wordpress-develop/pull/6910
22

33
* https://github.com/WordPress/gutenberg/pull/59483
44
* https://github.com/WordPress/gutenberg/pull/60652
5-
* https://github.com/WordPress/gutenberg/pull/62777
5+
* https://github.com/WordPress/gutenberg/pull/62777
6+
* https://github.com/WordPress/gutenberg/pull/63108

docs/reference-guides/core-blocks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Embed a simple audio player. ([Source](https://github.com/WordPress/gutenberg/tr
2424
- **Name:** core/audio
2525
- **Category:** media
2626
- **Supports:** align, anchor, interactivity (clientNavigation), spacing (margin, padding)
27-
- **Attributes:** autoplay, caption, id, loop, preload, src
27+
- **Attributes:** autoplay, blob, caption, id, loop, preload, src
2828

2929
## Avatar
3030

@@ -273,7 +273,7 @@ Add a link to a downloadable file. ([Source](https://github.com/WordPress/gutenb
273273
- **Name:** core/file
274274
- **Category:** media
275275
- **Supports:** align, anchor, color (background, gradients, link, ~~text~~), interactivity, spacing (margin, padding)
276-
- **Attributes:** displayPreview, downloadButtonText, fileId, fileName, href, id, previewHeight, showDownloadButton, textLinkHref, textLinkTarget
276+
- **Attributes:** blob, displayPreview, downloadButtonText, fileId, fileName, href, id, previewHeight, showDownloadButton, textLinkHref, textLinkTarget
277277

278278
## Footnotes
279279

@@ -388,7 +388,7 @@ Insert an image to make a visual statement. ([Source](https://github.com/WordPre
388388
- **Name:** core/image
389389
- **Category:** media
390390
- **Supports:** align (center, full, left, right, wide), anchor, color (~~background~~, ~~text~~), filter (duotone), interactivity, shadow ()
391-
- **Attributes:** alt, aspectRatio, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
391+
- **Attributes:** alt, aspectRatio, blob, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
392392

393393
## Latest Comments
394394

@@ -958,6 +958,6 @@ Embed a video from your media library or upload a new one. ([Source](https://git
958958
- **Name:** core/video
959959
- **Category:** media
960960
- **Supports:** align, anchor, interactivity (clientNavigation), spacing (margin, padding)
961-
- **Attributes:** autoplay, caption, controls, id, loop, muted, playsInline, poster, preload, src, tracks
961+
- **Attributes:** autoplay, blob, caption, controls, id, loop, muted, playsInline, poster, preload, src, tracks
962962

963963
<!-- END TOKEN Autogenerated - DO NOT EDIT -->

docs/reference-guides/interactivity-api/iapi-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ store( 'wpmovies', {
130130
>
131131
<button
132132
data-wp-on--click="actions.toggle"
133-
data-wp-bind--aria-expanded="context.ispen"
133+
data-wp-bind--aria-expanded="context.isOpen"
134134
aria-controls="p-1"
135135
>
136136
Toggle

lib/block-supports/layout.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
501501
if ( ! empty( $layout['rowCount'] ) ) {
502502
$layout_styles[] = array(
503503
'selector' => $selector,
504-
'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(8px, auto))' ),
504+
'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(1rem, auto))' ),
505505
);
506506
}
507507
} elseif ( ! empty( $layout['columnCount'] ) ) {
@@ -512,7 +512,7 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
512512
if ( ! empty( $layout['rowCount'] ) ) {
513513
$layout_styles[] = array(
514514
'selector' => $selector,
515-
'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(8px, auto))' ),
515+
'declarations' => array( 'grid-template-rows' => 'repeat(' . $layout['rowCount'] . ', minmax(1rem, auto))' ),
516516
);
517517
}
518518
} else {

package-lock.json

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@
9292
"@wordpress/warning": "file:packages/warning",
9393
"@wordpress/widgets": "file:packages/widgets",
9494
"@wordpress/wordcount": "file:packages/wordcount",
95-
"es-module-shims": "^1.8.2",
96-
"postcss-local-keyframes": "^0.0.2"
95+
"es-module-shims": "^1.8.2"
9796
},
9897
"devDependencies": {
9998
"@actions/core": "1.9.1",

0 commit comments

Comments
 (0)