Skip to content

Commit ef5b124

Browse files
authored
Merge branch 'trunk' into scruffian/fix-randomuuid-crash
2 parents f6caaaa + 924f82e commit ef5b124

File tree

77 files changed

+2050
-940
lines changed

Some content is hidden

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

77 files changed

+2050
-940
lines changed

‎.github/setup-node/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Use desired version of Node.js
13-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
13+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
1414
with:
1515
node-version-file: ${{ inputs.node-version == '' && '.nvmrc' || '' }}
1616
node-version: ${{ inputs.node-version }}

‎.github/workflows/build-plugin-zip.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
persist-credentials: false
203203

204204
- name: Use desired version of Node.js
205-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
205+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
206206
with:
207207
node-version-file: '.nvmrc'
208208
check-latest: true
@@ -379,7 +379,7 @@ jobs:
379379
git config user.email gutenberg@wordpress.org
380380
381381
- name: Setup Node.js
382-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
382+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
383383
with:
384384
node-version-file: 'main/.nvmrc'
385385
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/bundle-size.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
persist-credentials: false
5757

5858
- name: Use desired version of Node.js
59-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
59+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
6060
with:
6161
node-version-file: '.nvmrc'
6262
check-latest: true

‎.github/workflows/publish-npm-packages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ jobs:
7777
7878
- name: Setup Node.js
7979
if: ${{ github.event.inputs.release_type != 'wp' }}
80-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
80+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
8181
with:
8282
node-version-file: 'cli/.nvmrc'
8383
registry-url: 'https://registry.npmjs.org'
8484
check-latest: true
8585

8686
- name: Setup Node.js (for WP major version)
8787
if: ${{ github.event.inputs.release_type == 'wp' && github.event.inputs.wp_version }}
88-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
88+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
8989
with:
9090
node-version-file: 'publish/.nvmrc'
9191
registry-url: 'https://registry.npmjs.org'

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ jobs:
3333
event: ['${{ github.event_name }}']
3434
node: ['20', '22', '24']
3535
os: ['macos-15', 'ubuntu-24.04', 'windows-2025']
36+
37+
include:
38+
# Only generate annotations once.
39+
- node: '24'
40+
os: 'ubuntu-24.04'
41+
annotations: true
3642
exclude:
3743
# On PRs: Only test Node 20 on Ubuntu and Windows
3844
- event: 'pull_request'
@@ -47,14 +53,15 @@ jobs:
4753
persist-credentials: false
4854

4955
- name: Use desired version of Node.js
50-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
56+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
5157
with:
5258
node-version: ${{ matrix.node }}
59+
cache: npm
5360

5461
- name: Pin npm version for consistency
5562
run: npm install -g npm@10
5663

57-
- name: Npm install
64+
- name: npm install
5865
# A "full" install is executed, since `npm ci` does not always exit
5966
# with an error status code if the lock file is inaccurate. This also
6067
# helps to catch dependencies not being installed with exact version.
@@ -63,8 +70,22 @@ jobs:
6370
# See: https://github.com/WordPress/gutenberg/pull/39865
6471
run: npm install
6572

66-
- name: Lint JavaScript and Styles
67-
run: npm run lint
73+
- name: Lint package.json files
74+
run: npm run lint:pkg-json
75+
76+
- name: Lint package-lock.json file
77+
run: npm run lint:lockfile
78+
79+
- name: Validate TypeScript config
80+
run: npm run lint:tsconfig
81+
82+
- name: Lint JavaScript
83+
if: ${{ matrix.annotations }}
84+
run: npm run lint:js -- --format compact
85+
86+
- name: Lint Styles
87+
if: ${{ matrix.annotations }}
88+
run: npm run lint:css -- --formatter compact
6889

6990
- name: Type checking
7091
run: npm run build

‎backport-changelog/7.0/10894.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ https://github.com/WordPress/wordpress-develop/pull/10894
55
* https://github.com/WordPress/gutenberg/pull/75682
66
* https://github.com/WordPress/gutenberg/pull/75708
77
* https://github.com/WordPress/gutenberg/pull/75711
8-
* https://github.com/WordPress/gutenberg/pull/75746
98
* https://github.com/WordPress/gutenberg/pull/75869
10-
* https://github.com/WordPress/gutenberg/pull/76060

‎backport-changelog/7.0/10981.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/10981
2+
3+
* https://github.com/WordPress/gutenberg/pull/75746

‎backport-changelog/7.0/11118.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11118
2+
3+
* https://github.com/WordPress/gutenberg/pull/76060

‎backport-changelog/7.0/11120.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11120
2+
3+
* https://github.com/WordPress/gutenberg/pull/76056

‎backport-changelog/7.0/11161.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://github.com/WordPress/wordpress-develop/pull/11161
2+
3+
* https://github.com/WordPress/gutenberg/pull/75739

0 commit comments

Comments
 (0)