Skip to content

Commit d831cc3

Browse files
roborourkeroborourke
authored
Merge branch 'trunk' into fixes-65082-oembed-maxwidth
2 parents 2519bd1 + bccb9c1 commit d831cc3

5,317 files changed

Lines changed: 708158 additions & 230482 deletions

File tree

Some content is hidden

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

‎.cache/.gitkeep‎

Whitespace-only changes.

‎.devcontainer/devcontainer.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// For format details, see https://aka.ms/devcontainer.json.
2+
{
3+
"name": "WordPress Core Development",
4+
"dockerComposeFile": "docker-compose.yml",
5+
"service": "app",
6+
"workspaceFolder": "/workspace",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/common-utils:2": {
11+
"username": "wordpress"
12+
},
13+
"ghcr.io/devcontainers/features/node:1": {
14+
"version": "20"
15+
},
16+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
17+
"ghcr.io/devcontainers/features/git:1": {}
18+
},
19+
"onCreateCommand": "sudo chmod +x .devcontainer/install-tools.sh && .devcontainer/install-tools.sh",
20+
"postCreateCommand": "sudo chmod +x .devcontainer/setup.sh && .devcontainer/setup.sh",
21+
"forwardPorts": [
22+
8080
23+
],
24+
"remoteUser": "wordpress"
25+
}

‎.devcontainer/docker-compose.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: '3.1'
2+
3+
services:
4+
app:
5+
image: wordpress
6+
restart: always
7+
ports:
8+
- 8080:80
9+
environment:
10+
WORDPRESS_DB_HOST: db
11+
WORDPRESS_DB_USER: exampleuser
12+
WORDPRESS_DB_PASSWORD: examplepass
13+
WORDPRESS_DB_NAME: exampledb
14+
volumes:
15+
- ..:/workspace:cached
16+
17+
db:
18+
image: mariadb
19+
restart: unless-stopped
20+
environment:
21+
MYSQL_DATABASE: exampledb
22+
MYSQL_USER: exampleuser
23+
MYSQL_PASSWORD: examplepass
24+
MYSQL_RANDOM_ROOT_PASSWORD: '1'
25+
volumes:
26+
- db:/var/lib/mysql
27+
28+
volumes:
29+
db:

‎.devcontainer/install-tools.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
3+
set -eux
4+
5+
echo "Installing wp-cli..."
6+
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
7+
sudo chmod +x wp-cli.phar
8+
sudo mv wp-cli.phar /usr/local/bin/wp
9+
10+
echo "Installing chromium..."
11+
sudo apt-get update
12+
sudo apt-get -y install --no-install-recommends chromium
13+
14+
# Copy the welcome message
15+
sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt

‎.devcontainer/setup.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
set -eux
4+
5+
if [ -z ${CODESPACE_NAME+x} ]; then
6+
SITE_HOST="http://localhost:8080"
7+
else
8+
SITE_HOST="https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
9+
fi
10+
11+
# Install dependencies
12+
cd /workspace
13+
npm install && npm run build:dev
14+
15+
# Install WordPress and activate the plugin/theme.
16+
cd /var/www/html
17+
echo "Setting up WordPress at $SITE_HOST"
18+
wp core install --url="$SITE_HOST" --title="WordPress Trunk" --admin_user="admin" --admin_email="[email protected]" --admin_password="password" --skip-email

‎.devcontainer/welcome-message.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
👋 Welcome to "WordPress Core Development" in Codespaces!
2+
3+
🛠️ Your environment is fully setup with all the required software.
4+
5+
🚀 To get started, wait for the "postCreateCommand" to finish setting things up, then open the portforwarded URL and append '/wp-admin'.
6+

‎.env‎

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

