Merge branch 'main' into dependabot/composer/drupal/danse-2.3.0

README.md

@@ -88,18 +88,18 @@ The VA.gov CMS Team
 
 ### About the CMS
 
-This repository hosts the source code for the _Content Management System_ (**CMS** or **CMS-API**) utilized by [VA.gov](https://www.va.gov). 
+This repository hosts the source code for the _Content Management System_ (**CMS** or **CMS-API**) utilized by [VA.gov](https://www.va.gov).
 
 The production instance can be found at [prod.cms.va.gov](https://prod.cms.va.gov/). Please note that access to the production CMS is limited; refer to [Getting Access](READMES/access.md) for more information.
 
-Built on [Drupal 9.5](https://www.drupal.org), the **CMS** employs the [Composer](https://getcomposer.org) package management system. To get started, consult [Getting Started](READMES/getting-started.md).
+Built on [Drupal 10.1](https://www.drupal.org), the **CMS** employs the [Composer](https://getcomposer.org) package management system. To get started, consult [Getting Started](READMES/getting-started.md).
 
 ### Contributing
 
 All of the source code used for generating VA.gov is open source, listed under the [department-of-veterans-affairs](https://github.com/department-of-veterans-affairs)
 organization on GitHub:
 
-- **CMS**: [github.com/department-of-veterans-affairs/va.gov-cms](https://github.com/department-of-veterans-affairs/va.gov-cms) - Drupal 9.5
+- **CMS**: [github.com/department-of-veterans-affairs/va.gov-cms](https://github.com/department-of-veterans-affairs/va.gov-cms) - Drupal 10.1
 - **vets-website**: [github.com/department-of-veterans-affairs/vets-website](https://github.com/department-of-veterans-affairs/vets-website) - Node.js
 - **vets-api**: [github.com/department-of-veterans-affairs/vets-api](https://github.com/department-of-veterans-affairs/vets-api) - Ruby
 - **content-build**: [github.com/department-of-veterans-affairs/vagov-content](https://github.com/department-of-veterans-affairs/vagov-content) - Node.js, Metalsmith
@@ -112,7 +112,7 @@ All development on these projects is done via Pull Requests.
 
 The public-facing website at [VA.gov](https://www.va.gov) is a static site hosted on S3, composed of HTML, CSS, JavaScript, and images.
 
-[This codebase](https://github.com/department-of-veterans-affairs/va.gov-cms) is dedicated to the CMS, built on Drupal 9.
+[This codebase](https://github.com/department-of-veterans-affairs/va.gov-cms) is dedicated to the CMS, built on Drupal 10.
 
 The source code for generating the public site is located in the [vets-website](https://github.com/department-of-veterans-affairs/vets-website) repository. The component responsible for extracting raw content from the CMS and converting it to HTML is developed in a separate repository, [content-build](https://github.com/department-of-veterans-affairs/content-build).
 

READMES/upstream-dependencies.md

@@ -72,3 +72,8 @@ The following services can affect the deployment process' ability to fully build
 | [Github](https://github.com)            |                     | [https://www.githubstatus.com/](https://www.githubstatus.com/) | Use the #github_information channel in DSVA slack                                                                                                                                              | The codebase is stored in github, and the deployment process depends on it to pull code and push status and code quality messages to our pull requests.                                               |
 | [ZenHub](https://www.zenhub.com)        |                     | https://twitter.com/zenhubstatus                               |                                                                                                                                                                                                | ZenHub is a project management layer on top of GitHub Issues that we use.                                                                                                                             |
 | [Docker Hub](https://hub.docker.com/)   |                     | [https://status.docker.com/](https://status.docker.com/)       | Contact [email protected] and/or tweet [@Docker](https://twitter.com/Docker)                                                                                                                  | We use Docker Hub to pull down container images for our CI environments in Tugboat.                                                                                                                   |
+
+## Composer
+There are a number of services that Composer uses to download and install dependencies. These services are used during the build process and are not required for runtime.
+
+We are currently aliasing several packages because of lingering dependencies on Drupal 9. We are working to remove these aliases.

composer.json

@@ -49,9 +49,9 @@
         "drupal/consumers": "^1.17.0",
         "drupal/content_lock": "^2.3",
         "drupal/content_model_documentation": "^1.0.19",
-        "drupal/core": "10.1.6 as 9.5",
-        "drupal/core-composer-scaffold": "10.1.6 as 9.5",
-        "drupal/core-recommended": "10.1.6 as 9.5",
+        "drupal/core": "10.1.7 as 9.5",
+        "drupal/core-composer-scaffold": "10.1.7 as 9.5",
+        "drupal/core-recommended": "10.1.7 as 9.5",
         "drupal/crop": "^2.0",
         "drupal/csv_serialization": "^4.0",
         "drupal/ctools_block": "^4.0",
@@ -67,7 +67,7 @@
         "drupal/entity_browser": "^2.4",
         "drupal/entity_browser_table": "^1.4",
         "drupal/entity_clone": "^2.0@alpha",
-        "drupal/entity_diff_ui": "1.0.x-dev@dev",
+        "drupal/entity_diff_ui": "^2.0@alpha",
         "drupal/entity_field_fetch": "^1.0@beta",
         "drupal/entity_reference_hierarchy": "^1.0@beta",
         "drupal/entity_reference_revisions": "^1.7",
@@ -166,7 +166,6 @@
         "drupal/schemata": "^1.0@beta",
         "drupal/search_api": "^1.29.0",
         "drupal/seckit": "^2.0",
-        "drupal/seven": "^1.0@alpha",
         "drupal/simplesamlphp_auth": "^4.0@RC",
         "drupal/sitewide_alert": "^2.0",
         "drupal/slack": "^1.3",
@@ -220,8 +219,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "twig/twig": "3.7.0 as 3.6",
-        "va-gov/content-build": "^0.0.3404",
+        "va-gov/content-build": "^0.0.3405",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",