Skip to content

Commit 6d9b90e

Browse files
t-hamanot-hamano
committed
Merge branch 'trunk' into block-api-version-deprecated-log
2 parents a0cc46e + 615c0f2 commit 6d9b90e

File tree

428 files changed

+11591
-6518
lines changed

Some content is hidden

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

428 files changed

+11591
-6518
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
/**
2-
* External dependencies
3-
*/
4-
const glob = require( 'glob' ).sync;
51
const { join } = require( 'path' );
2+
const glob = require( 'glob' ).sync;
63

74
/**
85
* The list of patterns matching files used only for development purposes.
@@ -146,7 +143,6 @@ module.exports = {
146143
'error',
147144
{ props: 'never', children: 'never' },
148145
],
149-
'@wordpress/dependency-group': 'error',
150146
'@wordpress/wp-global-usage': 'error',
151147
'@wordpress/react-no-unsafe-timeout': 'error',
152148
'@wordpress/i18n-hyphenated-range': 'error',
@@ -282,14 +278,11 @@ module.exports = {
282278
// Temporary rules until we're ready to officially deprecate the bottom margins.
283279
...[
284280
'BaseControl',
285-
'CheckboxControl',
286281
'ComboboxControl',
287-
'DimensionControl',
288282
'FocalPointPicker',
289283
'RangeControl',
290284
'SearchControl',
291285
'SelectControl',
292-
'TextControl',
293286
'TextareaControl',
294287
'ToggleControl',
295288
'ToggleGroupControl',

‎.eslintrc.strict.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Stricter ESLint configuration for modified files (used by lint-staged).
3+
* This extends the base config and adds additional rules that we want to
4+
* enforce only on new/modified code.
5+
*/
6+
module.exports = {
7+
extends: [ './.eslintrc.js' ],
8+
rules: {
9+
// Enforce import ordering on modified files
10+
'import/order': [
11+
'error',
12+
{
13+
groups: [
14+
'builtin', // Node.js built-in modules
15+
'external', // npm packages
16+
'internal', // Aliased modules
17+
[ 'parent', 'sibling', 'index' ], // Relative imports
18+
],
19+
},
20+
],
21+
},
22+
};

‎.github/workflows/notify-slack-on-label.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Notify Slack on Needs Testing Label
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
pull_request:
7+
types: [labeled]
8+
9+
jobs:
10+
notify:
11+
if: ${{ github.event.label.name == 'Needs Testing' }}
12+
runs-on: ubuntu-latest
13+
permissions: {}
14+
env:
15+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_NEEDS_TESTING_LABEL_ADDED_WEBHOOK_URL }}
16+
steps:
17+
- name: Skip when webhook is unavailable
18+
if: ${{ env.SLACK_WEBHOOK_URL == '' }}
19+
run: echo "SLACK_NEEDS_TESTING_LABEL_ADDED_WEBHOOK_URL is not available; skipping notification."
20+
21+
- name: Send custom HTTP request with testing data
22+
if: ${{ env.SLACK_WEBHOOK_URL != '' }}
23+
env:
24+
TARGET_URL: ${{ github.event_name == 'issues' && github.event.issue.html_url || github.event.pull_request.html_url }}
25+
TARGET_TYPE: ${{ github.event_name }}
26+
TARGET_TITLE: ${{ github.event_name == 'issues' && github.event.issue.title || github.event.pull_request.title }}
27+
run: |
28+
payload=$(jq -n --arg url "$TARGET_URL" --arg type "$TARGET_TYPE" --arg title "$TARGET_TITLE" '{url:$url,type:$type,title:$title}')
29+
30+
curl -X POST -H "Content-Type: application/json" -d "$payload" "$SLACK_WEBHOOK_URL"

‎.github/workflows/static-checks.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ jobs:
3434
node: ['20', '22', '24']
3535
os: ['macos-15', 'ubuntu-24.04', 'windows-2025']
3636
exclude:
37-
# On PRs: Only test Node 20 on Ubuntu
37+
# On PRs: Only test Node 20 on Ubuntu and Windows
3838
- event: 'pull_request'
3939
node: '22'
4040
- event: 'pull_request'
4141
node: '24'
4242
- event: 'pull_request'
4343
os: 'macos-15'
44-
- event: 'pull_request'
45-
os: 'windows-2025'
4644

4745
steps:
4846
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Artemio Morales <[email protected]> <[email protected]>
4141
Ben Dwyer <[email protected]> <[email protected]>
4242
Bernie Reiter <[email protected]> <[email protected]>
4343
Bernie Reiter <[email protected]> <[email protected]>
44+
Carlos Bravo <[email protected]> <[email protected]>
45+
Carlos Bravo <[email protected]> <[email protected]>
4446
Carolina Nymark <[email protected]> <[email protected]>
4547
Carolina Nymark <[email protected]> <[email protected]>
4648
Daniel Richards <[email protected]> <[email protected]>

‎bin/check-local-changes.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ SimpleGit()
4141

4242
if ( !! nonOptionalDiff ) {
4343
console.error(
44-
"There are local uncommitted changes after one or both of 'npm install' or 'npm run docs:build'!\n"
44+
`There are local changes after running one or more of the following commands:
45+
46+
- npm install
47+
- npm run docs:build
48+
- npm run --workspace @wordpress/theme build
49+
50+
Run these commands in your local environment and commit the resulting changes to resolve the issue.
51+
`
4552
);
4653
console.log( nonOptionalDiff );
4754
process.exitCode = 1;

0 commit comments

Comments
 (0)