Skip to content

Commit 16bf231

Browse files
authored
Merge branch 'trunk' into disable-pings-non-production
2 parents c66e1b2 + c37a60a commit 16bf231

File tree

2,356 files changed

+194846
-95764
lines changed

Some content is hidden

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

2,356 files changed

+194846
-95764
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "WordPress Core Development",
44
"dockerComposeFile": "docker-compose.yml",
55
"service": "app",
6-
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
6+
"workspaceFolder": "/workspace",
77

88
// Features to add to the dev container. More info: https://containers.dev/features.
99
"features": {

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
WORDPRESS_DB_PASSWORD: examplepass
1313
WORDPRESS_DB_NAME: exampledb
1414
volumes:
15-
- ../..:/workspaces:cached
15+
- ..:/workspace:cached
1616

1717
db:
1818
image: mariadb

.devcontainer/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else
99
fi
1010

1111
# Install dependencies
12-
cd /workspaces/wordpress-develop
12+
cd /workspace
1313
npm install && npm run build:dev
1414

1515
# Install WordPress and activate the plugin/theme.

.env.example

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ LOCAL_DB_TYPE=mysql
5151
# When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
5252
# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
5353
##
54-
LOCAL_DB_VERSION=8.0
54+
LOCAL_DB_VERSION=8.4
5555

5656
# Whether or not to enable multisite.
5757
LOCAL_MULTISITE=false
@@ -67,3 +67,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
6767

6868
# The URL to use when running e2e tests.
6969
WP_BASE_URL=http://localhost:${LOCAL_PORT}
70+
71+
##
72+
# This silences the tips output by the dotenv package.
73+
##
74+
DOTENV_CONFIG_QUIET=true

.eslintignore

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
# Files and folders related to build/test tools
1+
# Files and folders related to build/test tools including generated files
22
/build
33
/node_modules
44
/tests
55
/vendor
66
/tools
7+
/jsdoc
8+
/artifacts
9+
/coverage
10+
.cache/*
11+
/src/wp-includes/blocks/**/*.js
12+
/src/wp-includes/blocks/**/*.js.map
13+
/src/wp-admin/js
14+
/src/wp-includes/js
715

816
# Excluded files and folders based on `jsdoc.conf.json` exclusions
917
/src/js/_enqueues/vendor
1018

11-
# Webpack built files
12-
/src/wp-includes/js/media-*
13-
1419
# Themes
15-
src/wp-content/themes/
20+
src/wp-content/themes
21+
22+
# Files and folders that get created in wp-content
23+
/src/wp-content/plugins
24+
/src/wp-content/mu-plugins
25+
/src/wp-content/upgrade
26+
/src/wp-content/uploads

.git-blame-ignore-revs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,27 @@ f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
4848

4949
# Coding Standards
5050
8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]
51+
52+
# 6.8 Coding Standards
53+
a4d6fb7c96cb46859e6d48a5d4c06fdeea7d039b # [59292]
54+
9dd87b8f91300917447c271968d3c36289b440e8 # [59558]
55+
# 903b1fe840d4232bbc249d32d8981824e5fa71de # [59953] includes a punctuation change
56+
a96fa164b00ed51c7c0481574834cff92ab9b1f0 # [60043]
57+
7607cbc5d1e770451f1a2b61d851820dfa23bb43 # [60044]
58+
7047a91c0ecdbf43d4a7a0a591464cd1ed2f2c4b # [60046]
59+
1aa6da693ad739b78752a55d154cd48cb757b90b # [60047]
60+
d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
61+
a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
62+
63+
# 6.9 Coding Standards
64+
d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
65+
c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
66+
cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
67+
3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
68+
b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
69+
ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
70+
08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
71+
e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
72+
8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
73+
87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
74+
db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

.github/dependabot.yml

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

.github/pull_request_template.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,25 @@ If this is your first time contributing, you may also find reviewing these guide
1212
- Inline Documentation Standards: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/
1313
- Browser Support Policies: https://make.wordpress.org/core/handbook/best-practices/browser-support/
1414
- Proper spelling and grammar related best practices: https://make.wordpress.org/core/handbook/best-practices/spelling/
15+
- ✨ If you are using AI tools, you must adhere to the AI Guidelines: https://make.wordpress.org/ai/handbook/ai-guidelines/
1516
-->
1617

