Merge branch 'main' into VACMS-9885-site-previewer

department-of-veterans-affairs · Nov 20, 2023 · 3eb1f2c · 3eb1f2c
2 parents 1a6d3e8 + 73d10d8
commit 3eb1f2c
Show file tree

Hide file tree

Showing 32 changed files with 885 additions and 94 deletions.
diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml
@@ -1,5 +1,5 @@
 
-name: CMS Collaboration Cycle Request
+name: "CMS Collaboration Cycle Request"
 description: Use this template to begin engaging with the CMS Collaboration Cycle.
 title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]"
 labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic
@@ -11,7 +11,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel.
+        Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Read our [Kickoff Request documentation](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/collaboration-cycle/kickoff.md) in Github or reach out to the CMS Team in the cms-support Slack channel.
   - type: input
     id: product-outline
     attributes:
@@ -64,7 +64,7 @@ body:
   - type: dropdown
     id: research
     attributes:
-      label: Are you doing user research with CMS editors?
+      label: Will you be doing user research with CMS editors?
       multiple: false
       options:
         - "Yes"
@@ -83,6 +83,17 @@ body:
         - "Maybe (Leave notes in the Additional Information section of this form)"
     validations:
       required: true
+  - type: dropdown
+    id: DS
+    attributes:
+      label: Will your work require introducing a new CMS Design System component or changes to an existing component?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe (Leave notes in the Additional Information section of this form)"
+    validations:
+      required: true
   - type: dropdown
     id: modules
     attributes:
@@ -94,10 +105,21 @@ body:
         - "Maybe (Leave notes in the Additional Information section of this form)"
     validations:
       required: true
+  - type: dropdown
+    id: fields
+    attributes:
+      label: Will your work require introducing new input fields or making changes to existing input fields?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe (Leave notes in the Additional Information section of this form)"
+    validations:
+      required: true
   - type: dropdown
     id: analytics
     attributes:
-      label: Do you need to capture any analytics or metrics?
+      label: Will this work require you to capture any analytics or metrics?
       multiple: false
       options:
         - "Yes"

diff --git a/.github/workflows/actions-metrics.yml b/.github/workflows/actions-metrics.yml
@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Send GitHub Actions metrics to DataDog
-        uses: int128/datadog-actions-metrics@df9152b8d6c105a0a6bebb9f8878235abce2c4e0 # v1.63.0
+        uses: int128/datadog-actions-metrics@6c6a657047c0452b33ec3c254009c331e47c1370 # v1.64.0
         with:
           datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
           collect-job-metrics: true

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -56,7 +56,7 @@ jobs:
           CY_BUILD_ID: "${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt}}"
 
       - name: Update status on commit.
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             await octokit.rest.repos.createCommitStatus({

diff --git a/composer.json b/composer.json
@@ -208,7 +208,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^4.0",
         "symfony/routing": "^4.0",
-        "va-gov/content-build": "^0.0.3386",
+        "va-gov/content-build": "^0.0.3389",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b75d7fc5fc1fcbb7c55c0ce0ecec6d7f",
+    "content-hash": "a6a09fa634b5002bd996615a7ce5be50",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -12764,26 +12764,26 @@
         },
         {
             "name": "drupal/tzfield",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/tzfield.git",
-                "reference": "8.x-1.8"
+                "reference": "8.x-1.9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.8.zip",
-                "reference": "8.x-1.8",
-                "shasum": "5793920c1d56dde77652f6b4b1e3ba3ae4625f1f"
+                "url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.9.zip",
+                "reference": "8.x-1.9",
+                "shasum": "c27c0015ba266b16136b3f6fd4fd1fa188ef9a0b"
             },
             "require": {
                 "drupal/core": "^8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.8",
-                    "datestamp": "1698896138",
+                    "version": "8.x-1.9",
+                    "datestamp": "1699555172",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -18395,16 +18395,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.41",
+            "version": "1.10.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c6174523c2a69231df55bdc65b61655e72876d76"
+                "reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76",
-                "reference": "c6174523c2a69231df55bdc65b61655e72876d76",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc2316508de5453140b5cb3d3f8683a33e92f26a",
+                "reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a",
                 "shasum": ""
             },
             "require": {
@@ -18453,7 +18453,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-05T12:57:57+00:00"
+            "time": "2023-11-17T15:26:57+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -26911,16 +26911,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3386",
+            "version": "v0.0.3389",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967"
+                "reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/9008b5b142da3ff733e9c7aae18643621cbd8967",
-                "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/917fa5884dd7db0d7f39ca56b21d758d4b3f417d",
+                "reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26947,9 +26947,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3386"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3389"
             },
-            "time": "2023-11-14T19:23:29+00:00"
+            "time": "2023-11-15T16:10:47+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -27872,5 +27872,5 @@
     "platform-overrides": {
         "php": "8.1"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }