Merge branch 'main' into mdx-and-css-fixes

gatsby-node.js

@@ -410,22 +410,7 @@ exports.createPages = ({ graphql, actions }) => {
     // And can reused the code above.
     createPage({
       path: `/release-notes/`,
-      component: path.resolve("./src/templates/releaseNotesListing.js"),
-    })
-
-    // Create Terminus Command pages
-    const allReleaseNoteCategories =
-      result.data.releasenotescategoriesJson.categories
-    allReleaseNoteCategories.forEach((category) => {
-      createPage({
-        path: `/release-notes/${category.slug}`,
-        component: path.resolve(
-          "./src/templates/releaseNotesListingByCategory.js"
-        ),
-        context: {
-          category: category.slug,
-        },
-      })
+      component: path.resolve("./src/templates/releaseNotesListing/index.js"),
     })
 
     // terminusCommands.forEach(command => {

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@pantheon-systems/pds-toolkit-react": "^1.0.0-dev.106",
+    "@pantheon-systems/pds-toolkit-react": "^1.0.0-dev.115",
     "algoliasearch": "^4.14.3",
     "babel-plugin-remove-graphql-queries": "^4.25.0",
     "bootstrap": "^3.4.1",

source/content/caching-advanced-topics.md

@@ -225,7 +225,7 @@ Pantheon strips cookies for any file ending with the following extensions, even
 
 ## 404s
 
-Pantheon’s default is to not cache 404s, but if your application sets `Cache-Control:max-age headers`, the Global CDN will respect them. Depending on your use case, that may be the desired result.
+Pantheon’s default is to not cache 404s, but if your application sets `Cache-Control:max-age` headers, the Global CDN will respect them. Depending on your use case, that may be the desired result.
 
 <TabList>
 

source/content/certification/study-guide-cms/09-automate.md

@@ -79,7 +79,7 @@ Pantheon offers several paths to help you launch a Drupal site that leverages In
 * If you are using a deprecated Pantheon Drupal Upstream and would like to convert your site from one of the deprecated upstreams to the supported `drupal-composer-managed` upstream, you can use the [Terminus Conversion Tools Plugin](https://github.com/pantheon-systems/terminus-conversion-tools-plugin).
 
 ### WordPress with Integrated Composer
-Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) upstream. You can use this upstream to create an Integrated Composer WordPress site with Bedrock. This upstream is currently in EA.
+Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/wordpress-composer-managed) upstream. You can use this upstream to create an Integrated Composer WordPress site with Bedrock. This upstream is currently in EA.
 
 #### Adding and Removing Dependencies with Integrated Composer
 

source/content/guides/agcdn/03-agcdn-wafio.md