‎.env.example‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
##
2+
# Default configuration options for the local dev environment.
3+
#
4+
# All of these options can be overridden by setting them as environment variables before starting
5+
# the environment. You will need to restart your environment when changing any of these.
6+
#
7+
# Below, the following substitutions can be made:
8+
# - '{version}': any major.minor PHP version from 5.2 onwards.
9+
##
10+
11+
# The site will be available at http://localhost:LOCAL_PORT
12+
LOCAL_PORT=8889
13+
14+
# Where to run WordPress from. Valid options are 'src' and 'build'.
15+
LOCAL_DIR=src
16+
17+
# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
18+
LOCAL_PHP=latest
19+
20+
# Whether or not to enable Xdebug.
21+
LOCAL_PHP_XDEBUG=false
22+
23+
##
24+
# The Xdebug features to enable.
25+
#
26+
# By default, the following features are enabled in the local environment:
27+
# - Development helpers (`develop`).
28+
# - Step debugging (`debug`).
29+
#
30+
# To generate a code coverage report, `coverage` mode must be active.
31+
#
32+
# For a full list of accepted values, see https://xdebug.org/docs/all_settings#mode.
33+
##
34+
LOCAL_PHP_XDEBUG_MODE=develop,debug
35+
36+
# Whether or not to enable Memcached.
37+
LOCAL_PHP_MEMCACHED=false
38+
39+
##
40+
# The database software to use.
41+
#
42+
# Supported values are `mysql` and `mariadb`.
43+
##
44+
LOCAL_DB_TYPE=mysql
45+
46+
##
47+
# The database version to use.
48+
#
49+
# Defaults to 8.0 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
50+
#
51+
# When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
52+
# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
53+
##
54+
LOCAL_DB_VERSION=8.4
55+
56+
# Whether or not to enable multisite.
57+
LOCAL_MULTISITE=false
58+
59+
# The debug settings to add to `wp-config.php`.
60+
LOCAL_WP_DEBUG=true
61+
LOCAL_WP_DEBUG_LOG=true
62+
LOCAL_WP_DEBUG_DISPLAY=true
63+
LOCAL_SCRIPT_DEBUG=true
64+
LOCAL_WP_ENVIRONMENT_TYPE=local
65+
LOCAL_WP_DEVELOPMENT_MODE=core
66+
LOCAL_WP_TESTS_DOMAIN=example.org
67+
68+
# The URL to use when running e2e tests.
69+
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: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Pinking shears
2+
a4789b3cc1cb59e5cd062670f4439f264c0d34f3 # [12042]
3+
fb4e38b0e750c0cab5eb4c50532da93e2d9882b3 # [15843]
4+
4b33a0e9c45d67c5f3123577262f73727444254a # [16438]
5+
fa33255b567df6b19ccc3a61824ad243db116993 # [16439]
6+
46d96c7704b978b9d070bfec1cb1a33e4caf46b0 # [18254]
7+
feaf2597bf16b1bd6b489a0e5680501f12990bee # [18276]
8+
9e7890c3f61781200b9337186d85cd4034edac61 # [18386]
9+
fd10e500e47ca1ae3280ac6817e725965f7fc0dc # [19054]
10+
6610e321e79d9b56c6fc496b6630dd2ac664a0d3 # [19528]
11+
d26f0a4c407a5d13a095c7676b397e51a959d82c # [19577]
12+
89e9bcc1d69ebbac01c8c4501f9066e421125e66 # [20000]
13+
8c50f982ea9784fe06844ce84b1a3297b1241442 # [20715]
14+
b6e23d7269e50296270f93dda96dacb118bee8b3 # [20944]
15+
48a3ec24c5ea7615431bde431098546674a0096c # [21070]
16+
2439e4d722f5093631c4bac9a45106ab33624aaa # [21381]
17+
56c4577feae624f7a3bf55d001295e0707c972b6 # [21486]
18+
680b671330327f2568549dec9460a2e942219d55 # [21492]
19+
dd39a3b3d2d1f792b6ed8e88b1fcc13877fbd8dd # [22491]
20+
6d8bce688f5215ad20133b2cefedc72ac5136be3 # [22634]
21+
05c0f14024a2bb8ef9bdfcb84589d04205f8ce24 # [23679]
22+
ece7a7714477142d4cdb3269d2f9ad3d5dab2e5f # [23780]
23+
687d1a2ce992a0e7e24675b506b85a57e42fe78e # [24303]
24+
45d2a20783460667f85d5fdced422efd54c33b72 # [24603]
25+
c8889d984fd98381d6f0bd3228972e93348f1266 # [25085]
26+
# 21da24227f2c0087c95f44c60b1bca65cedf0611 # [25824] includes a punctuation change
27+
30f822b8ee767c0b07fe1780f2829de0cba8c314 # [25880]
28+
1cdb0ac2fa5452e58d7a002b260d594a581af02e # [26475]
29+
37a37b5fc578d945376cf3b66b4a23265d6491f3 # [26597]
30+
bda43fd1071ed45ded3def7872866f62e40af9f5 # [26627]
31+
98fe4a5aedfdaa8c769bf2aaedc58eb63d342320 # [26631]
32+
d6e06a2ee5c15b19ca80b9162f3e19c06b5af34d # [26714]
33+
cfd5c395bb3ba810edaec6cf4483212181823d2e # [26851]
34+
2ec5e68249bdacee9ac0ce59fad91b1149244af8 # [27123]
35+
305e72859a4154fc96bac7774ab7808ead6a06d4 # [29169]
36+
ca32a2d410f954b6b40d23f3392ba53e62a3d9f1 # [29707]
37+
48a504cc50a16f60a395ace8d133130e3d6962f5 # [30047]
38+
b539bd985bdf2dde162f46fcbf14e51e46ff8be7 # [30372]
39+
9a3942ffd82b28a77982e0a0d1c2bb0b8a70ce44 # [30996]
40+
469164785ff8defefbfcdf972c57d9004c273256 # [31077]
41+
c4e9c64233166957cd1cbcc54ff54b1a02edd3b5 # [31623]
42+
f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
43+
0ec540b946eaebebc7e8ee39a8e4738914e7f2a3 # [33627]
44+
0c5bd752629b0960c6f43ca212a64724e4f40346 # [34534]
45+
991feb70438e981290696fa2b4fbe2ea54696a02 # [34774]
46+
6911ff11308089eace23719fc50160d403081a8e # [35627]
47+
8df8cf2df14fe26174f97af5bb17d63f2e867231 # [42843]
48+
49+
# Coding Standards
50+
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]

0 commit comments

Comments
 (0)