Skip to content

Commit 500e585

Browse files
pbearnepbearne
authored
Merge branch 'WordPress:trunk' into 29849-Better-human_time_diff_core_changes
2 parents 294cf25 + 9b9049c commit 500e585

File tree

1,335 files changed

+80065
-40417
lines changed

Some content is hidden

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

1,335 files changed

+80065
-40417
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: 1 addition & 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

‎.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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,17 @@ 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+
cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]

‎.github/dependabot.yml‎

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,202 @@ updates:
1212
github-actions:
1313
patterns:
1414
- "*"
15+
16+
# Check for updates to Composer packages.
17+
- package-ecosystem: "composer"
18+
directory: "/"
19+
schedule:
20+
interval: "daily"
21+
open-pull-requests-limit: 10
22+
ignore:
23+
# These dependencies do not currently need to be managed with Dependabot.
24+
- dependency-name: "squizlabs/php_codesniffer"
25+
- dependency-name: "wp-coding-standards/wpcs"
26+
- dependency-name: "phpcompatibility/php-compatibility"
27+
- dependency-name: "yoast/phpunit-polyfills"
28+
groups:
29+
composer-packages:
30+
patterns:
31+
- "composer/ca-bundle"
32+
33+
# Monitor some npm dependencies for updates in groups.
34+
- package-ecosystem: "npm"
35+
directory: "/"
36+
schedule:
37+
interval: "daily"
38+
open-pull-requests-limit: 20
39+
ignore:
40+
- dependency-name: "@wordpress/*"
41+
groups:
42+
##
43+
# Groups for updating devDependencies.
44+
##
45+
46+
# Dependencies related to Playwright testing (E2E, performance).
47+
tests-playwright:
48+
patterns:
49+
- "*playwright*"
50+
# Dependencies related to JavaScript testing with QUnit.
51+
tests-qunit:
52+
patterns:
53+
- "*qunit*"
54+
- "sinon*"
55+
# Dependencies related to CSS and SASS building and manilupating.
56+
dev-css-sass:
57+
patterns:
58+
- "autoprefixer"
59+
# postcss and css related dependencies.
60+
- "*css*"
61+
- "*sass"
62+
# Dependencies related to the Webpack build process.
63+
dev-webpack:
64+
patterns:
65+
- "*webpack*"
66+
- "react-refresh"
67+
- "source-map-loader"
68+
# Dependencies related to the local Docker development environment.
69+
dev-docker:
70+
patterns:
71+
- "dotenv*"
72+
- "wait-on"
73+
# Dependencies that do not fall into a specific grouping.
74+
dev-miscellaneous:
75+
patterns:
76+
- "chalk"
77+
- "check-node-version"
78+
- "ink-docstrap"
79+
- "install-changed"
80+
- "matchdep"
81+
- "uuid"
82+
# Dependencies related to JavaScript minification.
83+
dev-uglify:
84+
patterns:
85+
- "*uglify*"
86+
# All GruntJS related dependencies that do not relate to another group.
87+
dev-grunt:
88+
patterns:
89+
- "*grunt*"
90+
91+
##
92+
# Groups for updating production dependencies.
93+
##
94+
95+
# Dependencies related to jQuery and its ecosystem.
96+
external-jquery:
97+
patterns:
98+
- "jquery*"
99+
# Dependencies related to React and its ecosystem.
100+
external-react:
101+
patterns:
102+
- "react*"
103+
- "!react-refresh"
104+
# Dependencies used for bundling polyfill libraries into WordPress.
105+
external-polyfills:
106+
patterns:
107+
- "core-js-url-browser"
108+
- "element-closest"
109+
- "formdata-polyfill"
110+
- "imagesloaded"
111+
- "objectFitPolyfill"
112+
- "polyfill-library"
113+
- "regenerator-runtime"
114+
- "whatwg-fetch"
115+
- "wicg-inert"
116+
# Dependencies related to the Masonry library.
117+
external-masonry:
118+
patterns:
119+
- "masonry-layout"
120+
# Dependencies that do not fall into a specific grouping.
121+
external-miscellaneous:
122+
patterns:
123+
- "backbone"
124+
- "clipboard"
125+
- "hoverintent"
126+
- "json2php"
127+
- "lodash"
128+
- "moment"
129+
- "underscore"
130+
131+
# Monitor npm dependencies within default themes.
132+
- package-ecosystem: "npm"
133+
directory: "/src/wp-content/themes/twentytwentyfive"
134+
schedule:
135+
interval: "weekly"
136+
open-pull-requests-limit: 20
137+
groups:
138+
twentytwentyfive-css:
139+
patterns:
140+
- "**browserslist*"
141+
- "*css*"
142+
143+
- package-ecosystem: "npm"
144+
directory: "/src/wp-content/themes/twentytwentytwo"
145+
schedule:
146+
interval: "weekly"
147+
open-pull-requests-limit: 20
148+
groups:
149+
twentytwentytwo-css:
150+
patterns:
151+
- "**browserslist*"
152+
- "*css*"
153+
154+
- package-ecosystem: "npm"
155+
directory: "/src/wp-content/themes/twentytwentyone"
156+
schedule:
157+
interval: "weekly"
158+
open-pull-requests-limit: 20
159+
groups:
160+
twentytwentyone-sass-css:
161+
patterns:
162+
- "**browserslist*"
163+
- "autoprefixer"
164+
- "*css*"
165+
- "*sass*"
166+
- "!*stylelint*"
167+
twentytwentyone-eslint:
168+
patterns:
169+
- "**eslint*"
170+
twentytwentyone-stylelint:
171+
patterns:
172+
- "**stylelint*"
173+
twentytwentyone-miscellaneous:
174+
patterns:
175+
- "chokidar-cli"
176+
- "minimist"
177+
- "npm-run-all"
178+
179+
- package-ecosystem: "npm"
180+
directory: "/src/wp-content/themes/twentytwenty"
181+
schedule:
182+
interval: "weekly"
183+
open-pull-requests-limit: 20
184+
groups:
185+
twentytwenty-css:
186+
patterns:
187+
- "**browserslist*"
188+
- "autoprefixer"
189+
- "*css*"
190+
twentytwenty-stylelint:
191+
patterns:
192+
- "*stylelint*"
193+
twentytwenty-miscellaneous:
194+
patterns:
195+
- "concurrently"
196+
- "@wordpress/scripts"
197+
198+
- package-ecosystem: "npm"
199+
directory: "/src/wp-content/themes/twentynineteen"
200+
schedule:
201+
interval: "weekly"
202+
open-pull-requests-limit: 20
203+
groups:
204+
twentynineteen-css-sass:
205+
patterns:
206+
- "**browserslist*"
207+
- "autoprefixer"
208+
- "*css*"
209+
- "*sass*"
210+
twentynineteen-miscellaneous:
211+
patterns:
212+
- "chokidar-cli"
213+
- "npm-run-all"