@@ -21,9 +21,16 @@ This section provides detailed information on AGCDN with WAF and IO features. AG
 
 Application-layer (OSI Layer 7) protection meets [OWASP guidelines](https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html#general-categories-and-basic-controls). This protection simplifies event monitoring and mitigation without requiring changes that introduce latency.
 
-The AGCDN Web Application Firewall (**WAF**) inspects each packet in detail to block malicious traffic and is fine-tuned for WordPress and Drupal.
+The AGCDN Web Application Firewall (**WAF**) inspects each packet in detail to block malicious traffic and is fine-tuned for WordPress and Drupal. It provides a layer of protection against:
 
-Support for XSS vulnerabilities.
+* SQL Injection (SQLi)
+* Cross Site Request Forgery (CSRF)
+* Cross Site Scripting (XSS)
+* Remote and Local File Inclusion (RFI, LFI)
+* Remote Command Execution (RCE)
+* Session Fixation
+
+Teams should still follow [WordPress](https://learn.wordpress.org/tutorial/introduction-to-securely-developing-plugins/) and [Drupal security standards](https://www.drupal.org/docs/administering-a-drupal-site/security-in-drupal/writing-secure-code-for-drupal) to mitigate such threats at the application layer as well. 
 
 ## Efficient Image Optimization at the Edge
 

source/content/guides/autopilot/07-troubleshoot.md

@@ -373,11 +373,11 @@ Site is running a framework that is not supported. Supported frameworks are:
 
 ### Diagnosis
 
-A [WordPress Composer Managed](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) site which is not using Composer is not supported by Autopilot.
+A Composer-based WordPress site built with [Build Tools](https://docs.pantheon.io/guides/build-tools/) is not supported by Autopilot.
 
 ### Solution
 
-Ensure that your [WordPress Composer Managed](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) site is properly configured. For additional help [contact Support](/guides/support/contact-support/) for assistance.
+Ensure that your [WordPress Composer Managed](/guides/wordpress-composer/wordpress-composer-managed) site is properly configured. For additional help [contact Support](/guides/support/contact-support/) for assistance.
 
 </Accordion>
 

source/content/guides/drupal/drupal-hosted-createempty-md/09-deploy-dev.md

@@ -73,4 +73,4 @@ After you confirm that the site works in the Multidev, replace the `master` bran
    git push --force origin master
    ```
 
-Your site's Dev environment is now set up to use the the latest version of Drupal Integrated Composer upstream.
+Your site's Dev environment is now set up to use the latest version of Drupal Integrated Composer upstream.

source/content/guides/integrated-composer/01-introduction.md

@@ -43,7 +43,7 @@ You can use the [Terminus Conversion Tools Plugin](https://github.com/pantheon-s
 
 <Alert title="Note" type="info">
 
-Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) upstream. You can use this upstream to create an Integrated Composer WordPress site with **Bedrock**. This upstream is currently in EA.
+Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/wordpress-composer-managed) upstream. You can use this upstream to create an Integrated Composer WordPress site with **Bedrock**. This upstream is currently in EA.
 
 </Alert>
 

source/content/guides/integrated-composer/07-ic-troubleshooting.md

@@ -245,6 +245,32 @@ if [ -z "$PANTHEON_ENVIRONMENT" ]; then
 fi
 ```
 
+### Removing files previously scaffolded by drupal-scaffold
+
+The way that Integrated Composer works in Pantheon is by starting with your latest build to optimize the build time; this leads to an issue where if you decide to not scaffold a file anymore; the file will stay there unless you actually remove it. A possible way to do this is to add a `pre-install-cmd` to remove the file. So, the full process to remove files will be like this:
+
+1. Stop the file from being scaffolded by adding lines like this to your composer.json file
+    ```
+    "extra": {
+      "drupal-scaffold": {
+        "file-mapping": {
+          "[web-root]/robots.txt": false
+        },
+        ...
+      }
+    ```
+1. Add a pre-install-hook to actually remove the file
+    ```
+    "scripts": {
+      "pre-install-cmd": [
+        "rm -f web/robots.txt"
+      ],
+      ...
+    },
+    ```
+1. Commit and push your changes to the platform
+1. Once Integrated Composer runs for this commit, the file should be deleted from your environment.
+
 ## More Resources
 
 - [Integrated Composer FAQ](/guides/integrated-composer/ic-faq)

source/content/guides/multisite/01-introduction.md

@@ -28,7 +28,7 @@ Pantheon supports the most common use case for WordPress Multisites: a common co
 - Blogs for faculty at a university
 - Franchise sites under a parent organization site
 - Sections within a media publication
-- [Bedrock based](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) or Composer based WP Multisite is a possibility and can be discussed during onboarding
+- [Bedrock based](/guides/wordpress-composer/wordpress-composer-managed) or Composer based WP Multisite is a possibility and can be discussed during onboarding
 
 ## Unsupported Use Cases
 We do not support uses of WordPress Multisite that run functionally-different or uniquely-owned sites on the same WordPress installation. This includes, but is not limited to:

source/content/guides/pagerduty/03-schedule.md

@@ -66,7 +66,7 @@ Next, we'll create an on-call Schedule, to configure a scalable custom alert wor
 
 4. Click **<Icon icon="check" />Create Schedule**.
 
-  Refer to the the **Final Schedule** at the bottom of the page to see who's on call and the first point of contact:
+  Refer to the **Final Schedule** at the bottom of the page to see who's on call and the first point of contact:
 
   ![Final Schedule](../../../images/pagerduty/pg-final-schedule.png)
 

source/content/guides/wordpress-composer/pre-ga/02-wordpress-composer-managed.md → source/content/guides/wordpress-composer/02-wordpress-composer-managed.md

@@ -13,13 +13,13 @@ tags: [wordpress]
 contributors: [whitneymeredith, jspellman814, jazzsequence]
 layout: guide
 showtoc: true
-permalink: docs/guides/wordpress-composer/pre-ga/wordpress-composer-managed
+permalink: docs/guides/wordpress-composer/wordpress-composer-managed
 anchorid: wordpress-composer-managed
 ---
 
 <Alert title="Early Access" type="info" icon="leaf">
 
-The WordPress Composer Managed upstream is available for [Early Access](/oss-support-levels#early-access) participants. Features for WordPress Composer Managed are in active development. Pantheon's development team is rolling out new functionality often while this product is in Early Access. Visit [#wordpress in our community Slack](https://pantheon-community.slack.com/archives/CT8MC5Y0K) (you can sign up for the [Pantheon Slack channel here](https://slackin.pantheon.io/) if you don't already have an account) to learn how you can enroll in our Early Access program. Please review Pantheon's [Software Evaluation Licensing Terms](https://legal.pantheon.io/#contract-hkqlbwpxo) for more information about access to our software.
+The WordPress Composer Managed upstream is available for [Early Access](/oss-support-levels#early-access) participants. Features for WordPress Composer Managed are in active development. Pantheon's development team is rolling out new functionality often while this product is in Early Access. Visit [our community Slack](https://pantheon-community.slack.com/) if you don't already have an account) to connect with other Pantheon users also using the upstream (you can sign up for the [Pantheon Slack channel here](https://slackin.pantheon.io/). Please review Pantheon's [Software Evaluation Licensing Terms](https://legal.pantheon.io/#contract-hkqlbwpxo) for more information about access to our software.
 
 </Alert>
 
@@ -29,7 +29,7 @@ WordPress does not natively support [Composer](https://getcomposer.org/), howeve
 
 ## Requirements
 
-- [PHP version](/guides/php/php-versions#verify-current-php-versions) 7.4 or greater
+- [PHP version](/guides/php/php-versions#verify-current-php-versions) 8.0 or greater
 
 - [Composer](https://getcomposer.org/)
 

source/content/guides/wordpress-composer/03-create-wp-site-composer-ci-auto-test.md

@@ -1,6 +1,6 @@
 ---
-title: WordPress Composer
-subtitle: Create a CI, Composer-managed WordPress Site
+title: WordPress with Composer on Pantheon
+subtitle: Create a Composer-managed WordPress Site with Terminus Build Tools
 description: Learn how to create a WordPress Site that uses Composer, Continuous Integration, and Automated Testing on Pantheon
 contenttype: [guide]
 innav: [false]
@@ -19,7 +19,7 @@ This section provides steps to create a new Pantheon WordPress site that will us
 
 <Alert title="Note" type="info">
 
-Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/pre-ga/wordpress-composer-managed) upstream. You can use this upstream to create a Composer-managed WordPress site with **Bedrock**. This upstream is currently in EA.
+Pantheon has a [WordPress (Composer Managed)](/guides/wordpress-composer/wordpress-composer-managed) upstream. You can use this upstream to create a Composer-managed WordPress site with **Bedrock**. This upstream is currently in EA.
 
 </Alert >
 

source/content/guides/wordpress-composer/06-wordpress-ic.md

@@ -1,6 +1,6 @@
 ---
-title: WordPress with Integrated Composer on Pantheon
-subtitle: Use Integrated Composer with WordPress 
+title: WordPress with Composer on Pantheon
+subtitle: Create a Composer-managed WordPress Site with Integrated Composer
 description: Learn how to use Integrated Composer with WordPress on Pantheon.
 contenttype: [guide]
 innav: [false]
@@ -17,11 +17,11 @@ permalink: docs/guides/wordpress-composer/wordpress-ic
 
 [Integrated Composer](/guides/integrated-composer) is a Pantheon platform feature. Integrated Composer extends Composer functionality to WordPress core files and treats them as a managed dependency. Integrated Composer lets you deploy your site on Pantheon with one-click updates for both upstream commits and Composer dependencies, while still receiving upstream updates.
 
-## WordPress with Integrated Composer on Pantheon 
+## WordPress with Integrated Composer on Pantheon
 
 Pantheon maintains a [Composer-enabled WordPress Upstream](https://github.com/pantheon-upstreams/wordpress-project) repository. This is the recommended starting point for forking new upstreams that work with Pantheon's Integrated Composer build process.
 
-This repository is still under active development, and you should not create permanent/production sites from it. There is no guarantee of backwards compatibility. 
+This repository is still under active development, and you should not create permanent/production sites from it. There is no guarantee of backwards compatibility.
 
 Pantheon upstreams influence the Composer packages that are included in downstream sites by including two `composer.json` files in this repository:
 
@@ -43,17 +43,17 @@ Follow the steps in this section to create a new WordPress site using Integrated
 
 1. Use `composer require`in the `upstream-config` directory to edit the upstream `composer.json` file.
 
-    - The repository template places a theme in the upstream `composer.json` file. This works well for downstream sites that all use the same theme. You should remove themes from the upstream `composer.json` file if you do not intend to use the upstream to lock downstream sites into a particular theme. You cannot remove installed packages from downstream sites if the packages were included from the upstream site. 
+    - The repository template places a theme in the upstream `composer.json` file. This works well for downstream sites that all use the same theme. You should remove themes from the upstream `composer.json` file if you do not intend to use the upstream to lock downstream sites into a particular theme. You cannot remove installed packages from downstream sites if the packages were included from the upstream site.
 
 ## Maintain Your Integrated Composer Fork
 
  There are some special considerations to keep in mind if you intend to make modifications to your upstream based on this repository.
 
 1. Increase the version number listed in the `upstream-config/composer.json` file each time you make edits.
 
-    - Composer checks the contents of the root `/composer.json` file for changes that should be pushed to your upstream configuration. 
+    - Composer checks the contents of the root `/composer.json` file for changes that should be pushed to your upstream configuration.
 
-1. Verify your changes to the `upstream-config/composer.json` file by running `composer install` or `composer update` in the `upstream-config` directory. 
+1. Verify your changes to the `upstream-config/composer.json` file by running `composer install` or `composer update` in the `upstream-config` directory.
 
     - Be careful not to rely on ["root-only" properties of composer.json](https://getcomposer.org/doc/04-schema.md).
 
@@ -90,6 +90,6 @@ Follow the steps in this section to create a new WordPress site using Integrated
 
 ## More Resources
 
-- [Best Practices for Maintaining Custom Upstreams](/guides/custom-upstream/maintain-custom-upstream) 
+- [Best Practices for Maintaining Custom Upstreams](/guides/custom-upstream/maintain-custom-upstream)
 
 - [Composer Fundamentals and WebOps Workflows](/guides/composer)

source/content/terminus/02-install.md

@@ -89,7 +89,7 @@ The commands below will:
 
     ```bash{promptUser: user}
   mkdir -p ~/terminus && cd ~/terminus
-  curl -L https://github.com/pantheon-systems/terminus/releases/download/3.4.0/terminus.phar --output terminus
+  curl -L https://github.com/pantheon-systems/terminus/releases/download/3.5.0/terminus.phar --output terminus
   chmod +x terminus
   ./terminus self:update
   sudo ln -s ~/terminus/terminus /usr/local/bin/terminus

source/content/terminus/10-supported-terminus.md

@@ -23,7 +23,8 @@ After this period, the version will reach End Of Life (**EOL**), and will no lon
 
 | Version          | Release Date       | EOL Date           |
 |------------------|--------------------|--------------------|
-| 3.4.0            | April 23, 2024     |                    |
+| 3.5.0            | June 6, 2024       |                    |
+| 3.4.0            | April 23, 2024     | June 6, 2025       |
 | 3.3.5            | February 28, 2024  | April 23, 2025     |
 | 3.3.4            | February 27, 2024  | February 28, 2025  |
 | 3.3.3            | January 11, 2024   | February 27, 2025  |
@@ -32,9 +33,7 @@ After this period, the version will reach End Of Life (**EOL**), and will no lon
 | 3.3.0            | November 29, 2023  | November 30, 2024  |
 | 3.2.2            | September 28, 2023 | November 29, 2024  |
 | 3.2.1            | June 1, 2023       | September 28, 2024 |
-| 3.2.0            | May 22 , 2023      | June 1, 2024       |
-| 3.1.5            | April 6, 2023      | May 22, 2024       |
-| 3.1.4 or earlier | March 1, 2023      | April 6, 2024      |
+| 3.2.0 or earlier | May 22 , 2023      | June 1, 2024       |
 
 
 ### PHP Version Compatibility Matrix

source/content/terminus/ci/bitbucket.md

@@ -39,7 +39,7 @@ Before you use this script:
 
 - Ensure that you have defined `TERMINUS_TOKEN` in Bitbucket Pipeline's Environment Variables.
 - Replace `${TERMINUS_TOKEN}` in the script below with the machine token provided by Terminus.
-- Add the the machine token provided by Terminus to your environment variables in the Bitbucket pipeline settings.
+- Add the machine token provided by Terminus to your environment variables in the Bitbucket pipeline settings.
 
 </Alert>