1718
<!-- Insert a description of your changes here -->
1819

1920
Trac ticket: <!-- insert a link to the WordPress Trac ticket here -->
2021

22+
## Use of AI Tools
23+
24+
<!--
25+
You are free to use artificial intelligence (AI) tooling to contribute, but you must disclose what tooling you are using and to what extent a pull request has been authored by AI. It is your responsibility to review and take responsibility for what AI generates. See the WordPress AI Guidelines: <https://make.wordpress.org/ai/handbook/ai-guidelines/>.
26+
27+
Example disclosure:
28+
29+
AI assistance: Yes
30+
Tool(s): GitHub Copilot, ChatGPT
31+
Model(s): GPT-5.1
32+
Used for: Initial code skeleton and test suggestions; final implementation and tests were reviewed and edited by me.
33+
-->
34+
2135
---
2236
**This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See [GitHub Pull Requests for Code Review](https://make.wordpress.org/core/handbook/contribute/git/github-pull-requests-for-code-review/) in the Core Handbook for more details.**
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Checks for uncommitted changes to built files in pull requests.
2+
name: Check Built Files (PRs)
3+
4+
on:
5+
# Because all commits happen through SVN and should always be manually reviewed by a committer, this workflow only
6+
# runs for pull requests.
7+
#
8+
# Other workflows that run for the push event will detect changes to versioned files and fail.
9+
pull_request:
10+
branches:
11+
- trunk
12+
- '6.[8-9]'
13+
- '[7-9].[0-9]'
14+
paths:
15+
# Any change to a CSS, JavaScript, JSON, or SASS file should run checks.
16+
- '**.css'
17+
- '**.js'
18+
- '**.json'
19+
- '**.sass'
20+
# These files configure npm and the task runner. Changes could affect the outcome.
21+
- 'package*.json'
22+
- '.npmrc'
23+
- '.nvmrc'
24+
- 'Gruntfile.js'
25+
- 'webpack.config.js'
26+
- 'tools/gutenberg/**'
27+
- 'tools/vendors/**'
28+
- 'tools/webpack/**'
29+
# These files configure Composer. Changes could affect the outcome.
30+
- 'composer.*'
31+
# Confirm any changes to relevant workflow files.
32+
- '.github/workflows/check-built-files.yml'
33+
- '.github/workflows/reusable-check-built-files.yml'
34+
# Changes to the default themes should be handled by the themes workflows.
35+
- '!src/wp-content/themes/twenty**'
36+
37+
# Cancels all previous workflow runs for pull requests that have not completed.
38+
concurrency:
39+
# The concurrency group contains the workflow name and the branch name for pull requests
40+
# or the commit hash for any other events.
41+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
42+
cancel-in-progress: true
43+
44+
# Disable permissions for all available scopes by default.
45+
# Any needed permissions should be configured at the job level.
46+
permissions: {}
47+
48+
jobs:
49+
check-for-built-file-changes:
50+
name: Check built files
51+
if: ${{ github.repository == 'wordpress/wordpress-develop' }}
52+
uses: ./.github/workflows/reusable-check-built-files.yml
53+
permissions:
54+
contents: read
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Cleanup Pull Requests
2+
3+
on:
4+
push:
5+
branches:
6+
- trunk
7+
- '4.[1-9]'
8+
- '[5-9].[0-9]'
9+
10+
# Cancels all previous workflow runs for pull requests that have not completed.
11+
concurrency:
12+
# The concurrency group contains the workflow name and the branch name for pull requests
13+
# or the commit hash for any other events.
14+
group: ${{ github.workflow }}-${{ github.sha }}
15+
cancel-in-progress: true
16+
17+
# Disable permissions for all available scopes by default.
18+
# Any needed permissions should be configured at the job level.
19+
permissions: {}
20+
21+
jobs:
22+
# Runs pull request cleanup.
23+
close-prs:
24+
name: Clean up pull requests
25+
permissions:
26+
pull-requests: write
27+
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
28+
uses: ./.github/workflows/reusable-cleanup-pull-requests.yml

0 commit comments

Comments
 (0)