Skip to content

Commit b301159

Browse files
committed
Merge branch 'trunk' into streamline-validation
# Conflicts: # packages/components/CHANGELOG.md
2 parents 3edd884 + 6bbe30d commit b301159

File tree

210 files changed

+5114
-3372
lines changed

Some content is hidden

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

210 files changed

+5114
-3372
lines changed

.eslintrc.js

Lines changed: 1 addition & 14 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.
@@ -71,14 +68,6 @@ const restrictedImports = [
7168
];
7269

7370
const restrictedSyntax = [
74-
// NOTE: We can't include the forward slash in our regex or
75-
// we'll get a `SyntaxError` (Invalid regular expression: \ at end of pattern)
76-
// here. That's why we use \\u002F in the regexes below.
77-
{
78-
selector:
79-
'ImportDeclaration[source.value=/^@wordpress\\u002F.+\\u002F/]:not([source.value=/^@wordpress\\u002F.+\\u002Fbuild-types\\u002F/])',
80-
message: 'Path access on WordPress dependencies is not allowed.',
81-
},
8271
{
8372
selector:
8473
'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
@@ -145,7 +134,6 @@ module.exports = {
145134
jsdoc: {
146135
mode: 'typescript',
147136
},
148-
'import/internal-regex': null,
149137
'import/resolver': require.resolve( './tools/eslint/import-resolver' ),
150138
},
151139
rules: {
@@ -155,7 +143,6 @@ module.exports = {
155143
'error',
156144
{ props: 'never', children: 'never' },
157145
],
158-
'@wordpress/dependency-group': 'error',
159146
'@wordpress/wp-global-usage': 'error',
160147
'@wordpress/react-no-unsafe-timeout': 'error',
161148
'@wordpress/i18n-hyphenated-range': 'error',

.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/build-plugin-zip.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
steps:
8383
- name: Checkout code
84-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
84+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
8585
with:
8686
token: ${{ secrets.GUTENBERG_TOKEN }}
8787
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
@@ -195,14 +195,14 @@ jobs:
195195

196196
steps:
197197
- name: Checkout code
198-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
198+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
199199
with:
200200
ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
201201
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
202202
persist-credentials: false
203203

204204
- name: Use desired version of Node.js
205-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
205+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
206206
with:
207207
node-version-file: '.nvmrc'
208208
check-latest: true
@@ -254,7 +254,7 @@ jobs:
254254
255255
steps:
256256
- name: Checkout code
257-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
257+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
258258
with:
259259
fetch-depth: 2
260260
ref: ${{ needs.bump-version.outputs.release_branch }}
@@ -355,15 +355,15 @@ jobs:
355355
if: ${{ endsWith( needs.bump-version.outputs.new_version, '-rc.1' ) }}
356356
steps:
357357
- name: Checkout (for CLI)
358-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
358+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
359359
with:
360360
path: main
361361
ref: trunk
362362
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
363363
persist-credentials: false
364364

365365
- name: Checkout (for publishing)
366-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
366+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
367367
with:
368368
path: publish
369369
# Later, we switch this branch in the script that publishes packages.
@@ -379,7 +379,7 @@ jobs:
379379
git config user.email [email protected]
380380
381381
- name: Setup Node.js
382-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
382+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
383383
with:
384384
node-version-file: 'main/.nvmrc'
385385
registry-url: 'https://registry.npmjs.org'

.github/workflows/bundle-size.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ jobs:
4545
pull-requests: write
4646

4747
steps:
48-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
48+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4949
with:
5050
fetch-depth: 1
5151
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
5252
persist-credentials: false
5353

5454
- name: Use desired version of Node.js
55-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
55+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
5656
with:
5757
node-version-file: '.nvmrc'
5858
check-latest: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
contents: read
3232
if: ${{ !contains(github.event.pull_request.labels.*.name, 'No Core Sync Required') && !contains(github.event.pull_request.labels.*.name, 'Backport from WordPress Core') }}
3333
steps:
34-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
ref: ${{ github.event.pull_request.head.ref }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
PR_COUNT: ${{ github.event.pull_request.commits }}
3232
run: echo "PR_COMMIT_COUNT=$(( PR_COUNT + 1 ))" >> "${GITHUB_ENV}"
3333
- name: Checkout code
34-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
34+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
ref: ${{ github.event.pull_request.head.ref }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
PR_COUNT: ${{ github.event.pull_request.commits }}
3232
run: echo "PR_COMMIT_COUNT=$(( PR_COUNT + 1 ))" >> "${GITHUB_ENV}"
3333
- name: Checkout code
34-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
34+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
ref: ${{ github.event.pull_request.head.ref }}
3737
repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/cherry-pick-wp-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
7979
- name: Checkout repository
8080
if: env.cherry_pick == 'true'
81-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
81+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
8282
with:
8383
token: ${{ secrets.GUTENBERG_TOKEN }}
8484
fetch-depth: 0

.github/workflows/create-block.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
os: 'windows-2025'
4242

4343
steps:
44-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
44+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4545
with:
4646
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
4747
persist-credentials: false

.github/workflows/end2end-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
totalParts: [8]
3434

3535
steps:
36-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
36+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3737
with:
3838
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3939
persist-credentials: false
@@ -116,7 +116,7 @@ jobs:
116116
steps:
117117
# Checkout defaults to using the branch which triggered the event, which
118118
# isn't necessarily `trunk` (e.g. in the case of a merge).
119-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
119+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
120120
with:
121121
ref: trunk
122122
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}

0 commit comments

Comments
 (0)