‎.github/workflows/check-built-files.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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/webpack/**'
27+
# These files configure Composer. Changes could affect the outcome.
28+
- 'composer.*'
29+
# Confirm any changes to relevant workflow files.
30+
- '.github/workflows/check-built-files.yml'
31+
# Changes to the default themes should be handled by the themes workflows.
32+
- '!src/wp-content/themes/twenty**'
33+
34+
# Cancels all previous workflow runs for pull requests that have not completed.
35+
concurrency:
36+
# The concurrency group contains the workflow name and the branch name for pull requests
37+
# or the commit hash for any other events.
38+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
39+
cancel-in-progress: true
40+
41+
# Disable permissions for all available scopes by default.
42+
# Any needed permissions should be configured at the job level.
43+
permissions: {}
44+
45+
jobs:
46+
check-for-built-file-changes:
47+
name: Check built files
48+
# This prevents an unnecessary second run after changes are committed back because Dependabot always rebases and force pushes.
49+
if: ${{ github.repository == 'wordpress/wordpress-develop' && ( github.actor != 'dependabot[bot]' || github.event.commits < 2 ) }}
50+
uses: ./.github/workflows/reusable-check-built-files.yml
51+
permissions:
52+
contents: read

‎.github/workflows/cleanup-pull-requests.yml‎

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)