Merge branch 'trunk' into fix/58789

Author: m1r0

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
     "name": "WordPress Core Development",
     "dockerComposeFile": "docker-compose.yml",
     "service": "app",
-    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+    "workspaceFolder": "/workspace",
 
     // Features to add to the dev container. More info: https://containers.dev/features.
     "features": {

.devcontainer/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       WORDPRESS_DB_PASSWORD: examplepass
       WORDPRESS_DB_NAME: exampledb
     volumes:
-      - ../..:/workspaces:cached
+      - ..:/workspace:cached
 
   db:
     image: mariadb

.devcontainer/setup.sh

@@ -9,7 +9,7 @@ else
 fi
 
 # Install dependencies
-cd /workspaces/wordpress-develop
+cd /workspace
 npm install && npm run build:dev
 
 # Install WordPress and activate the plugin/theme.

.env .env.example.env renamed to .env.example

@@ -51,7 +51,7 @@ LOCAL_DB_TYPE=mysql
 # When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
 ##
-LOCAL_DB_VERSION=8.0
+LOCAL_DB_VERSION=8.4
 
 # Whether or not to enable multisite.
 LOCAL_MULTISITE=false
@@ -67,3 +67,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
 
 # The URL to use when running e2e tests.
 WP_BASE_URL=http://localhost:${LOCAL_PORT}
+
+##
+# This silences the tips output by the dotenv package.
+##
+DOTENV_CONFIG_QUIET=true

.eslintignore

@@ -1,15 +1,26 @@
-# Files and folders related to build/test tools
+# Files and folders related to build/test tools including generated files
 /build
 /node_modules
 /tests
 /vendor
 /tools
+/jsdoc
+/artifacts
+/coverage
+.cache/*
+/src/wp-includes/blocks/**/*.js
+/src/wp-includes/blocks/**/*.js.map
+/src/wp-admin/js
+/src/wp-includes/js
 
 # Excluded files and folders based on `jsdoc.conf.json` exclusions
 /src/js/_enqueues/vendor
 
-# Webpack built files
-/src/wp-includes/js/media-*
-
 # Themes
-src/wp-content/themes/
+src/wp-content/themes
+
+# Files and folders that get created in wp-content
+/src/wp-content/plugins
+/src/wp-content/mu-plugins
+/src/wp-content/upgrade
+/src/wp-content/uploads

.git-blame-ignore-revs

@@ -48,3 +48,27 @@ f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
 
 # Coding Standards
 8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]
+
+# 6.8 Coding Standards
+a4d6fb7c96cb46859e6d48a5d4c06fdeea7d039b # [59292]
+9dd87b8f91300917447c271968d3c36289b440e8 # [59558]
+# 903b1fe840d4232bbc249d32d8981824e5fa71de # [59953] includes a punctuation change
+a96fa164b00ed51c7c0481574834cff92ab9b1f0 # [60043]
+7607cbc5d1e770451f1a2b61d851820dfa23bb43 # [60044]
+7047a91c0ecdbf43d4a7a0a591464cd1ed2f2c4b # [60046]
+1aa6da693ad739b78752a55d154cd48cb757b90b # [60047]
+d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
+a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
+
+# 6.9 Coding Standards
+d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
+c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
+cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
+3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
+b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
+ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
+08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
+e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
+8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
+87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
+db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

.github/dependabot.yml

@@ -0,0 +1,51 @@
+# Checks for uncommitted changes to built files in pull requests.
+name: Check Built Files (PRs)
+
+on:
+  # Because all commits happen through SVN and should always be manually reviewed by a committer, this workflow only
+  # runs for pull requests.
+  #
+  # Other workflows that run for the push event will detect changes to versioned files and fail.
+  pull_request:
+    branches:
+      - trunk
+      - '6.[8-9]'
+      - '[7-9].[0-9]'
+    paths:
+      # Any change to a CSS, JavaScript, JSON, or SASS file should run checks.
+      - '**.css'
+      - '**.js'
+      - '**.json'
+      - '**.sass'
+      # These files configure npm and the task runner. Changes could affect the outcome.
+      - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
+      - 'Gruntfile.js'
+      - 'webpack.config.js'
+      - 'tools/webpack/**'
+      # These files configure Composer. Changes could affect the outcome.
+      - 'composer.*'
+      # Confirm any changes to relevant workflow files.
+      - '.github/workflows/check-built-files.yml'
+      # Changes to the default themes should be handled by the themes workflows.
+      - '!src/wp-content/themes/twenty**'
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for pull requests
+  # or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+  check-for-built-file-changes:
+    name: Check built files
+    if: ${{ github.repository == 'wordpress/wordpress-develop' }}
+    uses: ./.github/workflows/reusable-check-built-files.yml
+    permissions:
+      contents: read

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

@@ -0,0 +1,28 @@
+name: Cleanup Pull Requests
+
+on:
+  push:
+    branches:
+      - trunk
+      - '4.[1-9]'
+      - '[5-9].[0-9]'
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for pull requests
+  # or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+  # Runs pull request cleanup.
+  close-prs:
+    name: Clean up pull requests
+    permissions:
+      pull-requests: write
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
+    uses: ./.github/workflows/reusable-cleanup-pull-requests.yml

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

@@ -9,9 +9,10 @@ on:
       - '3.[89]'
       - '[4-9].[0-9]'
     tags:
-      - '[0-9]+.[0-9]'
-      - '[0-9]+.[0-9].[0-9]+'
-      - '!3.7.[0-9]+'
+      - '3.[89]'
+      - '3.[89].[0-9]+'
+      - '[4-9].[0-9]'
+      - '[4-9].[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk
@@ -23,14 +24,17 @@ on:
       - '**.php'
       # These files configure npm. Changes could affect the outcome.
       - 'package*.json'
+      - '.npmrc'
+      - '.nvmrc'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
       # This file configures JSHint. Changes could affect the outcome.
       - '.jshintrc'
       # This file configures PHPCS. Changes could affect the outcome.
       - 'phpcs.xml.dist'
-      # Changes to workflow files should always verify all workflows are successful.
-      - '.github/workflows/*.yml'
+      # Confirm any changes to relevant workflow files.
+      - '.github/workflows/coding-standards.yml'
+      - '.github/workflows/reusable-coding-standards-*.yml'
   workflow_dispatch:
 
 # Cancels all previous workflow runs for pull requests that have not completed.
@@ -47,23 +51,23 @@ permissions: {}
 jobs:
   # Runs the PHP coding standards checks.
   phpcs:
-    name: PHP coding standards
-    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
+    name: Coding standards
+    uses: ./.github/workflows/reusable-coding-standards-php.yml
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   # Runs the JavaScript coding standards checks.
   jshint:
-    name: JavaScript coding standards
-    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
+    name: Coding standards
+    uses: ./.github/workflows/reusable-coding-standards-javascript.yml
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
   slack-notifications:
     name: Slack Notifications
-    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    uses: ./.github/workflows/slack-notifications.yml
     permissions:
       actions: read
       contents: read
@@ -79,7 +83,7 @@ jobs:
 
   failed-workflow:
     name: Failed workflow tasks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       actions: write
     needs: [ phpcs, jshint, slack-notifications ]
@@ -95,7 +99,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           retries: 2
           retry-exempt-status-codes: 418
@@ -106,6 +110,6 @@ jobs:
               workflow_id: 'failed-workflow.yml',
               ref: 'trunk',
               inputs: {
-                run_id: '${{ github.run_id }}'
+                run_id: `${context.runId}`,
               }
             });