From caad2d5b0f155153cc48eeea18432eb675d612c8 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 29 Apr 2022 14:31:15 -0400
Subject: [PATCH 01/57] [EPAD8-1727] update USWDS to 2.13.3

---
 .../web/themes/epa_theme/package-lock.json    | 226 ++++--------------
 .../drupal/web/themes/epa_theme/package.json  |   2 +-
 2 files changed, 51 insertions(+), 177 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/package-lock.json b/services/drupal/web/themes/epa_theme/package-lock.json
index fe5b31a5bf..5a87f14f3d 100644
--- a/services/drupal/web/themes/epa_theme/package-lock.json
+++ b/services/drupal/web/themes/epa_theme/package-lock.json
@@ -3980,29 +3980,6 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
     "@pattern-lab/cli": {
       "version": "5.14.2",
       "resolved": "https://registry.npmjs.org/@pattern-lab/cli/-/cli-5.14.2.tgz",
@@ -4799,15 +4776,6 @@
         "es6-promisify": "^5.0.0"
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -5115,11 +5083,6 @@
         }
       }
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-    },
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
@@ -5717,7 +5680,8 @@
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
@@ -5954,6 +5918,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5963,6 +5928,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -6566,9 +6532,9 @@
       }
     },
     "classlist-polyfill": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz",
-      "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.0.3.tgz",
+      "integrity": "sha1-fNWpIHyNaTL1kv3qprRTUu1xaQ0="
     },
     "classnames": {
       "version": "2.3.1",
@@ -6603,11 +6569,6 @@
         "loader-utils": "^1.1.0"
       }
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-    },
     "clean-webpack-plugin": {
       "version": "0.1.19",
       "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz",
@@ -6915,7 +6876,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -8075,21 +8037,6 @@
         }
       }
     },
-    "del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -8167,14 +8114,6 @@
         }
       }
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
     "dive": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/dive/-/dive-0.5.0.tgz",
@@ -8375,11 +8314,6 @@
       "integrity": "sha512-xoUPSkjimw51d9ryeH38XUwmR3HmCA+eky4hk0YEgsWeBWGyhb35OCvT3lWAdmvIkcGYCRNOB8LvtO00dJQpOA==",
       "dev": true
     },
-    "elem-dataset": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/elem-dataset/-/elem-dataset-2.0.0.tgz",
-      "integrity": "sha512-e7gieGopWw5dMdEgythH3lUS7nMizutPDTtkzfQW/q2gCvFnACyNnK3ytCncAXKxdBXQWcXeKaYTTODiMnp8mw=="
-    },
     "element-closest": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
@@ -9645,18 +9579,6 @@
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
-    "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      }
-    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -9675,14 +9597,6 @@
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "dev": true
     },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
     "faye-websocket": {
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
@@ -9760,6 +9674,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -10212,7 +10127,8 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "fsevents": {
       "version": "2.3.2",
@@ -10385,6 +10301,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10398,6 +10315,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -10702,19 +10620,6 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
-    "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      }
-    },
     "globjoin": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
@@ -10797,7 +10702,8 @@
     "graceful-fs": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true
     },
     "graphlib": {
       "version": "2.1.1",
@@ -12316,7 +12222,8 @@
     "ignore": {
       "version": "5.1.9",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="
+      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+      "dev": true
     },
     "image-size": {
       "version": "0.5.5",
@@ -12428,11 +12335,6 @@
       "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
       "dev": true
     },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-    },
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -12449,6 +12351,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -12457,7 +12360,8 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "ini": {
       "version": "1.3.8",
@@ -12784,7 +12688,8 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
     },
     "is-finite": {
       "version": "1.1.0",
@@ -12802,6 +12707,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -12842,7 +12748,8 @@
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
     },
     "is-number-object": {
       "version": "1.0.6",
@@ -12865,11 +12772,6 @@
       "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
       "dev": true
     },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
-    },
     "is-path-in-cwd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
@@ -12890,11 +12792,6 @@
         }
       }
     },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -14077,7 +13974,8 @@
     "merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
     },
     "methods": {
       "version": "1.1.2",
@@ -14089,6 +13987,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
       "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "dev": true,
       "requires": {
         "braces": "^3.0.1",
         "picomatch": "^2.2.3"
@@ -14217,6 +14116,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -15209,6 +15109,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -15377,14 +15278,6 @@
         "p-limit": "^2.2.0"
       }
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
     "p-timeout": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
@@ -15623,7 +15516,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -15664,11 +15558,6 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
       "dev": true
     },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
     "pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
@@ -15761,7 +15650,8 @@
     "picomatch": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",
@@ -16746,11 +16636,6 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-    },
     "quick-lru": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
@@ -17698,15 +17583,11 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -17727,14 +17608,6 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -18373,7 +18246,8 @@
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
     },
     "slashes": {
       "version": "1.0.5",
@@ -21166,6 +21040,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -21778,17 +21653,15 @@
       "dev": true
     },
     "uswds": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.11.2.tgz",
-      "integrity": "sha512-JISTXCjPIlrufbObIifjrMDn5jF9bbLu7UYhGWmEs9iqB6Z2KDCXHVoBUyzMmIrIjW/UWWYHZzPqOOHO6/IMCQ==",
-      "requires": {
-        "classlist-polyfill": "^1.0.3",
-        "del": "^6.0.0",
-        "domready": "^1.0.8",
-        "elem-dataset": "^2.0.0",
-        "object-assign": "^4.1.1",
-        "receptor": "^1.0.0",
-        "resolve-id-refs": "^0.1.0"
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/uswds/-/uswds-2.13.3.tgz",
+      "integrity": "sha512-qCblljeaRvS3+PrSxoHqQwmMnp746+Y1YZA34BkTzJknvo2bhhdzGE21yJaInumzIqV3glLD13TFdRwrwikMMQ==",
+      "requires": {
+        "classlist-polyfill": "1.0.3",
+        "domready": "1.0.8",
+        "object-assign": "4.1.1",
+        "receptor": "1.0.0",
+        "resolve-id-refs": "0.1.0"
       }
     },
     "utf8-byte-length": {
@@ -22843,7 +22716,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write": {
       "version": "1.0.3",
diff --git a/services/drupal/web/themes/epa_theme/package.json b/services/drupal/web/themes/epa_theme/package.json
index 227abf8254..1a700988f7 100755
--- a/services/drupal/web/themes/epa_theme/package.json
+++ b/services/drupal/web/themes/epa_theme/package.json
@@ -68,6 +68,6 @@
     "svgxuse": "^1.2.6",
     "tablesort": "5.3.0",
     "tiny-slider": "2.9.4",
-    "uswds": "2.11.2"
+    "uswds": "2.13.3"
   }
 }

From b11046135f2590b4b3e28729de49cf0be6e0eda2 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 31 May 2022 14:23:42 -0400
Subject: [PATCH 02/57] EPAD8-1758 update the embed module

---
 services/drupal/composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 3f2f6e9037..8fe7b66089 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -4497,17 +4497,17 @@
         },
         {
             "name": "drupal/embed",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/embed.git",
-                "reference": "8.x-1.4"
+                "reference": "8.x-1.5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/embed-8.x-1.4.zip",
-                "reference": "8.x-1.4",
-                "shasum": "09a2bda039bfbb3fff01c91964384bf3d924b8c5"
+                "url": "https://ftp.drupal.org/files/projects/embed-8.x-1.5.zip",
+                "reference": "8.x-1.5",
+                "shasum": "88a447329d16988459e82392443e96d441d651b2"
             },
             "require": {
                 "drupal/core": "^8.7.7 || ^9"
@@ -4515,8 +4515,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.4",
-                    "datestamp": "1590176831",
+                    "version": "8.x-1.5",
+                    "datestamp": "1653500382",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

From f75d47eccb4f684a189207fc7addbee8570308b9 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 1 Jun 2022 14:27:19 -0400
Subject: [PATCH 03/57] [EPAD8-1727] update search markup to use direct image
 call

---
 .../05-components/search/search--epa/search--epa.twig        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
index 8ec3f3da31..f4bed3949f 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
@@ -10,7 +10,10 @@
     <label class="usa-sr-only" for="search-box">{{ 'Search'|t }}</label>
     <input class="usa-input" id="search-box" type="search" name="querytext" placeholder="{{ 'Search EPA.gov'|t }}">
     <button class="usa-button" type="submit">
-      <span class="usa-sr-only">{{ 'Search'|t }}</span>
+      <img
+        src="/themes/epa_theme/images/usa-icons-bg/search--white.svg"
+        class="usa-search__submit-icon"
+        alt="Search" />
     </button>
     <input type="hidden" name="areaname" value="">
     <input type="hidden" name="areacontacts" value="">

From e69da7317f512172b02968eaf8ad9db4d7c595d7 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 1 Jun 2022 16:40:27 -0400
Subject: [PATCH 04/57] EPAD8-1761 update drupal core to 9.3.15

---
 services/drupal/composer.lock | 138 ++++++++++++++++++++++------------
 1 file changed, 91 insertions(+), 47 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 3f2f6e9037..5cfe48a71d 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -1545,16 +1545,16 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8"
+                "reference": "56cd022adb5514472cb144c087393c1821911d09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8",
-                "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09",
+                "reference": "56cd022adb5514472cb144c087393c1821911d09",
                 "shasum": ""
             },
             "require": {
@@ -1566,13 +1566,13 @@
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
                 "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
                 "predis/predis": "~1.0",
                 "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
-                "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
             },
             "suggest": {
                 "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
@@ -1624,7 +1624,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/1.12.1"
+                "source": "https://github.com/doctrine/cache/tree/1.13.0"
             },
             "funding": [
                 {
@@ -1640,7 +1640,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-17T14:39:21+00:00"
+            "time": "2022-05-20T20:06:54+00:00"
         },
         {
             "name": "doctrine/collections",
@@ -3437,16 +3437,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.12",
+            "version": "9.3.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c"
+                "reference": "c29310a4d08d5072d7f713da744c0831636b4779"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
-                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
+                "url": "https://api.github.com/repos/drupal/core/zipball/c29310a4d08d5072d7f713da744c0831636b4779",
+                "reference": "c29310a4d08d5072d7f713da744c0831636b4779",
                 "shasum": ""
             },
             "require": {
@@ -3468,7 +3468,7 @@
                 "ext-spl": "*",
                 "ext-tokenizer": "*",
                 "ext-xml": "*",
-                "guzzlehttp/guzzle": "^6.5.2",
+                "guzzlehttp/guzzle": "^6.5.6",
                 "laminas/laminas-diactoros": "^2.1",
                 "laminas/laminas-feed": "^2.12",
                 "masterminds/html5": "^2.1",
@@ -3688,13 +3688,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.12"
+                "source": "https://github.com/drupal/core/tree/9.3.15"
             },
-            "time": "2022-04-20T14:25:27+00:00"
+            "time": "2022-06-01T15:45:43+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.12",
+            "version": "9.3.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -3738,22 +3738,22 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.15"
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.12",
+            "version": "9.3.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f"
+                "reference": "36b1d9dbe4f946b3c19fb91831aa1994e1e38782"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
-                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/36b1d9dbe4f946b3c19fb91831aa1994e1e38782",
+                "reference": "36b1d9dbe4f946b3c19fb91831aa1994e1e38782",
                 "shasum": ""
             },
             "require": {
@@ -3762,9 +3762,9 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.12",
+                "drupal/core": "9.3.15",
                 "egulias/email-validator": "3.1.2",
-                "guzzlehttp/guzzle": "6.5.5",
+                "guzzlehttp/guzzle": "6.5.6",
                 "guzzlehttp/promises": "1.5.1",
                 "guzzlehttp/psr7": "1.8.5",
                 "laminas/laminas-diactoros": "2.8.0",
@@ -3824,9 +3824,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.12"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.15"
             },
-            "time": "2022-04-20T14:25:27+00:00"
+            "time": "2022-06-01T15:45:43+00:00"
         },
         {
             "name": "drupal/crop",
@@ -10983,16 +10983,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
+            "version": "6.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+                "reference": "f092dd734083473658de3ee4bef093ed77d2689c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c",
+                "reference": "f092dd734083473658de3ee4bef093ed77d2689c",
                 "shasum": ""
             },
             "require": {
@@ -11029,10 +11029,40 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
@@ -11048,9 +11078,23 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5"
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.6"
             },
-            "time": "2020-06-16T21:01:06+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-25T13:19:12+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -12269,16 +12313,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v4.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
                 "shasum": ""
             },
             "require": {
@@ -12319,9 +12363,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-05-31T20:59:12+00:00"
         },
         {
             "name": "nodespark/des-connector",
@@ -17355,7 +17399,7 @@
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.12",
+            "version": "9.3.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -17399,7 +17443,7 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.12"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.15"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
@@ -19972,16 +20016,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.39",
+            "version": "v4.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3"
+                "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
-                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be5a04618e5d44e71d013f177df80d3ec4b192a0",
+                "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0",
                 "shasum": ""
             },
             "require": {
@@ -20026,7 +20070,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.39"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.42"
             },
             "funding": [
                 {
@@ -20042,7 +20086,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T10:38:15+00:00"
+            "time": "2022-04-30T18:34:00+00:00"
         },
         {
             "name": "symfony/lock",

From 930940e578784a3848fa5660b55867e3f4a6e7a8 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 10 Jun 2022 11:37:58 -0400
Subject: [PATCH 05/57] [EPAD8-1727] update to use translation filter

---
 .../_patterns/05-components/search/search--epa/search--epa.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
index f4bed3949f..a24a124d74 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/search/search--epa/search--epa.twig
@@ -13,7 +13,7 @@
       <img
         src="/themes/epa_theme/images/usa-icons-bg/search--white.svg"
         class="usa-search__submit-icon"
-        alt="Search" />
+        alt="{{ 'Search'|t }}" />
     </button>
     <input type="hidden" name="areaname" value="">
     <input type="hidden" name="areacontacts" value="">

From 6bd1e2ae588de39c27c842a98487e89a166201b1 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 10 Jun 2022 13:46:11 -0400
Subject: [PATCH 06/57] EPAD8-1758 patch paragraph embed module to provide the
 necessary CSRF token

---
 services/drupal/composer.patches.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index fc25f30bd6..331a2344c2 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -193,7 +193,8 @@
       "Create new revisions of embedded paragraphs": "https://www.drupal.org/files/issues/2021-07-26/paragraphs_entity_embed-revisioning-3004077-7.patch",
       "Prevent the reuse of embedded paragraphs": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-single_use-3132549-2.patch",
       "Allow modal to be larger": "https://www.drupal.org/files/issues/2021-10-22/paragraphs_entity_embed-dialog_too_small-3117524-5.patch",
-      "Allow use of buttons for selecting paragraph type": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-add_mode-3089674-3.patch"
+      "Allow use of buttons for selecting paragraph type": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-add_mode-3089674-3.patch",
+      "Make compatible with new security in embed module": "https://www.drupal.org/files/issues/2022-05-27/paragraphs_entity_embed_csrf_token.patch"
     },
     "drupal/linked_field": {
       "Generate relative links rather than absolute": "https://www.drupal.org/files/issues/2020-05-22/linked_field-relative-destination-url-3139179-1-D8.patch"

From 74cb05acd988959eba684aa0e4498073b2f79e28 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 13 Jun 2022 11:27:23 -0400
Subject: [PATCH 07/57] EPAD8-1662 allow tgz files to be uploaded

---
 .../config/sync/field.field.media.other.field_media_file_1.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/config/sync/field.field.media.other.field_media_file_1.yml b/services/drupal/config/sync/field.field.media.other.field_media_file_1.yml
index f18b294ff9..eac1175628 100644
--- a/services/drupal/config/sync/field.field.media.other.field_media_file_1.yml
+++ b/services/drupal/config/sync/field.field.media.other.field_media_file_1.yml
@@ -26,7 +26,7 @@ settings:
   handler: 'default:file'
   handler_settings: {  }
   file_directory: 'other-files/[current-date:custom:Y-m]'
-  file_extensions: 'accdb ai csv dmg dtd eps exe ico json kml kmz msi psd r rar rtf smi svg txt xls xlsb xlsm xlsx xltm xml xsd zip doc docm docx ppt pptx ppsx tif'
+  file_extensions: 'accdb ai csv dmg dtd eps exe ico json kml kmz msi psd r rar rtf smi svg txt xls xlsb xlsm xlsx xltm xml xsd zip doc docm docx ppt pptx ppsx tif tgz'
   max_filesize: ''
   description_field: false
 field_type: file

From afe2739f1340e86e071a007cb3063b389c8212f9 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Wed, 15 Jun 2022 13:18:56 -0500
Subject: [PATCH 08/57] [EPAD8-1763] - updating group members view

---
 .../language/es/views.view.group_members.yml  |  3 ---
 .../config/sync/views.view.group_members.yml  | 26 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/services/drupal/config/sync/language/es/views.view.group_members.yml b/services/drupal/config/sync/language/es/views.view.group_members.yml
index 8541b43484..e9257a8604 100644
--- a/services/drupal/config/sync/language/es/views.view.group_members.yml
+++ b/services/drupal/config/sync/language/es/views.view.group_members.yml
@@ -28,9 +28,6 @@ display:
         group_roles:
           label: Roles
           separator: ', '
-        changed:
-          label: Actualizado
-          separator: ', '
         created:
           label: 'se unió'
           separator: ', '
diff --git a/services/drupal/config/sync/views.view.group_members.yml b/services/drupal/config/sync/views.view.group_members.yml
index 4ddde7f4cc..4d9d9579b9 100644
--- a/services/drupal/config/sync/views.view.group_members.yml
+++ b/services/drupal/config/sync/views.view.group_members.yml
@@ -135,7 +135,7 @@ display:
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
-          empty: '<div class="item-list"><ul><li>&lt;none&gt;</li></ul></div>'
+          empty: '<div class="item-list"><ul><li>Member</li></ul></div>'
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
@@ -153,17 +153,17 @@ display:
           multi_type: ul
           separator: ', '
           field_api_classes: false
-        changed:
-          id: changed
-          table: group_content_field_data
-          field: changed
-          relationship: none
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: gc__user
           group_type: group
           admin_label: ''
-          entity_type: group_content
-          entity_field: changed
+          entity_type: user
+          entity_field: status
           plugin_id: field
-          label: Updated
+          label: 'User status'
           exclude: false
           alter:
             alter_text: false
@@ -205,11 +205,11 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: boolean
           settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+            format: custom
+            format_custom_false: Blocked
+            format_custom_true: Active
           group_column: value
           group_columns: {  }
           group_rows: true

From 449dd2d95d5d31474388191de964aa909be7e97c Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Wed, 15 Jun 2022 13:48:59 -0500
Subject: [PATCH 09/57] [EPAD8-1637] - adds thumbnail to group media view

---
 .../views.view.group_media_search_api.yml     | 608 ++++++++++++++++++
 1 file changed, 608 insertions(+)

diff --git a/services/drupal/config/sync/views.view.group_media_search_api.yml b/services/drupal/config/sync/views.view.group_media_search_api.yml
index 8728c751ab..49a09305fd 100644
--- a/services/drupal/config/sync/views.view.group_media_search_api.yml
+++ b/services/drupal/config/sync/views.view.group_media_search_api.yml
@@ -3,11 +3,13 @@ langcode: en
 status: true
 dependencies:
   config:
+    - image.style.thumbnail
     - search_api.index.media
     - taxonomy.vocabulary.media_tags
   module:
     - csv_serialization
     - group
+    - image
     - rest
     - search_api
     - serialization
@@ -554,6 +556,12 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: false
+        thumbnail:
+          id: thumbnail
+          table: search_api_datasource_media_entity_media
+          field: thumbnail
+          entity_type: media
+          plugin_id: search_api_field
       pager:
         type: full
         options:
@@ -1538,6 +1546,606 @@ display:
     display_plugin: page
     position: 1
     display_options:
+      fields:
+        name:
+          id: name
+          table: search_api_index_media
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_field
+          label: Name
+          exclude: false
+          alter:
+            alter_text: true
+            text: '<a></a>'
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+        thumbnail:
+          id: thumbnail
+          table: search_api_datasource_media_entity_media
+          field: thumbnail
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          plugin_id: search_api_field
+          label: Thumbnail
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_link: content
+            image_style: thumbnail
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+        search_api_rendered_item:
+          id: search_api_rendered_item
+          table: search_api_index_media
+          field: search_api_rendered_item
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_rendered_item
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          view_modes:
+            'entity:media':
+              audio: link_with_metadata
+              document: link_with_metadata
+              image: link_with_metadata
+              other: link_with_metadata
+              remote_video: link_with_metadata
+        aggregated_filenames:
+          id: aggregated_filenames
+          table: search_api_index_media
+          field: aggregated_filenames
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api
+          label: Filename
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          link_to_item: false
+          use_highlighting: false
+          multi_type: separator
+          multi_separator: ', '
+        bundle:
+          id: bundle
+          table: search_api_index_media
+          field: bundle
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_field
+          label: 'Media type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              media_type:
+                display_method: label
+        uid_1:
+          id: uid_1
+          table: search_api_index_media
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_field
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              user:
+                display_method: label
+        changed:
+          id: changed
+          table: search_api_index_media
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_field
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_date
+          fallback_options:
+            date_format: fallback
+            custom_date_format: ''
+            timezone: ''
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+        created:
+          id: created
+          table: search_api_index_media
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_field
+          label: Created
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_date
+          fallback_options:
+            date_format: fallback
+            custom_date_format: ''
+            timezone: ''
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+        search_api_operations:
+          id: search_api_operations
+          table: search_api_index_media
+          field: search_api_operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: search_api_entity_operations
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: false
+      defaults:
+        fields: false
       display_extenders:
         views_ajax_get:
           ajax_get: false

From 743b95475562e6a8f26bf99255c3aed7485f1844 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 16 Jun 2022 17:09:31 -0400
Subject: [PATCH 10/57] EPAD8-1765 make the link exit icon default to english
 if no translation available

---
 services/drupal/web/themes/epa_theme/epa_theme.libraries.yml | 2 +-
 .../drupal/web/themes/epa_theme/js/src/external-links.es6.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml b/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
index 593ee31f96..edd37d8467 100644
--- a/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
+++ b/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
@@ -3,7 +3,7 @@ common:
   js:
     js/dist/common.min.js: {}
 global:
-  version: VERSION
+  version: 1
   css:
     theme:
       css/styles.css: {}
diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index 5e8c2dcf33..9ec6ef6246 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -64,7 +64,10 @@ import Drupal from 'drupal';
           let translatedAccessible = Drupal.t('Exit EPA Website');
           const article = el.closest('article[lang]');
           if (article) {
-            const lang = article.getAttribute('lang');
+            let lang = article.getAttribute('lang');
+            if (!(lang in translate)) {
+              lang = 'en';
+            }
             translated = translate[lang][0];
             translatedAccessible = translate[lang][1];
           }

From c8638aa1a8f16b2a182bb3d01f861a67da89bfc1 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 17 Jun 2022 09:53:44 -0500
Subject: [PATCH 11/57] [EPAD8-1686] - Increases default height of Page
 JavaScript textarea

---
 .../sync/core.entity_form_display.node.event.default.yml | 9 +++++++--
 .../sync/core.entity_form_display.node.faq.default.yml   | 9 +++++++--
 .../sync/core.entity_form_display.node.page.default.yml  | 9 +++++++--
 ...core.entity_form_display.node.perspective.default.yml | 9 +++++++--
 ...re.entity_form_display.node.public_notice.default.yml | 9 +++++++--
 .../core.entity_form_display.node.regulation.default.yml | 9 +++++++--
 .../core.entity_form_display.node.web_area.default.yml   | 9 +++++++--
 .../core.entity_form_display.node.webform.default.yml    | 9 +++++++--
 8 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_form_display.node.event.default.yml b/services/drupal/config/sync/core.entity_form_display.node.event.default.yml
index f4a044fb7a..b98a758548 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.event.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.event.default.yml
@@ -284,9 +284,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
     weight: 7
diff --git a/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml b/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml
index 27fd1cc228..c5bc7b5996 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml
@@ -224,9 +224,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_publish_date:
     type: datetime_default
     weight: 46
diff --git a/services/drupal/config/sync/core.entity_form_display.node.page.default.yml b/services/drupal/config/sync/core.entity_form_display.node.page.default.yml
index 5f01077d6e..b3065e2f3b 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.page.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.page.default.yml
@@ -204,9 +204,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
     weight: 3
diff --git a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
index 941cb635c4..f6f7cbe94c 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
@@ -227,9 +227,14 @@ content:
     weight: 26
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
     weight: 4
diff --git a/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml b/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml
index 0a899230d3..a69ea90fc3 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml
@@ -323,9 +323,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_permit_number:
     type: string_textfield
     weight: 11
diff --git a/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml b/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml
index 86674a0491..cb4b61f30b 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml
@@ -305,9 +305,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_publish_date:
     type: datetime_default
     weight: 46
diff --git a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
index b7a130f1cd..026b1bc482 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
@@ -203,9 +203,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
     weight: 4
diff --git a/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml b/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml
index 194ec0c520..2b8de11832 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml
@@ -171,9 +171,14 @@ content:
     weight: 49
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      maxlength:
+        maxlength_js: null
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
     weight: 2

From 274012579b15ed7bc6bc2a5a7dcf48bef90acd62 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 17 Jun 2022 10:18:41 -0500
Subject: [PATCH 12/57] [EPAD8-1637] - updating group media search api view to
 match media search api layout

---
 .../views.view.group_media_search_api.yml     | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/services/drupal/config/sync/views.view.group_media_search_api.yml b/services/drupal/config/sync/views.view.group_media_search_api.yml
index 49a09305fd..d43e868e12 100644
--- a/services/drupal/config/sync/views.view.group_media_search_api.yml
+++ b/services/drupal/config/sync/views.view.group_media_search_api.yml
@@ -1547,19 +1547,20 @@ display:
     position: 1
     display_options:
       fields:
-        name:
-          id: name
-          table: search_api_index_media
-          field: name
+        thumbnail:
+          id: thumbnail
+          table: search_api_datasource_media_entity_media
+          field: thumbnail
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
           plugin_id: search_api_field
-          label: Name
+          label: Thumbnail
           exclude: false
           alter:
-            alter_text: true
-            text: '<a></a>'
+            alter_text: false
+            text: ''
             make_link: false
             path: ''
             absolute: false
@@ -1596,11 +1597,12 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: string
+          click_sort_column: target_id
+          type: image
           settings:
-            link_to_entity: false
-          group_column: value
+            image_link: content
+            image_style: thumbnail
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -1617,20 +1619,19 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-        thumbnail:
-          id: thumbnail
-          table: search_api_datasource_media_entity_media
-          field: thumbnail
+        name:
+          id: name
+          table: search_api_index_media
+          field: name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: media
           plugin_id: search_api_field
-          label: Thumbnail
+          label: Name
           exclude: false
           alter:
-            alter_text: false
-            text: ''
+            alter_text: true
+            text: '<a></a>'
             make_link: false
             path: ''
             absolute: false
@@ -1667,12 +1668,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: target_id
-          type: image
+          click_sort_column: value
+          type: string
           settings:
-            image_link: content
-            image_style: thumbnail
-          group_column: ''
+            link_to_entity: false
+          group_column: value
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -1806,7 +1806,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: search_api_field
-          label: 'Media type'
+          label: Type
           exclude: false
           alter:
             alter_text: false
@@ -1952,7 +1952,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: search_api_field
-          label: Updated
+          label: Changed
           exclude: false
           alter:
             alter_text: false
@@ -2102,7 +2102,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: search_api_entity_operations
-          label: ''
+          label: Operations
           exclude: false
           alter:
             alter_text: false

From 4fa00382eacbb3ebc2397d7075e390288ffb7990 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 17 Jun 2022 10:42:44 -0500
Subject: [PATCH 13/57] [EPAD8-1309] - hides aside block field on homepage
 content type

---
 ...ity_form_display.node.web_area.default.yml | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
index b7a130f1cd..b9417f5c43 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml
@@ -30,7 +30,6 @@ dependencies:
     - field_group
     - paragraphs
     - shs
-    - text
 third_party_settings:
   field_group:
     group_metadata:
@@ -90,7 +89,7 @@ third_party_settings:
       label: 'Additional Fields'
       region: content
       parent_name: ''
-      weight: 6
+      weight: 5
       format_type: tabs
       format_settings:
         classes: ''
@@ -103,7 +102,7 @@ mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 8
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -117,14 +116,6 @@ content:
       multiple: false
       required: true
     third_party_settings: {  }
-  field_aside_block:
-    type: text_textarea
-    weight: 5
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
   field_banner:
     type: entity_reference_paragraphs
     weight: 2
@@ -245,27 +236,27 @@ content:
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 12
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 9
+    weight: 8
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 11
+    weight: 10
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 10
+    weight: 9
     region: content
     settings:
       display_label: true
@@ -280,7 +271,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 7
+    weight: 6
     region: content
     settings:
       match_operator: CONTAINS
@@ -289,11 +280,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
-    weight: 13
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_aside_block: true
   field_last_published: true
   field_review_deadline: true
   field_scheduled_transition: true

From 8ca8ae33f43be0c5782df6505ee6d07651bbf2af Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 17 Jun 2022 11:08:04 -0500
Subject: [PATCH 14/57] [EPAD8-1763] - updating status label to match AC

---
 services/drupal/config/sync/views.view.group_members.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/config/sync/views.view.group_members.yml b/services/drupal/config/sync/views.view.group_members.yml
index 4d9d9579b9..10c0ab03e8 100644
--- a/services/drupal/config/sync/views.view.group_members.yml
+++ b/services/drupal/config/sync/views.view.group_members.yml
@@ -163,7 +163,7 @@ display:
           entity_type: user
           entity_field: status
           plugin_id: field
-          label: 'User status'
+          label: Status
           exclude: false
           alter:
             alter_text: false

From a45c689965041d8d2180fe86dd6a5b3c1099747f Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 17 Jun 2022 12:40:45 -0500
Subject: [PATCH 15/57] [EPAD8-1746] - adds revision author info to admin info
 block

---
 .../custom/epa_workflow/epa_workflow.module   | 20 +++++++++++++++++++
 .../form/entity-moderation-form.html.twig     |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 10ddb247fa..1cd8f18ac2 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -282,6 +282,26 @@ function epa_workflow_form_alter(array &$form, FormStateInterface $form_state, $
       ];
 
     }
+
+    // Display the Revision Author Information
+    if (
+      isset($node)
+      && $node->getRevisionUser()
+      && $node->isPublished()
+    )
+    {
+
+      $revision_author = $node->getRevisionUser()->get('name')->value;
+      $author_uid = $node->getRevisionUserId();
+
+      $form['revision_author'] = [
+        '#type' => 'item',
+        '#title' => t("Revision Saved By"),
+        '#markup' => '<a href="/user/' . $author_uid . '">' . $revision_author . '</a'
+      ];
+
+    }
+
   }
 
   if ((in_array($form_id,['content_moderation_entity_moderation_form']) && isset($form['submit'])) || isset($form['node_bulk_form'])) {
diff --git a/services/drupal/web/themes/epa_theme/templates/form/entity-moderation-form.html.twig b/services/drupal/web/themes/epa_theme/templates/form/entity-moderation-form.html.twig
index 45e3cb98bd..874f29249c 100644
--- a/services/drupal/web/themes/epa_theme/templates/form/entity-moderation-form.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/form/entity-moderation-form.html.twig
@@ -4,10 +4,11 @@
 
 <ul class="entity-moderation-form">
   <li class="entity-moderation-form__item">{{ form.current }}</li>
+  <li class="entity-moderation-form__item">{{ form.revision_author }}</li>
   <li class="entity-moderation-form__item">{{ form.review_deadline }}</li>
   <li class="entity-moderation-form__item">{{ form.new_state }}</li>
   <li class="entity-moderation-form__item">{{ form.revision_log }}</li>
   <li class="entity-moderation-form__item">{{ form.workflow_508_compliant }}</li>
   <li class="entity-moderation-form__item">{{ form.submit }}</li>
 </ul>
-{{ form|without('current', 'review_deadline', 'new_state', 'revision_log', 'submit', 'workflow_508_compliant', 'node_edit_link') }}
+{{ form|without('current', 'revision_author', 'review_deadline', 'new_state', 'revision_log', 'submit', 'workflow_508_compliant', 'node_edit_link') }}

From d10725261e3f4eb9b94917d6899e316fc839fe77 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Tue, 21 Jun 2022 14:23:45 -0500
Subject: [PATCH 16/57] [EPAD8-1746] - removing unnecessary check to makes sure
 node is published

---
 .../drupal/web/modules/custom/epa_workflow/epa_workflow.module   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 1cd8f18ac2..70a1a144d4 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -287,7 +287,6 @@ function epa_workflow_form_alter(array &$form, FormStateInterface $form_state, $
     if (
       isset($node)
       && $node->getRevisionUser()
-      && $node->isPublished()
     )
     {
 

From 56f8a5592dcee9ad9588b223ace09951478aad91 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Tue, 21 Jun 2022 15:48:17 -0500
Subject: [PATCH 17/57] [EPAD8-1766] - creates a csv export for bulk content

---
 .../sync/views.view.moderated_content.yml     | 627 ++++++++++++++++++
 1 file changed, 627 insertions(+)

diff --git a/services/drupal/config/sync/views.view.moderated_content.yml b/services/drupal/config/sync/views.view.moderated_content.yml
index 282b74f658..1e5b9b25bd 100644
--- a/services/drupal/config/sync/views.view.moderated_content.yml
+++ b/services/drupal/config/sync/views.view.moderated_content.yml
@@ -6,13 +6,17 @@ dependencies:
     - taxonomy.vocabulary.epa_organization
   module:
     - content_moderation
+    - csv_serialization
     - epa_web_areas
     - group
     - node
+    - rest
+    - serialization
     - taxonomy
     - user
     - views_autocomplete_filters
     - views_bulk_operations
+    - views_data_export
 _core:
   default_config_hash: epCHwxXumnS0FQR7duKz2_r2nkW5CJxTracGsaPMuzE
 id: moderated_content
@@ -1385,6 +1389,629 @@ display:
         - user.permissions
       tags:
         - 'config:workflow_list'
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 3
+    display_options:
+      fields:
+        nid:
+          id: nid
+          table: node_field_revision
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+          label: ID
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        title:
+          id: title
+          table: node_field_revision
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: field
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        gid:
+          id: gid
+          table: group_content_field_data
+          field: gid
+          relationship: group_content
+          group_type: group
+          admin_label: ''
+          entity_type: group_content
+          entity_field: gid
+          plugin_id: field
+          label: 'Web Area'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        type:
+          id: type
+          table: node_field_revision
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+          label: 'Content type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        moderation_state:
+          id: moderation_state
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          plugin_id: moderation_state_field
+          label: 'Latest revision moderation state'
+          exclude: false
+          alter:
+            alter_text: false
+            text: '{{ moderation_state }} {{ field_scheduled_transition__revision_id }}'
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: content_moderation_state
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        moderation_state_1:
+          id: moderation_state_1
+          table: node_field_data
+          field: moderation_state
+          relationship: nid
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          plugin_id: moderation_state_field
+          label: 'Current revision moderation state'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: content_moderation_state
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        changed:
+          id: changed
+          table: node_field_revision
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        view_node:
+          id: view_node
+          table: node
+          field: view_node
+          relationship: nid
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          plugin_id: entity_link
+          label: URL
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: view
+          output_url_as_text: true
+          absolute: true
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: false
+            trim: true
+            encoding: utf8
+            utf8_bom: '0'
+            use_serializer_encode_only: false
+      defaults:
+        fields: false
+      display_extenders:
+        views_ajax_get:
+          ajax_get: false
+      path: admin/content/bulk/csv
+      displays:
+        page_1: page_1
+        default: '0'
+        moderated_content: '0'
+      filename: bulk-content.csv
+      automatic_download: true
+      export_method: batch
+      export_batch_size: 200
+      store_in_public_file_directory: false
+      custom_redirect_path: false
+      redirect_to_display: page_1
+      include_query_params: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:workflow_list'
   moderated_content:
     id: moderated_content
     display_title: 'Moderated content'

From 6bc203eb160e150699fc869e88a372c08308a922 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 21 Jun 2022 17:09:49 -0400
Subject: [PATCH 18/57] EPAD8-1772 update Drupal core to 9.3.16

---
 services/drupal/composer.lock | 94 +++++++++++++++++------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 3fe4b371f3..2461a7c436 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -3318,16 +3318,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.15",
+            "version": "9.3.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "c29310a4d08d5072d7f713da744c0831636b4779"
+                "reference": "eef5b91fa6689410325d569a0653878b2b1782ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/c29310a4d08d5072d7f713da744c0831636b4779",
-                "reference": "c29310a4d08d5072d7f713da744c0831636b4779",
+                "url": "https://api.github.com/repos/drupal/core/zipball/eef5b91fa6689410325d569a0653878b2b1782ed",
+                "reference": "eef5b91fa6689410325d569a0653878b2b1782ed",
                 "shasum": ""
             },
             "require": {
@@ -3349,7 +3349,7 @@
                 "ext-spl": "*",
                 "ext-tokenizer": "*",
                 "ext-xml": "*",
-                "guzzlehttp/guzzle": "^6.5.6",
+                "guzzlehttp/guzzle": "^6.5.7",
                 "laminas/laminas-diactoros": "^2.1",
                 "laminas/laminas-feed": "^2.12",
                 "masterminds/html5": "^2.1",
@@ -3569,13 +3569,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.15"
+                "source": "https://github.com/drupal/core/tree/9.3.16"
             },
-            "time": "2022-06-01T15:45:43+00:00"
+            "time": "2022-06-10T19:08:28+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.15",
+            "version": "9.3.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -3619,22 +3619,22 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.15"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.16"
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.15",
+            "version": "9.3.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "36b1d9dbe4f946b3c19fb91831aa1994e1e38782"
+                "reference": "11ea8b32924c646b29d7d767e655ffedd2982092"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/36b1d9dbe4f946b3c19fb91831aa1994e1e38782",
-                "reference": "36b1d9dbe4f946b3c19fb91831aa1994e1e38782",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/11ea8b32924c646b29d7d767e655ffedd2982092",
+                "reference": "11ea8b32924c646b29d7d767e655ffedd2982092",
                 "shasum": ""
             },
             "require": {
@@ -3643,9 +3643,9 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.15",
+                "drupal/core": "9.3.16",
                 "egulias/email-validator": "3.1.2",
-                "guzzlehttp/guzzle": "6.5.6",
+                "guzzlehttp/guzzle": "6.5.7",
                 "guzzlehttp/promises": "1.5.1",
                 "guzzlehttp/psr7": "1.8.5",
                 "laminas/laminas-diactoros": "2.8.0",
@@ -3705,9 +3705,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.15"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.16"
             },
-            "time": "2022-06-01T15:45:43+00:00"
+            "time": "2022-06-10T19:08:28+00:00"
         },
         {
             "name": "drupal/crop",
@@ -10808,16 +10808,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.6",
+            "version": "6.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "f092dd734083473658de3ee4bef093ed77d2689c"
+                "reference": "724562fa861e21a4071c652c8a159934e4f05592"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c",
-                "reference": "f092dd734083473658de3ee4bef093ed77d2689c",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
+                "reference": "724562fa861e21a4071c652c8a159934e4f05592",
                 "shasum": ""
             },
             "require": {
@@ -10903,7 +10903,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.6"
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
             },
             "funding": [
                 {
@@ -10919,7 +10919,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-25T13:19:12+00:00"
+            "time": "2022-06-09T21:36:50+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -13479,6 +13479,7 @@
                     "type": "tidelift"
                 }
             ],
+            "abandoned": "symfony/error-handler",
             "time": "2021-09-24T13:30:14+00:00"
         },
         {
@@ -14811,16 +14812,16 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
                 "shasum": ""
             },
             "require": {
@@ -14829,7 +14830,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -14870,7 +14871,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -14886,7 +14887,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-05T21:20:04+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
@@ -16077,21 +16078,21 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
             },
             "conflict": {
                 "phpstan/phpstan": "<0.12.20",
@@ -16129,9 +16130,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
             },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2022-06-03T18:03:27+00:00"
         },
         {
             "name": "webmozart/path-util",
@@ -17018,7 +17019,7 @@
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.15",
+            "version": "9.3.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -17062,7 +17063,7 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.15"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.16"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
@@ -18148,16 +18149,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.20",
+            "version": "9.5.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
-                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
+                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
                 "shasum": ""
             },
             "require": {
@@ -18191,7 +18192,6 @@
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
-                "ext-pdo": "*",
                 "phpspec/prophecy-phpunit": "^2.0.1"
             },
             "suggest": {
@@ -18235,7 +18235,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
             },
             "funding": [
                 {
@@ -18247,7 +18247,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-04-01T12:37:26+00:00"
+            "time": "2022-06-19T12:14:25+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From 863eccff622e9fc52948204abdaaef71cb51d9ad Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Thu, 23 Jun 2022 11:02:46 -0500
Subject: [PATCH 19/57] [EPAD8-1766] - adds custom patch to create log message
 when an export is made

---
 services/drupal/composer.patches.json        |  3 ++-
 services/drupal/patches/epa-log-export.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 services/drupal/patches/epa-log-export.patch

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index 7b5cb3f90a..e842ea4518 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -147,7 +147,8 @@
     },
     "drupal/views_data_export": {
       "Allow other modules to alter query in batch mode (needed for Groups support and batch export)": "https://www.drupal.org/files/issues/2021-02-12/3173296-9-batch-query-alter.patch",
-      "Allow custom redirect to use contextual filter tokens (https://www.drupal.org/project/views_data_export/issues/3122641)": "https://www.drupal.org/files/issues/2020-05-21/batch_redirect_fails_for_views_with_path_parameters-3122641-4.patch"
+      "Allow custom redirect to use contextual filter tokens (https://www.drupal.org/project/views_data_export/issues/3122641)": "https://www.drupal.org/files/issues/2020-05-21/batch_redirect_fails_for_views_with_path_parameters-3122641-4.patch",
+      "Add log message when data export happens": "patches/epa-log-export.patch"
     },
     "drupal/address": {
       "Stop performing subdivision-level postal code validation": "https://www.drupal.org/files/issues/2020-11-29/2828128-38-disable-subdivision-postal-code-validation.patch"
diff --git a/services/drupal/patches/epa-log-export.patch b/services/drupal/patches/epa-log-export.patch
new file mode 100644
index 0000000000..dbccd77367
--- /dev/null
+++ b/services/drupal/patches/epa-log-export.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Plugin/views/display/DataExport.php b/src/Plugin/views/display/DataExport.php
+index 8b4db87..3ed7d78 100644
+--- a/src/Plugin/views/display/DataExport.php
++++ b/src/Plugin/views/display/DataExport.php
+@@ -153,6 +153,8 @@ class DataExport extends RestExport {
+     ];
+     batch_set($batch_definition);
+ 
++    \Drupal::logger('views_data_export')->notice($total_rows . ' rows exported using Views Data Export.  View: ' . $view->id() . ', Display: ' . $view->current_display);
++
+     return batch_process();
+   }
+ 

From 93c1b712b29a996ffb266f904e5c726a3d9f7307 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Thu, 23 Jun 2022 13:39:45 -0500
Subject: [PATCH 20/57] [EPAD8-1290] - adds svg file extension to image field

---
 .../config/sync/field.field.media.image.field_media_image.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/config/sync/field.field.media.image.field_media_image.yml b/services/drupal/config/sync/field.field.media.image.field_media_image.yml
index 15eab6317a..0e79af85f6 100644
--- a/services/drupal/config/sync/field.field.media.image.field_media_image.yml
+++ b/services/drupal/config/sync/field.field.media.image.field_media_image.yml
@@ -26,7 +26,7 @@ settings:
   handler: 'default:file'
   handler_settings: {  }
   file_directory: 'images/[current-date:custom:Y-m]'
-  file_extensions: 'png gif jpg jpeg'
+  file_extensions: 'png gif jpg jpeg svg'
   max_filesize: '10 MB'
   max_resolution: ''
   min_resolution: ''

From 7bb60b94f85eb87c54873f9746b8714cf79bfcbf Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Thu, 23 Jun 2022 16:47:56 -0500
Subject: [PATCH 21/57] [EPAD8-1290] - add patch for svg support in responsive
 image fields

---
 services/drupal/composer.patches.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index 7b5cb3f90a..7cbecca0d8 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -42,7 +42,8 @@
       "Use EPA-preferred terminology for revision reversion operation. This patch needs to be applied on top of the patches for 3252521, 2899719, and 3252540": "patches/rename-revision-revert-operation-button-9.3.x.patch",
       "Improve layout builder performance by reducing number of calls to checkRequirements": "patches/drupal-layout-builder-performance-3186116-11.patch",
       "JQuery UI order incorrect": "https://www.drupal.org/files/issues/2021-07-19/3222107-jquery_ui_weight_fix-11.diff",
-      "Avoid OOM errors on update hooks using weakreference cache implementation": "https://www.drupal.org/files/issues/2021-10-05/3190992-39.patch"
+      "Avoid OOM errors on update hooks using weakreference cache implementation": "https://www.drupal.org/files/issues/2021-10-05/3190992-39.patch",
+      "Add support for svgs in image fields": "https://www.drupal.org/files/issues/2022-06-23/drupal-responsive_image_svg_support-2957924-11.patch"
     },
     "drupal/group": {
       "Get a token of a node's parent group to create a pathauto pattern": "https://www.drupal.org/files/issues/2020-02-21/group-gnode_tokens-2774827-62.patch",

From 4cd1c973130dedb9212ef82532c135f31c3af101 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 24 Jun 2022 11:47:58 -0400
Subject: [PATCH 22/57] [EPAD8-1727] update USWDS search component with new
 image

---
 .../epa_theme/source/_patterns/03-uswds/search/search.twig    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/search/search.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/search/search.twig
index c35faad3cd..eb73786927 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/search/search.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/search/search.twig
@@ -9,6 +9,10 @@
     <input class="usa-input" id="{{ id }}" type="search" name="search">
     <button class="usa-button" type="submit">
       <span class="{% if hide_button_text %}usa-sr-only{% else %}usa-search__submit-text{% endif %}">{{ button_text}}</span>
+        <img
+          src="/themes/epa_theme/images/usa-icons-bg/search--white.svg"
+          class="usa-search__submit-icon"
+          alt="{{ 'Search'|t }}" />
     </button>
   </div>
 </form>

From 433dbd9362e4077d9764c66dc6ac4ec82b517a02 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 24 Jun 2022 12:29:13 -0400
Subject: [PATCH 23/57] [EPAD8-1774] update incorrect link

---
 .../epa_theme/source/_patterns/07-pages/standalone-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
index 19e1e7df32..cbdfe44a98 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
@@ -31,7 +31,7 @@ standalone_main_items:
     in_active_trail: false
 page_title: 'EPA Template'
 content: |-
-  <p>The Agency flagship Web Content Management System follows the <a href="https://www.epa.gov/web-policies-and-procedures/procedures-complying-epagov-look-and-feel">procedure to comply with the EPA.gov look and feel</a>. Every EPA application should also follow this procedure and standard.</p>
+  <p>The Agency flagship Web Content Management System follows the <a href="https://www.epa.gov/web-policies-and-procedures/procedure-complying-epagov-look-and-feel">procedure to comply with the EPA.gov look and feel</a>. Every EPA application should also follow this procedure and standard.</p>
   <ul>
     <li>Every EPA application must have the following:
     <ul>

From deae04a4e6549453c3188ed34540d0541da802fa Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Mon, 27 Jun 2022 09:49:52 -0500
Subject: [PATCH 24/57] [EPAD8-1734] - adds user status and last access to the
 user profile page

---
 ....entity_view_display.user.user.default.yml | 38 +++++++++++++++++--
 .../modules/custom/epa_core/epa_core.module   | 19 ++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_view_display.user.user.default.yml b/services/drupal/config/sync/core.entity_view_display.user.user.default.yml
index bd36a7c29a..88c3774f71 100644
--- a/services/drupal/config/sync/core.entity_view_display.user.user.default.yml
+++ b/services/drupal/config/sync/core.entity_view_display.user.user.default.yml
@@ -14,12 +14,22 @@ targetEntityType: user
 bundle: user
 mode: default
 content:
+  access:
+    type: timestamp_ago
+    label: inline
+    settings:
+      future_format: '@interval hence'
+      past_format: '@interval ago'
+      granularity: 5
+    third_party_settings: {  }
+    weight: 2
+    region: content
   entitygroupfield:
     type: epa_parent_group_with_roles_formatter
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 2
+    weight: 5
     region: content
   field_full_name:
     type: string
@@ -27,19 +37,39 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 0
+    region: content
+  login:
+    type: timestamp_ago
+    label: inline
+    settings:
+      future_format: '@interval hence'
+      past_format: '@interval ago'
+      granularity: 3
+    third_party_settings: {  }
+    weight: 3
     region: content
   mail:
     type: email_mailto
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: -2
+    weight: 4
     region: content
   masquerade:
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 6
+    region: content
+  status:
+    type: boolean
+    label: inline
+    settings:
+      format: custom
+      format_custom_false: Blocked
+      format_custom_true: Active
+    third_party_settings: {  }
+    weight: 1
     region: content
 hidden:
   field_email_opt_in: true
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index d674d43981..1bce37f121 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\Markup;
@@ -665,3 +666,21 @@ function epa_core_form_views_exposed_form_alter(&$form, &$form_state, $form_id)
      $form["field_search_text_value"]['#field_suffix'] = t('Note: searches most fields');
  }
 }
+
+
+/**
+ * Implements hook_entity_base_field_info_alter().
+ */
+function epa_core_entity_base_field_info_alter(&$fields, $entity_type) {
+  // If entity is user show user status and last access.
+  if ($entity_type->id() == 'user') {
+    if (isset($fields['status'])) {
+      $fields['status']->setDisplayConfigurable('view', TRUE)
+        ->setTargetEntityTypeId('user');
+    }
+    if (isset($fields['access'])) {
+      $fields['access']->setDisplayConfigurable('view', TRUE)
+        ->setTargetEntityTypeId('user');
+    }
+  }
+}

From 702bef92e38c58a0ff1a59f64e80ac0d64dd0c67 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Mon, 27 Jun 2022 15:46:03 -0500
Subject: [PATCH 25/57] [EPAD8-1734] - removes unused use statement

---
 services/drupal/web/modules/custom/epa_core/epa_core.module | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index 1bce37f121..afebc12b67 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\Markup;

From f6c380598271b03b696b13081b30dd79e75e929a Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Wed, 29 Jun 2022 16:31:33 -0500
Subject: [PATCH 26/57] [EPAD8-1763] - adds new permission for viewing user
 status and gives permission to authenticated users

---
 .../config/sync/user.role.authenticated.yml       |  1 +
 .../web/modules/custom/epa_core/epa_core.module   | 15 +++++++++++++++
 .../custom/epa_core/epa_core.permissions.yml      |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/services/drupal/config/sync/user.role.authenticated.yml b/services/drupal/config/sync/user.role.authenticated.yml
index 2454a2767a..816b6648e9 100644
--- a/services/drupal/config/sync/user.role.authenticated.yml
+++ b/services/drupal/config/sync/user.role.authenticated.yml
@@ -138,6 +138,7 @@ permissions:
   - 'view all revisions'
   - 'view any unpublished content'
   - 'view any webform submission'
+  - 'view group user status field'
   - 'view latest version'
   - 'view media'
   - 'view own unpublished content'
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index d674d43981..f9e1cbbda3 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -5,6 +5,7 @@
  * Contains epa_core.module.
  */
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Link;
@@ -665,3 +666,17 @@ function epa_core_form_views_exposed_form_alter(&$form, &$form_state, $form_id)
      $form["field_search_text_value"]['#field_suffix'] = t('Note: searches most fields');
  }
 }
+
+/**
+ * Implements hook_entity_field_access().
+ */
+function epa_core_entity_field_access($operation, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, \Drupal\Core\Session\AccountInterface $account, \Drupal\Core\Field\FieldItemListInterface $items = NULL)
+{
+  if ($field_definition->getName() == 'status' &&
+    $field_definition->getTargetEntityTypeId() == 'user' &&
+    $operation == 'view'
+  ) {
+    return AccessResult::allowedIfHasPermission($account, 'view group user status field');
+  }
+  return AccessResult::neutral();
+}
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml b/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
index 7c3e6bdf99..4de014a8bb 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
@@ -10,3 +10,6 @@
 'view paragraphs library listing':
   title: 'View Paragraphs Library Listing'
   description: 'Allows user to view the paragraphs library listing page.'
+'view group user status field':
+  title: 'View Group User Status Field'
+  description: 'Allows user to view the group user status field'

From 138bddf1d128df4efd1c321a0e790487ae3c9a33 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Thu, 30 Jun 2022 11:42:18 -0400
Subject: [PATCH 27/57] [EPAD8-1759] add l-constrain div to alerts page

---
 .../themes/epa_theme/templates/layout/page--alerts.html.twig  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/templates/layout/page--alerts.html.twig b/services/drupal/web/themes/epa_theme/templates/layout/page--alerts.html.twig
index 45872f3a76..3df8283583 100644
--- a/services/drupal/web/themes/epa_theme/templates/layout/page--alerts.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/layout/page--alerts.html.twig
@@ -13,6 +13,8 @@
       <h1 class="page-title">{{ page['#title'] }}</h1>
       {{ page.messages }}
     </div>
-    {{ page.content }}
+    <div class="l-constrain">
+      {{ page.content }}
+    </div>
   </div>
 {% endblock %}

From 07966253244d3e2f60858fbc85eb4e08b1a78dc8 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Thu, 30 Jun 2022 11:09:16 -0500
Subject: [PATCH 28/57] [EPAD8-1734] - adding permission to view group user
 last access and adding it to the field access function

---
 .../config/sync/user.role.authenticated.yml    |  1 +
 .../modules/custom/epa_core/epa_core.module    | 18 +++++++++++++-----
 .../custom/epa_core/epa_core.permissions.yml   |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/services/drupal/config/sync/user.role.authenticated.yml b/services/drupal/config/sync/user.role.authenticated.yml
index 816b6648e9..a6d7e919be 100644
--- a/services/drupal/config/sync/user.role.authenticated.yml
+++ b/services/drupal/config/sync/user.role.authenticated.yml
@@ -138,6 +138,7 @@ permissions:
   - 'view all revisions'
   - 'view any unpublished content'
   - 'view any webform submission'
+  - 'view group user last access field'
   - 'view group user status field'
   - 'view latest version'
   - 'view media'
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index 1761ce7819..9d779e873e 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -690,11 +690,19 @@ function epa_core_entity_base_field_info_alter(&$fields, $entity_type) {
  */
 function epa_core_entity_field_access($operation, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, \Drupal\Core\Session\AccountInterface $account, \Drupal\Core\Field\FieldItemListInterface $items = NULL)
 {
-  if ($field_definition->getName() == 'status' &&
-    $field_definition->getTargetEntityTypeId() == 'user' &&
-    $operation == 'view'
-  ) {
-    return AccessResult::allowedIfHasPermission($account, 'view group user status field');
+  if ($field_definition->getTargetEntityTypeId() == 'user') {
+    switch ($field_definition->getName()) {
+      case 'status':
+        if ($operation == 'view') {
+          return AccessResult::allowedIfHasPermission($account, 'view group user status field');
+        }
+        break;
+      case 'access':
+        if ($operation == 'view') {
+          return AccessResult::allowedIfHasPermission($account, 'view group user last access field');
+        }
+        break;
+    }
   }
   return AccessResult::neutral();
 }
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml b/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
index 4de014a8bb..de10106911 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.permissions.yml
@@ -13,3 +13,6 @@
 'view group user status field':
   title: 'View Group User Status Field'
   description: 'Allows user to view the group user status field'
+'view group user last access field':
+  title: 'View Group User Last Access Field'
+  description: 'Allows user to view the group user last access field'

From 043b49531bfa7849737b82cd0e021a38a7c3dd85 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Thu, 30 Jun 2022 14:10:19 -0400
Subject: [PATCH 29/57] [EPAD8-1774] update link copy per ticket conversation

---
 .../epa_theme/source/_patterns/07-pages/standalone-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
index cbdfe44a98..bc7f751e4a 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
@@ -62,4 +62,4 @@ content: |-
     <li>The EPA Pattern Lab has examples of pages that conform to this standard. Application developers can copy the HTML from the <a href="/themes/epa_theme/pattern-lab/?p=pages-page-with-sidenav">Page with Sidenav</a>, <a href="/themes/epa_theme/pattern-lab/?p=pages-page">Page with no Sidenav</a>, <a href="/themes/epa_theme/pattern-lab/?p=pages-page-with-sitewide-alerts">Page with Sitewide Alerts</a>, etc.</li>
   </ul>
   <h2>How-To</h2>
-  <p>To build your application template, visit the <a href="https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html">EPA Template Pattern Lab page and copy the HTML</a>. Modify it to include side navigation or a wide template, etc.</p>
+  <p>To build your application template, open this <a href="https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html">page outside of Pattern Lab and copy the HTML (Right-click, View Source)</a>. Modify it to include side navigation or a wide template, etc.</p>

From c5f3e9f2b65a6a485e7c058f7ec2013c0b8acc00 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 1 Jul 2022 11:58:57 -0400
Subject: [PATCH 30/57] EPAD8-1766 fix html encoded characters in CSV export

---
 .../sync/views.view.moderated_content.yml     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/services/drupal/config/sync/views.view.moderated_content.yml b/services/drupal/config/sync/views.view.moderated_content.yml
index 1e5b9b25bd..184b653462 100644
--- a/services/drupal/config/sync/views.view.moderated_content.yml
+++ b/services/drupal/config/sync/views.view.moderated_content.yml
@@ -1982,6 +1982,37 @@ display:
             encoding: utf8
             utf8_bom: '0'
             use_serializer_encode_only: false
+      row:
+        type: data_field
+        options:
+          field_options:
+            nid:
+              alias: ''
+              raw_output: false
+            title:
+              alias: ''
+              raw_output: true
+            gid:
+              alias: ''
+              raw_output: false
+            type:
+              alias: ''
+              raw_output: false
+            name:
+              alias: ''
+              raw_output: false
+            moderation_state:
+              alias: ''
+              raw_output: false
+            moderation_state_1:
+              alias: ''
+              raw_output: false
+            changed:
+              alias: ''
+              raw_output: false
+            view_node:
+              alias: ''
+              raw_output: false
       defaults:
         fields: false
       display_extenders:

From 6c13d19aa9a58fd839f9494d0a01cef1e41f1ca7 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 13 Jul 2022 09:59:44 -0400
Subject: [PATCH 31/57] EPAD8-1767 adding R template

---
 utilities/r/OneEPA_template.R | 467 ++++++++++++++++++++++++++++++++++
 1 file changed, 467 insertions(+)
 create mode 100644 utilities/r/OneEPA_template.R

diff --git a/utilities/r/OneEPA_template.R b/utilities/r/OneEPA_template.R
new file mode 100644
index 0000000000..e67fb08da5
--- /dev/null
+++ b/utilities/r/OneEPA_template.R
@@ -0,0 +1,467 @@
+require(shiny)
+
+ui <- fluidPage(
+  tags$html(class = "no-js", lang="en"),
+  tags$head(
+    tags$meta(charset="utf-8"),
+    tags$meta(property="og:site_name", content="US EPA"),
+    #tags$link(rel = "stylesheet", type = "text/css", href = "css/uswds.css"),
+    tags$link(rel = "stylesheet", type = "text/css", href = "https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/css/uswds.min.css", integrity="sha512-ZKvR1/R8Sgyx96aq5htbFKX84hN+zNXN73sG1dEHQTASpNA8Pc53vTbPsEKTXTZn9J4G7R5Il012VNsDEReqCA==", crossorigin="anonymous", referrerpolicy="no-referrer"),
+    tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"),
+    tags$link(rel="canonical", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"),
+    tags$link(rel="shortlink", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"),
+    tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"),
+    tags$meta(property="og:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg"),
+    tags$meta(property="og:image:width", content="1200"),
+    tags$meta(property="og:image:height", content="630"),
+    tags$meta(property="og:image:alt", content="U.S. Environmental Protection Agency"),
+    tags$meta(name="twitter:card", content="summary_large_image"),
+    tags$meta(name="twitter:image:alt", content="U.S. Environmental Protection Agency"),
+    tags$meta(name="twitter:image:height", content="600"),
+    tags$meta(name="twitter:image:width", content="1200"),
+    tags$meta(name="twitter:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg"),
+    tags$meta(name="MobileOptimized", content="width"),
+    tags$meta(name="HandheldFriendly", content="true"),
+    tags$meta(name="viewport", content="width=device-width, initial-scale=1.0"),
+    tags$meta(`http-equiv`="x-ua-compatible", content="ie=edge"),
+    tags$script(src = "js/pattern-lab-head-script.js"),
+    tags$title('ContDataQC | US EPA'),
+    tags$link(rel="icon", type="image/x-icon", href="https://www.epa.gov/themes/epa_theme/images/favicon.ico"),
+    tags$meta(name="msapplication-TileColor", content="#FFFFFF"),
+    tags$meta(name="msapplication-TileImage", content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"),
+    tags$meta(name="application-name", content=""),
+    tags$meta(name="msapplication-config", content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="196x196", href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="152x152", href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="144x144", href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="120x120", href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="114x114", href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png"),
+    tags$link(rel="apple-touch-icon-precomposed", sizes="72x72", href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png"),
+    tags$link(rel="apple-touch-icon-precomposed", href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png"),
+    tags$link(rel="icon", href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png", sizes="32x32"),
+    tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2", as="font", crossorigin="anonymous"),
+    tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2", as="font", crossorigin="anonymous"),
+    tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2", as="font", crossorigin="anonymous"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css?r6lsex" ),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css/styles.css?r6lsex"),
+    tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css?r6lsex"),
+
+    tags$script(src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds-init.min.js'),
+    #fix container-fluid that boostrap RShiny uses
+    tags$style(HTML(
+      '.container-fluid {
+            padding-right: 0;
+            padding-left: 0;
+            margin-right: 0;
+            margin-left: 0;
+        }
+        .tab-content {
+            margin-right: 30px;
+            margin-left: 30px;
+        }'
+    ))
+  ),
+  tags$body(class="path-themes not-front has-wide-template", id="top",
+    tags$script(src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds.min.js')
+  ),
+  
+  # Site Header
+  HTML(
+    '<div class="skiplinks" role="navigation" aria-labelledby="skip-to-main">
+      <a id="skip-to-main" href="#main" class="skiplinks__link visually-hidden focusable">Skip to main content</a>
+    </div>
+
+    <!-- Google Tag Manager (noscript) -->
+    <!--noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-L8ZB" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript-->
+    <!-- End Google Tag Manager (noscript) -->
+
+    <div class="dialog-off-canvas-main-canvas" data-off-canvas-main-canvas>
+    <section class="usa-banner" aria-label="Official government website">
+      <div class="usa-accordion">
+        <header class="usa-banner__header">
+          <div class="usa-banner__inner">
+            <div class="grid-col-auto">
+              <img class="usa-banner__header-flag" src="https://www.epa.gov/themes/epa_theme/images/us_flag_small.png" alt="U.S. flag" />
+            </div>
+            <div class="grid-col-fill tablet:grid-col-auto">
+              <p class="usa-banner__header-text">An official website of the United States government</p>
+              <p class="usa-banner__header-action" aria-hidden="true">Here’s how you know</p>
+            </div>
+            <button class="usa-accordion__button usa-banner__button" aria-expanded="false" aria-controls="gov-banner">
+              <span class="usa-banner__button-text">Here’s how you know</span>
+            </button>
+          </div>
+        </header>
+        <div class="usa-banner__content usa-accordion__content" id="gov-banner">
+          <div class="grid-row grid-gap-lg">
+            <div class="usa-banner__guidance tablet:grid-col-6">
+              <img class="usa-banner__icon usa-media-block__img" src="https://www.epa.gov/themes/epa_theme/images/icon-dot-gov.svg" alt="Dot gov">
+              <div class="usa-media-block__body">
+                <p>
+                  <strong>Official websites use .gov</strong>
+                  <br> A <strong>.gov</strong> website belongs to an official government organization in the United States.
+                </p>
+              </div>
+            </div>
+            <div class="usa-banner__guidance tablet:grid-col-6">
+              <img class="usa-banner__icon usa-media-block__img" src="https://www.epa.gov/themes/epa_theme/images/icon-https.svg" alt="HTTPS">
+              <div class="usa-media-block__body">
+                <p>
+                  <strong>Secure .gov websites use HTTPS</strong>
+                  <br> A <strong>lock</strong> (<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" width="52" height="64" viewBox="0 0 52 64" class="usa-banner__lock-image" role="img" aria-labelledby="banner-lock-title banner-lock-description"><title id="banner-lock-title">Lock</title><desc id="banner-lock-description">A locked padlock</desc><path fill="#000000" fill-rule="evenodd" d="M26 0c10.493 0 19 8.507 19 19v9h3a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V32a4 4 0 0 1 4-4h3v-9C7 8.507 15.507 0 26 0zm0 8c-5.979 0-10.843 4.77-10.996 10.712L15 19v9h22v-9c0-6.075-4.925-11-11-11z"/></svg></span>) or <strong>https://</strong> means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
+    <div>
+      <div class="js-view-dom-id-epa-alerts--public">
+        <noscript>
+          <div class="usa-site-alert usa-site-alert--info">
+            <div class="usa-alert">
+              <div class="usa-alert__body">
+                <div class="usa-alert__text">
+                  <p>JavaScript appears to be disabled on this computer. Please <a href="/alerts">click here to see any active alerts</a>.</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </noscript>
+      </div>
+    </div>
+    <header class="l-header">
+      <div class="usa-overlay"></div>
+      <div class="l-constrain">
+        <div class="l-header__navbar">
+          <div class="l-header__branding">
+            <a class="site-logo" href="/" aria-label="Home" title="Home" rel="home">
+              <span class="site-logo__image">
+                <svg class="site-logo__svg" viewBox="0 0 1061 147" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M112.8 53.5C108 72.1 89.9 86.8 69.9 86.8c-20.1 0-38-14.7-42.9-33.4h.2s9.8 10.3-.2 0c3.1 3.1 6.2 4.4 10.7 4.4s7.7-1.3 10.7-4.4c3.1 3.1 6.3 4.5 10.9 4.4 4.5 0 7.6-1.3 10.7-4.4 3.1 3.1 6.2 4.4 10.7 4.4 4.5 0 7.7-1.3 10.7-4.4 3.1 3.1 6.3 4.5 10.9 4.4 4.3 0 7.4-1.2 10.5-4.3zM113.2 43.5c0-24-19.4-43.5-43.3-43.5-24 0-43.5 19.5-43.5 43.5h39.1c-4.8-1.8-8.1-6.3-8.1-11.6 0-7 5.7-12.5 12.5-12.5 7 0 12.7 5.5 12.7 12.5 0 5.2-3.1 9.6-7.6 11.6h38.2zM72.6 139.3c.7-36.9 29.7-68.8 66.9-70 0 37.2-30 68-66.9 70zM67.1 139.3c-.7-36.9-29.7-68.8-67.1-70 0 37.2 30.2 68 67.1 70zM240 3.1h-87.9v133.1H240v-20.4h-60.3v-36H240v-21h-60.3v-35H240V3.1zM272.8 58.8h27.1c9.1 0 15.2-8.6 15.1-17.7-.1-9-6.1-17.3-15.1-17.3h-25.3v112.4h-27.8V3.1h62.3c20.2 0 35 17.8 35.2 38 .2 20.4-14.8 38.7-35.2 38.7h-36.3v-21zM315.9 136.2h29.7l12.9-35h54.2l-8.1-21.9h-38.4l18.9-50.7 39.2 107.6H454L400.9 3.1h-33.7l-51.3 133.1zM473.3.8v22.4c0 1.9.2 3.3.5 4.3s.7 1.7 1 2.2c1.2 1.4 2.5 2.4 3.9 2.9 1.5.5 2.8.7 4.1.7 2.4 0 4.2-.4 5.5-1.3 1.3-.8 2.2-1.8 2.8-2.9.6-1.1.9-2.3 1-3.4.1-1.1.1-2 .1-2.6V.8h4.7v24c0 .7-.1 1.5-.4 2.4-.3 1.8-1.2 3.6-2.5 5.4-1.8 2.1-3.8 3.5-6 4.2-2.2.6-4 .9-5.3.9-1.8 0-3.8-.3-6.2-1.1-2.4-.8-4.5-2.3-6.2-4.7-.5-.8-1-1.8-1.4-3.2-.4-1.3-.6-3.3-.6-5.9V.8h5zM507.5 14.5v-2.9l4.6.1-.1 4.1c.2-.3.4-.7.8-1.2.3-.5.8-.9 1.4-1.4.6-.5 1.4-.9 2.3-1.3.9-.3 2.1-.5 3.4-.4.6 0 1.4.1 2.4.3.9.2 1.9.6 2.9 1.2s1.8 1.5 2.4 2.6c.6 1.2.9 2.8.9 4.7l-.4 17-4.6-.1.4-16c0-.9 0-1.7-.2-2.4-.1-.7-.5-1.3-1.1-1.9-1.2-1.2-2.6-1.8-4.3-1.8-1.7 0-3.1.5-4.4 1.7-1.3 1.2-2 3.1-2.1 5.7l-.3 14.5-4.5-.1.5-22.4zM537.2.9h5.5V6h-5.5V.9m.5 10.9h4.6v25.1h-4.6V11.8zM547.8 11.7h4.3V6.4l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V37c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V15.1h-4.3v-3.4zM570.9 25.2c-.1 2.6.5 4.8 1.7 6.5 1.1 1.7 2.9 2.6 5.3 2.6 1.5 0 2.8-.4 3.9-1.3 1-.8 1.6-2.2 1.8-4h4.6c0 .6-.2 1.4-.4 2.3-.3 1-.8 2-1.7 3-.2.3-.6.6-1 1-.5.4-1 .7-1.7 1.1-.7.4-1.5.6-2.4.8-.9.3-2 .4-3.3.4-7.6-.2-11.3-4.5-11.3-12.9 0-2.5.3-4.8 1-6.8s2-3.7 3.8-5.1c1.2-.8 2.4-1.3 3.7-1.6 1.3-.2 2.2-.3 3-.3 2.7 0 4.8.6 6.3 1.6s2.5 2.3 3.1 3.9c.6 1.5 1 3.1 1.1 4.6.1 1.6.1 2.9 0 4h-17.5m12.9-3v-1.1c0-.4 0-.8-.1-1.2-.1-.9-.4-1.7-.8-2.5s-1-1.5-1.8-2c-.9-.5-2-.8-3.4-.8-.8 0-1.5.1-2.3.3-.8.2-1.5.7-2.2 1.3-.7.6-1.2 1.3-1.6 2.3-.4 1-.7 2.2-.8 3.6h13zM612.9.9h4.6V33c0 1 .1 2.3.2 4h-4.6l-.1-4c-.2.3-.4.7-.7 1.2-.3.5-.8 1-1.4 1.5-1 .7-2 1.2-3.1 1.4l-1.5.3c-.5.1-.9.1-1.4.1-.4 0-.8 0-1.3-.1s-1.1-.2-1.7-.3c-1.1-.3-2.3-.9-3.4-1.8s-2.1-2.2-2.9-3.8c-.8-1.7-1.2-3.9-1.2-6.6.1-4.8 1.2-8.3 3.4-10.5 2.1-2.1 4.7-3.2 7.6-3.2 1.3 0 2.4.2 3.4.5.9.3 1.6.7 2.2 1.2.6.4 1 .9 1.3 1.4.3.5.6.8.7 1.1V.9m0 23.1c0-1.9-.2-3.3-.5-4.4-.4-1.1-.8-2-1.4-2.6-.5-.7-1.2-1.3-2-1.8-.9-.5-2-.7-3.3-.7-1.7 0-2.9.5-3.8 1.3-.9.8-1.6 1.9-2 3.1-.4 1.2-.7 2.3-.7 3.4-.1 1.1-.2 1.9-.1 2.4 0 1.1.1 2.2.3 3.4.2 1.1.5 2.2 1 3.1.5 1 1.2 1.7 2 2.3.9.6 2 .9 3.3.9 1.8 0 3.2-.5 4.2-1.4 1-.8 1.7-1.8 2.1-3 .4-1.2.7-2.4.8-3.4.1-1.4.1-2.1.1-2.6zM643.9 26.4c0 .6.1 1.3.3 2.1.1.8.5 1.6 1 2.3.5.8 1.4 1.4 2.5 1.9s2.7.8 4.7.8c1.8 0 3.3-.3 4.4-.8 1.1-.5 1.9-1.1 2.5-1.8.6-.7 1-1.5 1.1-2.2.1-.7.2-1.2.2-1.7 0-1-.2-1.9-.5-2.6-.4-.6-.9-1.2-1.6-1.6-1.4-.8-3.4-1.4-5.9-2-4.9-1.1-8.1-2.2-9.5-3.2-1.4-1-2.3-2.2-2.9-3.5-.6-1.2-.8-2.4-.8-3.6.1-3.7 1.5-6.4 4.2-8.1 2.6-1.7 5.7-2.5 9.1-2.5 1.3 0 2.9.2 4.8.5 1.9.4 3.6 1.4 5 3 .5.5.9 1.1 1.2 1.7.3.5.5 1.1.6 1.6.2 1.1.3 2.1.3 2.9h-5c-.2-2.2-1-3.7-2.4-4.5-1.5-.7-3.1-1.1-4.9-1.1-5.1.1-7.7 2-7.8 5.8 0 1.5.5 2.7 1.6 3.5 1 .8 2.6 1.4 4.7 1.9 4 1 6.7 1.8 8.1 2.2.8.2 1.4.5 1.8.7.5.2 1 .5 1.4.9.8.5 1.4 1.1 1.9 1.8s.8 1.4 1.1 2.1c.3 1.4.5 2.5.5 3.4 0 3.3-1.2 6-3.5 8-2.3 2.1-5.8 3.2-10.3 3.3-1.4 0-3.2-.3-5.4-.8-1-.3-2-.7-3-1.2-.9-.5-1.8-1.2-2.5-2.1-.9-1.4-1.5-2.7-1.7-4.1-.3-1.3-.4-2.4-.3-3.2h5zM670 11.7h4.3V6.4l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V37c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V15.1H670v-3.4zM705.3 36.9c-.3-1.2-.5-2.5-.4-3.7-.5 1-1.1 1.8-1.7 2.4-.7.6-1.4 1.1-2 1.4-1.4.5-2.7.8-3.7.8-2.8 0-4.9-.8-6.4-2.2-1.5-1.4-2.2-3.1-2.2-5.2 0-1 .2-2.3.8-3.7.6-1.4 1.7-2.6 3.5-3.7 1.4-.7 2.9-1.2 4.5-1.5 1.6-.1 2.9-.2 3.9-.2s2.1 0 3.3.1c.1-2.9-.2-4.8-.9-5.6-.5-.6-1.1-1.1-1.9-1.3-.8-.2-1.6-.4-2.3-.4-1.1 0-2 .2-2.6.5-.7.3-1.2.7-1.5 1.2-.3.5-.5.9-.6 1.4-.1.5-.2.9-.2 1.2h-4.6c.1-.7.2-1.4.4-2.3.2-.8.6-1.6 1.3-2.5.5-.6 1-1 1.7-1.3.6-.3 1.3-.6 2-.8 1.5-.4 2.8-.6 4.2-.6 1.8 0 3.6.3 5.2.9 1.6.6 2.8 1.6 3.4 2.9.4.7.6 1.4.7 2 .1.6.1 1.2.1 1.8l-.2 12c0 1 .1 3.1.4 6.3h-4.2m-.5-12.1c-.7-.1-1.6-.1-2.6-.1h-2.1c-1 .1-2 .3-3 .6s-1.9.8-2.6 1.5c-.8.7-1.2 1.7-1.2 3 0 .4.1.8.2 1.3s.4 1 .8 1.5.9.8 1.6 1.1c.7.3 1.5.5 2.5.5 2.3 0 4.1-.9 5.2-2.7.5-.8.8-1.7 1-2.7.1-.9.2-2.2.2-4zM714.5 11.7h4.3V6.4l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V37c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V15.1h-4.3v-3.4zM737.6 25.2c-.1 2.6.5 4.8 1.7 6.5 1.1 1.7 2.9 2.6 5.3 2.6 1.5 0 2.8-.4 3.9-1.3 1-.8 1.6-2.2 1.8-4h4.6c0 .6-.2 1.4-.4 2.3-.3 1-.8 2-1.7 3-.2.3-.6.6-1 1-.5.4-1 .7-1.7 1.1-.7.4-1.5.6-2.4.8-.9.3-2 .4-3.3.4-7.6-.2-11.3-4.5-11.3-12.9 0-2.5.3-4.8 1-6.8s2-3.7 3.8-5.1c1.2-.8 2.4-1.3 3.7-1.6 1.3-.2 2.2-.3 3-.3 2.7 0 4.8.6 6.3 1.6s2.5 2.3 3.1 3.9c.6 1.5 1 3.1 1.1 4.6.1 1.6.1 2.9 0 4h-17.5m12.9-3v-1.1c0-.4 0-.8-.1-1.2-.1-.9-.4-1.7-.8-2.5s-1-1.5-1.8-2c-.9-.5-2-.8-3.4-.8-.8 0-1.5.1-2.3.3-.8.2-1.5.7-2.2 1.3-.7.6-1.2 1.3-1.6 2.3-.4 1-.7 2.2-.8 3.6h13zM765.3 29.5c0 .5.1 1 .2 1.4.1.5.4 1 .8 1.5s.9.8 1.6 1.1c.7.3 1.6.5 2.7.5 1 0 1.8-.1 2.5-.3.7-.2 1.3-.6 1.7-1.2.5-.7.8-1.5.8-2.4 0-1.2-.4-2-1.3-2.5s-2.2-.9-4.1-1.2c-1.3-.3-2.4-.6-3.6-1-1.1-.3-2.1-.8-3-1.3-.9-.5-1.5-1.2-2-2.1-.5-.8-.8-1.9-.8-3.2 0-2.4.9-4.2 2.6-5.6 1.7-1.3 4-2 6.8-2.1 1.6 0 3.3.3 5 .8 1.7.6 2.9 1.6 3.7 3.1.4 1.4.6 2.6.6 3.7h-4.6c0-1.8-.6-3-1.7-3.5-1.1-.4-2.1-.6-3.1-.6h-1c-.5 0-1.1.2-1.7.4-.6.2-1.1.5-1.5 1.1-.5.5-.7 1.2-.7 2.1 0 1.1.5 1.9 1.3 2.3.7.4 1.5.7 2.1.9 3.3.7 5.6 1.3 6.9 1.8 1.3.4 2.2 1 2.8 1.7.7.7 1.1 1.4 1.4 2.2.3.8.4 1.6.4 2.5 0 1.4-.3 2.7-.9 3.8-.6 1.1-1.4 2-2.4 2.6-1.1.6-2.2 1-3.4 1.3-1.2.3-2.5.4-3.8.4-2.5 0-4.7-.6-6.6-1.8-1.8-1.2-2.8-3.3-2.9-6.3h5.2zM467.7 50.8h21.9V55h-17.1v11.3h16.3v4.2h-16.3v12.1H490v4.3h-22.3zM499 64.7l-.1-2.9h4.6v4.1c.2-.3.4-.8.7-1.2.3-.5.8-1 1.3-1.5.6-.5 1.4-1 2.3-1.3.9-.3 2-.5 3.4-.5.6 0 1.4.1 2.4.2.9.2 1.9.5 2.9 1.1 1 .6 1.8 1.4 2.5 2.5.6 1.2 1 2.7 1 4.7V87h-4.6V71c0-.9-.1-1.7-.2-2.4-.2-.7-.5-1.3-1.1-1.9-1.2-1.1-2.6-1.7-4.3-1.7-1.7 0-3.1.6-4.3 1.8-1.3 1.2-2 3.1-2 5.7V87H499V64.7zM524.6 61.8h5.1l7.7 19.9 7.6-19.9h5l-10.6 25.1h-4.6zM555.7 50.9h5.5V56h-5.5v-5.1m.5 10.9h4.6v25.1h-4.6V61.8zM570.3 67c0-1.8-.1-3.5-.3-5.1h4.6l.1 4.9c.5-1.8 1.4-3 2.5-3.7 1.1-.7 2.2-1.2 3.3-1.3 1.4-.2 2.4-.2 3.1-.1v4.6c-.2-.1-.5-.2-.9-.2h-1.3c-1.3 0-2.4.2-3.3.5-.9.4-1.5.9-2 1.6-.9 1.4-1.4 3.2-1.3 5.4v13.3h-4.6V67zM587.6 74.7c0-1.6.2-3.2.6-4.8.4-1.6 1.1-3 2-4.4 1-1.3 2.2-2.4 3.8-3.2 1.6-.8 3.6-1.2 5.9-1.2 2.4 0 4.5.4 6.1 1.3 1.5.9 2.7 2 3.6 3.3.9 1.3 1.5 2.8 1.8 4.3.2.8.3 1.5.4 2.2v2.2c0 3.7-1 6.9-3 9.5-2 2.6-5.1 4-9.3 4-4-.1-7-1.4-9-3.9-1.9-2.5-2.9-5.6-2.9-9.3m4.8-.3c0 2.7.6 5 1.8 6.9 1.2 2 3 3 5.6 3.1.9 0 1.8-.2 2.7-.5.8-.3 1.6-.9 2.3-1.7.7-.8 1.3-1.9 1.8-3.2.4-1.3.6-2.9.6-4.7-.1-6.4-2.5-9.6-7.1-9.6-.7 0-1.5.1-2.4.3-.8.3-1.7.8-2.5 1.6-.8.7-1.4 1.7-1.9 3-.6 1.1-.9 2.8-.9 4.8zM620.2 64.7l-.1-2.9h4.6v4.1c.2-.3.4-.8.7-1.2.3-.5.8-1 1.3-1.5.6-.5 1.4-1 2.3-1.3.9-.3 2-.5 3.4-.5.6 0 1.4.1 2.4.2.9.2 1.9.5 2.9 1.1 1 .6 1.8 1.4 2.5 2.5.6 1.2 1 2.7 1 4.7V87h-4.6V71c0-.9-.1-1.7-.2-2.4-.2-.7-.5-1.3-1.1-1.9-1.2-1.1-2.6-1.7-4.3-1.7-1.7 0-3.1.6-4.3 1.8-1.3 1.2-2 3.1-2 5.7V87h-4.6V64.7zM650 65.1l-.1-3.3h4.6v3.6c1.2-1.9 2.6-3.2 4.1-3.7 1.5-.4 2.7-.6 3.8-.6 1.4 0 2.6.2 3.6.5.9.3 1.7.7 2.3 1.1 1.1 1 1.9 2 2.3 3.1.2-.4.5-.8 1-1.3.4-.5.9-1 1.5-1.6.6-.5 1.5-.9 2.5-1.3 1-.3 2.2-.5 3.5-.5.9 0 1.9.1 3 .3 1 .2 2 .7 3 1.3 1 .6 1.7 1.5 2.3 2.7.6 1.2.9 2.7.9 4.6v16.9h-4.6V70.7c0-1.1-.1-2-.2-2.5-.1-.6-.3-1-.6-1.3-.4-.6-1-1.2-1.8-1.6-.8-.4-1.8-.6-3.1-.6-1.5 0-2.7.4-3.6 1-.4.3-.8.5-1.1.9l-.8.8c-.5.8-.8 1.8-1 2.8-.1 1.1-.2 2-.1 2.6v14.1h-4.6V70.2c0-1.6-.5-2.9-1.4-4-.9-1-2.3-1.5-4.2-1.5-1.6 0-2.9.4-3.8 1.1-.9.7-1.5 1.2-1.8 1.7-.5.7-.8 1.5-.9 2.5-.1.9-.2 1.8-.2 2.6v14.3H650V65.1zM700.5 75.2c-.1 2.6.5 4.8 1.7 6.5 1.1 1.7 2.9 2.6 5.3 2.6 1.5 0 2.8-.4 3.9-1.3 1-.8 1.6-2.2 1.8-4h4.6c0 .6-.2 1.4-.4 2.3-.3 1-.8 2-1.7 3-.2.3-.6.6-1 1-.5.4-1 .7-1.7 1.1-.7.4-1.5.6-2.4.8-.9.3-2 .4-3.3.4-7.6-.2-11.3-4.5-11.3-12.9 0-2.5.3-4.8 1-6.8s2-3.7 3.8-5.1c1.2-.8 2.4-1.3 3.7-1.6 1.3-.2 2.2-.3 3-.3 2.7 0 4.8.6 6.3 1.6s2.5 2.3 3.1 3.9c.6 1.5 1 3.1 1.1 4.6.1 1.6.1 2.9 0 4h-17.5m12.8-3v-1.1c0-.4 0-.8-.1-1.2-.1-.9-.4-1.7-.8-2.5s-1-1.5-1.8-2c-.9-.5-2-.8-3.4-.8-.8 0-1.5.1-2.3.3-.8.2-1.5.7-2.2 1.3-.7.6-1.2 1.3-1.6 2.3-.4 1-.7 2.2-.8 3.6h13zM725.7 64.7l-.1-2.9h4.6v4.1c.2-.3.4-.8.7-1.2.3-.5.8-1 1.3-1.5.6-.5 1.4-1 2.3-1.3.9-.3 2-.5 3.4-.5.6 0 1.4.1 2.4.2.9.2 1.9.5 2.9 1.1 1 .6 1.8 1.4 2.5 2.5.6 1.2 1 2.7 1 4.7V87h-4.6V71c0-.9-.1-1.7-.2-2.4-.2-.7-.5-1.3-1.1-1.9-1.2-1.1-2.6-1.7-4.3-1.7-1.7 0-3.1.6-4.3 1.8-1.3 1.2-2 3.1-2 5.7V87h-4.6V64.7zM752.3 61.7h4.3v-5.2l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V87c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V65.1h-4.3v-3.4zM787.6 86.9c-.3-1.2-.5-2.5-.4-3.7-.5 1-1.1 1.8-1.7 2.4-.7.6-1.4 1.1-2 1.4-1.4.5-2.7.8-3.7.8-2.8 0-4.9-.8-6.4-2.2-1.5-1.4-2.2-3.1-2.2-5.2 0-1 .2-2.3.8-3.7.6-1.4 1.7-2.6 3.5-3.7 1.4-.7 2.9-1.2 4.5-1.5 1.6-.1 2.9-.2 3.9-.2s2.1 0 3.3.1c.1-2.9-.2-4.8-.9-5.6-.5-.6-1.1-1.1-1.9-1.3-.8-.2-1.6-.4-2.3-.4-1.1 0-2 .2-2.6.5-.7.3-1.2.7-1.5 1.2-.3.5-.5.9-.6 1.4-.1.5-.2.9-.2 1.2h-4.6c.1-.7.2-1.4.4-2.3.2-.8.6-1.6 1.3-2.5.5-.6 1-1 1.7-1.3.6-.3 1.3-.6 2-.8 1.5-.4 2.8-.6 4.2-.6 1.8 0 3.6.3 5.2.9 1.6.6 2.8 1.6 3.4 2.9.4.7.6 1.4.7 2 .1.6.1 1.2.1 1.8l-.2 12c0 1 .1 3.1.4 6.3h-4.2m-.5-12.1c-.7-.1-1.6-.1-2.6-.1h-2.1c-1 .1-2 .3-3 .6s-1.9.8-2.6 1.5c-.8.7-1.2 1.7-1.2 3 0 .4.1.8.2 1.3s.4 1 .8 1.5.9.8 1.6 1.1c.7.3 1.5.5 2.5.5 2.3 0 4.1-.9 5.2-2.7.5-.8.8-1.7 1-2.7.1-.9.2-2.2.2-4zM800.7 50.9h4.6V87h-4.6zM828.4 50.8h11.7c2.1 0 3.9.1 5.5.4.8.2 1.5.4 2.2.9.7.4 1.3.9 1.8 1.6 1.7 1.9 2.6 4.2 2.6 7 0 2.7-.9 5.1-2.8 7.1-.8.9-2 1.7-3.6 2.2-1.6.6-3.9.9-6.9.9h-5.7V87h-4.8V50.8m4.8 15.9h5.8c.8 0 1.7-.1 2.6-.2.9-.1 1.8-.3 2.6-.7.8-.4 1.5-1 2-1.9.5-.8.8-2 .8-3.4s-.2-2.5-.7-3.3c-.5-.8-1.1-1.3-1.9-1.7-1.6-.5-3.1-.8-4.5-.7h-6.8v11.9zM858.1 67c0-1.8-.1-3.5-.3-5.1h4.6l.1 4.9c.5-1.8 1.4-3 2.5-3.7 1.1-.7 2.2-1.2 3.3-1.3 1.4-.2 2.4-.2 3.1-.1v4.6c-.2-.1-.5-.2-.9-.2h-1.3c-1.3 0-2.4.2-3.3.5-.9.4-1.5.9-2 1.6-.9 1.4-1.4 3.2-1.3 5.4v13.3H858V67zM875.5 74.7c0-1.6.2-3.2.6-4.8.4-1.6 1.1-3 2-4.4 1-1.3 2.2-2.4 3.8-3.2 1.6-.8 3.6-1.2 5.9-1.2 2.4 0 4.5.4 6.1 1.3 1.5.9 2.7 2 3.6 3.3.9 1.3 1.5 2.8 1.8 4.3.2.8.3 1.5.4 2.2v2.2c0 3.7-1 6.9-3 9.5-2 2.6-5.1 4-9.3 4-4-.1-7-1.4-9-3.9-1.9-2.5-2.9-5.6-2.9-9.3m4.8-.3c0 2.7.6 5 1.8 6.9 1.2 2 3 3 5.6 3.1.9 0 1.8-.2 2.7-.5.8-.3 1.6-.9 2.3-1.7.7-.8 1.3-1.9 1.8-3.2.4-1.3.6-2.9.6-4.7-.1-6.4-2.5-9.6-7.1-9.6-.7 0-1.5.1-2.4.3-.8.3-1.7.8-2.5 1.6-.8.7-1.4 1.7-1.9 3-.7 1.1-.9 2.8-.9 4.8zM904.1 61.7h4.3v-5.2l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V87c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V65.1h-4.3v-3.4zM927.2 75.2c-.1 2.6.5 4.8 1.7 6.5 1.1 1.7 2.9 2.6 5.3 2.6 1.5 0 2.8-.4 3.9-1.3 1-.8 1.6-2.2 1.8-4h4.6c0 .6-.2 1.4-.4 2.3-.3 1-.8 2-1.7 3-.2.3-.6.6-1 1-.5.4-1 .7-1.7 1.1-.7.4-1.5.6-2.4.8-.9.3-2 .4-3.3.4-7.6-.2-11.3-4.5-11.3-12.9 0-2.5.3-4.8 1-6.8s2-3.7 3.8-5.1c1.2-.8 2.4-1.3 3.7-1.6 1.3-.2 2.2-.3 3-.3 2.7 0 4.8.6 6.3 1.6s2.5 2.3 3.1 3.9c.6 1.5 1 3.1 1.1 4.6.1 1.6.1 2.9 0 4h-17.5m12.9-3v-1.1c0-.4 0-.8-.1-1.2-.1-.9-.4-1.7-.8-2.5s-1-1.5-1.8-2c-.9-.5-2-.8-3.4-.8-.8 0-1.5.1-2.3.3-.8.2-1.5.7-2.2 1.3-.7.6-1.2 1.3-1.6 2.3-.4 1-.7 2.2-.8 3.6h13zM966.1 69.8c0-.3 0-.8-.1-1.4-.1-.6-.3-1.1-.6-1.8-.2-.6-.7-1.2-1.4-1.6-.7-.4-1.6-.6-2.7-.6-1.5 0-2.7.4-3.5 1.2-.9.8-1.5 1.7-1.9 2.8-.4 1.1-.6 2.2-.7 3.2-.1 1.1-.2 1.8-.1 2.4 0 1.3.1 2.5.3 3.7.2 1.2.5 2.3.9 3.3.8 2 2.4 3 4.8 3.1 1.9 0 3.3-.7 4.1-1.9.8-1.1 1.2-2.3 1.2-3.6h4.6c-.2 2.5-1.1 4.6-2.7 6.3-1.7 1.8-4.1 2.7-7.1 2.7-.9 0-2.1-.2-3.6-.6-.7-.2-1.4-.6-2.2-1-.8-.4-1.5-1-2.2-1.7-.7-.9-1.4-2.1-2-3.6-.6-1.5-.9-3.5-.9-6.1 0-2.6.4-4.8 1.1-6.6.7-1.7 1.6-3.1 2.7-4.2 1.1-1 2.3-1.8 3.6-2.2 1.3-.4 2.5-.6 3.7-.6h1.6c.6.1 1.3.2 1.9.4.7.2 1.4.5 2.1 1 .7.4 1.3 1 1.8 1.7.9 1.1 1.4 2.1 1.7 3.1.2 1 .3 1.8.3 2.6h-4.7zM973.6 61.7h4.3v-5.2l4.5-1.5v6.8h5.4v3.4h-5.4v15.1c0 .3 0 .6.1 1 0 .4.1.7.4 1.1.2.4.5.6 1 .8.4.3 1 .4 1.8.4 1 0 1.7-.1 2.2-.2V87c-.9.2-2.1.3-3.8.3-2.1 0-3.6-.4-4.6-1.2-1-.8-1.5-2.2-1.5-4.2V65.1h-4.3v-3.4zM993.5 50.9h5.5V56h-5.5v-5.1m.5 10.9h4.6v25.1H994V61.8zM1006.1 74.7c0-1.6.2-3.2.6-4.8.4-1.6 1.1-3 2-4.4 1-1.3 2.2-2.4 3.8-3.2 1.6-.8 3.6-1.2 5.9-1.2 2.4 0 4.5.4 6.1 1.3 1.5.9 2.7 2 3.6 3.3.9 1.3 1.5 2.8 1.8 4.3.2.8.3 1.5.4 2.2v2.2c0 3.7-1 6.9-3 9.5-2 2.6-5.1 4-9.3 4-4-.1-7-1.4-9-3.9-1.9-2.5-2.9-5.6-2.9-9.3m4.7-.3c0 2.7.6 5 1.8 6.9 1.2 2 3 3 5.6 3.1.9 0 1.8-.2 2.7-.5.8-.3 1.6-.9 2.3-1.7.7-.8 1.3-1.9 1.8-3.2.4-1.3.6-2.9.6-4.7-.1-6.4-2.5-9.6-7.1-9.6-.7 0-1.5.1-2.4.3-.8.3-1.7.8-2.5 1.6-.8.7-1.4 1.7-1.9 3-.6 1.1-.9 2.8-.9 4.8zM1038.6 64.7l-.1-2.9h4.6v4.1c.2-.3.4-.8.7-1.2.3-.5.8-1 1.3-1.5.6-.5 1.4-1 2.3-1.3.9-.3 2-.5 3.4-.5.6 0 1.4.1 2.4.2.9.2 1.9.5 2.9 1.1 1 .6 1.8 1.4 2.5 2.5.6 1.2 1 2.7 1 4.7V87h-4.6V71c0-.9-.1-1.7-.2-2.4-.2-.7-.5-1.3-1.1-1.9-1.2-1.1-2.6-1.7-4.3-1.7-1.7 0-3.1.6-4.3 1.8-1.3 1.2-2 3.1-2 5.7V87h-4.6V64.7zM479.1 100.8h5.2l14.1 36.1h-5.3l-3.8-9.4h-16.2l-3.8 9.4h-5l14.8-36.1m-4.4 22.7H488l-6.5-17.8-6.8 17.8zM508.7 138.8c.1.7.2 1.4.4 1.9.2.6.5 1.1.9 1.6.8.9 2.3 1.4 4.4 1.5 1.6 0 2.8-.3 3.7-.9.9-.6 1.5-1.4 1.9-2.4.4-1.1.6-2.3.7-3.7.1-1.4.1-2.9.1-4.6-.5.9-1.1 1.7-1.8 2.3-.7.6-1.5 1-2.3 1.3-1.7.4-3 .6-3.9.6-1.2 0-2.4-.2-3.8-.6-1.4-.4-2.6-1.2-3.7-2.5-1-1.3-1.7-2.8-2.1-4.4-.4-1.6-.6-3.2-.6-4.8 0-4.3 1.1-7.4 3.2-9.5 2-2.1 4.6-3.1 7.6-3.1 1.3 0 2.3.1 3.2.4.9.3 1.6.6 2.1 1 .6.4 1.1.8 1.5 1.2l.9 1.2v-3.4h4.4l-.1 4.5v15.7c0 2.9-.1 5.2-.2 6.7-.2 1.6-.5 2.8-1 3.7-1.1 1.9-2.6 3.2-4.6 3.7-1.9.6-3.8.8-5.6.8-2.4 0-4.3-.3-5.6-.8-1.4-.5-2.4-1.2-3-2-.6-.8-1-1.7-1.2-2.7-.2-.9-.3-1.8-.4-2.7h4.9m5.3-5.8c1.4 0 2.5-.2 3.3-.7.8-.5 1.5-1.1 2-1.8.5-.6.9-1.4 1.2-2.5.3-1 .4-2.6.4-4.8 0-1.6-.2-2.9-.4-3.9-.3-1-.8-1.8-1.4-2.4-1.3-1.4-3-2.2-5.2-2.2-1.4 0-2.5.3-3.4 1-.9.7-1.6 1.5-2 2.4-.4 1-.7 2-.9 3-.2 1-.2 2-.2 2.8 0 1 .1 1.9.3 2.9.2 1.1.5 2.1 1 3 .5.9 1.2 1.6 2 2.2.8.7 1.9 1 3.3 1zM537.6 125.2c-.1 2.6.5 4.8 1.7 6.5 1.1 1.7 2.9 2.6 5.3 2.6 1.5 0 2.8-.4 3.9-1.3 1-.8 1.6-2.2 1.8-4h4.6c0 .6-.2 1.4-.4 2.3-.3 1-.8 2-1.7 3-.2.3-.6.6-1 1-.5.4-1 .7-1.7 1.1-.7.4-1.5.6-2.4.8-.9.3-2 .4-3.3.4-7.6-.2-11.3-4.5-11.3-12.9 0-2.5.3-4.8 1-6.8s2-3.7 3.8-5.1c1.2-.8 2.4-1.3 3.7-1.6 1.3-.2 2.2-.3 3-.3 2.7 0 4.8.6 6.3 1.6s2.5 2.3 3.1 3.9c.6 1.5 1 3.1 1.1 4.6.1 1.6.1 2.9 0 4h-17.5m12.9-3v-1.1c0-.4 0-.8-.1-1.2-.1-.9-.4-1.7-.8-2.5s-1-1.5-1.8-2.1c-.9-.5-2-.8-3.4-.8-.8 0-1.5.1-2.3.3-.8.2-1.5.7-2.2 1.3-.7.6-1.2 1.3-1.6 2.3-.4 1-.7 2.2-.8 3.7h13zM562.9 114.7l-.1-2.9h4.6v4.1c.2-.3.4-.8.7-1.2.3-.5.8-1 1.3-1.5.6-.5 1.4-1 2.3-1.3.9-.3 2-.5 3.4-.5.6 0 1.4.1 2.4.2.9.2 1.9.5 2.9 1.1 1 .6 1.8 1.4 2.5 2.5.6 1.2 1 2.7 1 4.7V137h-4.6v-16c0-.9-.1-1.7-.2-2.4-.2-.7-.5-1.3-1.1-1.9-1.2-1.1-2.6-1.7-4.3-1.7-1.7 0-3.1.6-4.3 1.8-1.3 1.2-2 3.1-2 5.7V137h-4.6v-22.3zM607 119.8c0-.3 0-.8-.1-1.4-.1-.6-.3-1.1-.6-1.8-.2-.6-.7-1.2-1.4-1.6-.7-.4-1.6-.6-2.7-.6-1.5 0-2.7.4-3.5 1.2-.9.8-1.5 1.7-1.9 2.8-.4 1.1-.6 2.2-.7 3.2-.1 1.1-.2 1.8-.1 2.4 0 1.3.1 2.5.3 3.7.2 1.2.5 2.3.9 3.3.8 2 2.4 3 4.8 3.1 1.9 0 3.3-.7 4.1-1.9.8-1.1 1.2-2.3 1.2-3.6h4.6c-.2 2.5-1.1 4.6-2.7 6.3-1.7 1.8-4.1 2.7-7.1 2.7-.9 0-2.1-.2-3.6-.6-.7-.2-1.4-.6-2.2-1-.8-.4-1.5-1-2.2-1.7-.7-.9-1.4-2.1-2-3.6-.6-1.5-.9-3.5-.9-6.1 0-2.6.4-4.8 1.1-6.6.7-1.7 1.6-3.1 2.7-4.2 1.1-1 2.3-1.8 3.6-2.2 1.3-.4 2.5-.6 3.7-.6h1.6c.6.1 1.3.2 1.9.4.7.2 1.4.5 2.1 1 .7.4 1.3 1 1.8 1.7.9 1.1 1.4 2.1 1.7 3.1.2 1 .3 1.8.3 2.6H607zM629.1 137.1l-3.4 9.3H621l3.8-9.6-10.3-25h5.2l7.6 19.8 7.7-19.8h5z"/>
+                </svg>
+              </span>
+            </a>
+            <button class="usa-menu-btn usa-button l-header__menu-button">Menu</button>
+          </div>
+          <div class="l-header__search">
+            <form class="usa-search usa-search--small usa-search--epa" method="get" action="https://search.epa.gov/epasearch">
+              <div role="search">
+                <label class="usa-sr-only" for="search-box">Search</label>
+                <input class="usa-input" id="search-box" type="search" name="querytext" placeholder="Search EPA.gov">
+                <!-- button class="usa-button" type="submit" --> <!-- type="submit" - removed for now to allow other unrendered buttons to render when triggered in RShiny app -->
+                <!-- see: https://github.com/rstudio/shiny/issues/2922 -->
+                <button class="usa-button usa-search__submit" style="height:2rem;margin:0;padding:0;padding-left:1rem;padding-right:1rem;border-top-left-radius: 0;border-bottom-left-radius: 0;">
+                  <span class="usa-sr-only">Search</span>
+                </button>
+                <input type="hidden" name="areaname" value="">
+                <input type="hidden" name="areacontacts" value="">
+                <input type="hidden" name="areasearchurl" value="">
+                <input type="hidden" name="typeofsearch" value="epa">
+                <input type="hidden" name="result_template" value="">
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
+      <div class="l-header__nav">
+        <nav class="usa-nav usa-nav--epa" role="navigation" aria-label="EPA header navigation">
+          <div class="usa-nav__inner">
+            <button class="usa-nav__close" aria-label="Close">
+              <svg class="icon icon--nav-close" aria-hidden="true" role="img">
+                <title>Primary navigation</title>
+                <use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#close"></use>
+              </svg> </button>
+            <div class="usa-nav__menu">
+               <ul class="menu menu--main">
+                <li class="menu__item"><a href="https://www.epa.gov/environmental-topics" class="menu__link">Environmental Topics</a></li>
+                <li class="menu__item"><a href="https://www.epa.gov/laws-regulations" class="menu__link" >Laws &amp; Regulations</a></li>
+                <li class="menu__item"><a href="https://www.epa.gov/report-violation" class="menu__link" >Report a Violation</a></li>
+                <li class="menu__item"><a href="https://www.epa.gov/aboutepa" class="menu__link" >About EPA</a></li>
+              </ul>
+            </div>
+          </div>
+        </nav>
+      </div>
+    </header>
+    <main id="main" class="main" role="main" tabindex="-1">'
+  ),
+  
+  # Individual Page Header
+  HTML(
+    '<div class="l-page  has-footer">
+      <div class="l-constrain">
+        <div class="l-page__header">
+          <div class="l-page__header-first">
+            <div class="web-area-title"></div>
+          </div>
+          <div class="l-page__header-last">
+            <a href="#" class="header-link">Contact Us</a>
+          </div>
+        </div>
+        <article class="article">'
+  ),
+  
+	# Insert your UI code here
+		## Begin example UI code
+			titlePanel("Hello Shiny!"),
+			sidebarLayout
+				(
+				sidebarPanel
+					(
+					sliderInput
+						(
+						"obs",
+						"Number of observations:",
+						min = 0,
+						max = 1000,
+						value = 500
+						)
+					),
+				mainPanel
+					(
+					plotOutput("distPlot")
+					)
+				)
+		## End example UI code
+  
+  # IMPORTANT! For a navbar page, you will need to place the header and footer inside the navbar section (as shown below)  -
+  # you will then want to comment out lines 201-213 and lines 254-263
+#   navbarPage(
+#     title = h2("Sample App"),
+#     header = HTML(
+#       '<div class="l-page  has-footer">
+#         <div class="l-constrain">
+#           <div class="l-page__header">
+#             <div class="l-page__header-first">
+#               <div class="web-area-title"></div>
+#             </div>
+#             <div class="l-page__header-last">
+#               <a href="#" class="header-link">Contact Us</a>
+#             </div>
+#           </div>
+#           <article class="article">'
+#     ),
+#     footer = HTML(
+#       '</article>
+# 	        </div>
+#           <div class="l-page__footer">
+#             <div class="l-constrain">
+#               <p><a href="#">Contact Us</a> to ask a question, provide feedback, or report a problem.</p>
+#             </div>
+#           </div>
+#         </div>'
+#     ),
+#     tabPanel("Sample Tab 1"),
+#     tabPanel("Sample Tab 2"),
+#   ),
+  
+  # Individual Page Footer
+  ,HTML(
+    '</article>
+    </div>
+    <div class="l-page__footer">
+      <div class="l-constrain">
+        <p><a href="#">Contact Us</a> to ask a question, provide feedback, or report a problem.</p>
+      </div>
+    </div>
+  </div>'
+  ),
+  
+	# Site Footer
+	HTML(
+	  '</main>
+      <footer class="footer" role="contentinfo">
+      <div class="l-constrain">
+        <img class="footer__epa-seal" src="https://www.epa.gov/themes/epa_theme/images/epa-seal.svg" alt="United States Environmental Protection Agency" height="100" width="100">
+        <div class="footer__content contextual-region">
+          <div class="footer__column">
+            <h2>Discover.</h2>
+            <ul class="menu menu--footer">
+              <li class="menu__item">
+                <a href="/accessibility" class="menu__link">Accessibility</a>
+              </li>
+              <!--li class="menu__item"><a href="#" class="menu__link">EPA Administrator</a></li-->
+              <li class="menu__item">
+                <a href="/planandbudget" class="menu__link">Budget &amp; Performance</a>
+              </li>
+              <li class="menu__item">
+                <a href="/contracts" class="menu__link">Contracting</a>
+              </li>
+              <li class="menu__item">
+                <a href="/home/wwwepagov-snapshots" class="menu__link">EPA www Web Snapshot</a>
+              </li>
+              <li class="menu__item">
+                <a href="/grants" class="menu__link">Grants</a>
+              </li>
+              <li class="menu__item">
+                <a href="/ocr/whistleblower-protections-epa-and-how-they-relate-non-disclosure-agreements-signed-epa-employees" class="menu__link">No FEAR Act Data</a>
+              </li>
+              <li class="menu__item">
+                <a href="/web-policies-and-procedures/plain-writing" class="menu__link">Plain Writing</a>
+              </li>
+              <li class="menu__item">
+                <a href="/privacy" class="menu__link">Privacy</a>
+              </li>
+              <li class="menu__item">
+                <a href="/privacy/privacy-and-security-notice" class="menu__link">Privacy and Security Notice</a>
+              </li>
+            </ul>
+          </div>
+          <div class="footer__column">
+            <h2>Connect.</h2>
+            <ul class="menu menu--footer">
+              <li class="menu__item">
+                <a href="https://www.data.gov/" class="menu__link">Data.gov</a>
+              </li>
+              <li class="menu__item">
+                <a href="/office-inspector-general/about-epas-office-inspector-general" class="menu__link">Inspector General</a>
+              </li>
+              <li class="menu__item">
+                <a href="/careers" class="menu__link">Jobs</a>
+              </li>
+              <li class="menu__item">
+                <a href="/newsroom" class="menu__link">Newsroom</a>
+              </li>
+              <li class="menu__item">
+                <a href="/data" class="menu__link">Open Government</a>
+              </li>
+              <li class="menu__item">
+                <a href="https://www.regulations.gov/" class="menu__link">Regulations.gov</a>
+              </li>
+              <li class="menu__item">
+                <a href="/newsroom/email-subscriptions-epa-news-releases" class="menu__link">Subscribe</a>
+              </li>
+              <li class="menu__item">
+                <a href="https://www.usa.gov/" class="menu__link">USA.gov</a>
+              </li>
+              <li class="menu__item">
+                <a href="https://www.whitehouse.gov/" class="menu__link">White House</a>
+              </li>
+            </ul>
+          </div>
+          <div class="footer__column">
+            <h2>Ask.</h2>
+            <ul class="menu menu--footer">
+              <li class="menu__item">
+                <a href="/home/forms/contact-epa" class="menu__link">Contact EPA</a>
+              </li>
+              <li class="menu__item">
+                <a href="/web-policies-and-procedures/epa-disclaimers" class="menu__link">EPA Disclaimers</a>
+              </li>
+              <li class="menu__item">
+                <a href="/aboutepa/epa-hotlines" class="menu__link">Hotlines</a>
+              </li>
+              <li class="menu__item">
+                <a href="/foia" class="menu__link">FOIA Requests</a>
+              </li>
+              <li class="menu__item">
+                <a href="/home/frequent-questions-specific-epa-programstopics" class="menu__link">Frequent Questions</a>
+              </li>
+            </ul>
+            <h2>Follow.</h2>
+            <ul class="menu menu--social">
+              <li class="menu__item">
+                <a class="menu__link" aria-label="EPA’s Facebook" href="https://www.facebook.com/EPA">
+                  <!-- svg class="icon icon--social" aria-hidden="true" -->
+                  <svg class="icon icon--social" aria-hidden="true" viewBox="0 0 448 512" id="facebook-square" xmlns="http://www.w3.org/2000/svg">
+                    <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#facebook-square"></use-->
+                    <path fill="currentcolor" d="M400 32H48A48 48 0 000 80v352a48 48 0 0048 48h137.25V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.27c-30.81 0-40.42 19.12-40.42 38.73V256h68.78l-11 71.69h-57.78V480H400a48 48 0 0048-48V80a48 48 0 00-48-48z"></path>
+                  </svg> 
+                  <span class="usa-tag external-link__tag" title="Exit EPA Website">
+                    <span aria-hidden="true">Exit</span>
+                    <span class="u-visually-hidden"> Exit EPA Website</span>
+                  </span>
+                </a>
+              </li>
+              <li class="menu__item">
+                <a class="menu__link" aria-label="EPA’s Twitter" href="https://twitter.com/epa">
+                  <!-- svg class="icon icon--social" aria-hidden="true" -->
+                  <svg class="icon icon--social" aria-hidden="true" viewBox="0 0 448 512" id="twitter-square" xmlns="http://www.w3.org/2000/svg">
+                    <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#twitter-square"></use -->
+                    <path fill="currentcolor" d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-48.9 158.8c.2 2.8.2 5.7.2 8.5 0 86.7-66 186.6-186.6 186.6-37.2 0-71.7-10.8-100.7-29.4 5.3.6 10.4.8 15.8.8 30.7 0 58.9-10.4 81.4-28-28.8-.6-53-19.5-61.3-45.5 10.1 1.5 19.2 1.5 29.6-1.2-30-6.1-52.5-32.5-52.5-64.4v-.8c8.7 4.9 18.9 7.9 29.6 8.3a65.447 65.447 0 01-29.2-54.6c0-12.2 3.2-23.4 8.9-33.1 32.3 39.8 80.8 65.8 135.2 68.6-9.3-44.5 24-80.6 64-80.6 18.9 0 35.9 7.9 47.9 20.7 14.8-2.8 29-8.3 41.6-15.8-4.9 15.2-15.2 28-28.8 36.1 13.2-1.4 26-5.1 37.8-10.2-8.9 13.1-20.1 24.7-32.9 34z"></path>
+                  </svg>
+                  <span class="usa-tag external-link__tag" title="Exit EPA Website">
+                    <span aria-hidden="true">Exit</span>
+                    <span class="u-visually-hidden"> Exit EPA Website</span>
+                  </span>
+                </a>
+              </li>
+              <li class="menu__item">
+                <a class="menu__link" aria-label="EPA’s Youtube" href="https://www.youtube.com/user/USEPAgov">
+                  <!-- svg class="icon icon--social" aria-hidden="true" -->
+                  <svg class="icon icon--social" aria-hidden="true" viewBox="0 0 448 512" id="youtube-square" xmlns="http://www.w3.org/2000/svg">
+                    <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#youtube-square"></use -->
+                    <path fill="currentcolor" d="M186.8 202.1l95.2 54.1-95.2 54.1V202.1zM448 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48zm-42 176.3s0-59.6-7.6-88.2c-4.2-15.8-16.5-28.2-32.2-32.4C337.9 128 224 128 224 128s-113.9 0-142.2 7.7c-15.7 4.2-28 16.6-32.2 32.4-7.6 28.5-7.6 88.2-7.6 88.2s0 59.6 7.6 88.2c4.2 15.8 16.5 27.7 32.2 31.9C110.1 384 224 384 224 384s113.9 0 142.2-7.7c15.7-4.2 28-16.1 32.2-31.9 7.6-28.5 7.6-88.1 7.6-88.1z"></path>
+                  </svg>
+                  <span class="usa-tag external-link__tag" title="Exit EPA Website">
+                    <span aria-hidden="true">Exit</span>
+                    <span class="u-visually-hidden"> Exit EPA Website</span>
+                  </span>
+                </a>
+              </li>
+              <li class="menu__item">
+                <a class="menu__link" aria-label="EPA’s Flickr" href="https://www.flickr.com/photos/usepagov">
+                  <!-- svg class="icon icon--social" aria-hidden="true" -->
+                  <svg class="icon icon--social" aria-hidden="true" viewBox="0 0 448 512" id="flickr-square" xmlns="http://www.w3.org/2000/svg">
+                    <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#flickr-square"></use -->
+                    <path fill="currentcolor" d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM144.5 319c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5zm159 0c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5z"></path>
+                  </svg>
+                  <span class="usa-tag external-link__tag" title="Exit EPA Website">
+                    <span aria-hidden="true">Exit</span>
+                    <span class="u-visually-hidden"> Exit EPA Website</span>
+                  </span>
+                </a>
+              </li>
+              <li class="menu__item">
+                <a class="menu__link" aria-label="EPA’s Instagram" href="https://www.instagram.com/epagov">
+                  <!-- svg class="icon icon--social" aria-hidden="true" -->
+                  <svg class="icon icon--social" aria-hidden="true" viewBox="0 0 448 512" id="instagram-square" xmlns="http://www.w3.org/2000/svg">
+                    <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#instagram-square"></use -->
+                    <path fill="currentcolor" xmlns="http://www.w3.org/2000/svg" d="M224 202.66A53.34 53.34 0 10277.36 256 53.38 53.38 0 00224 202.66zm124.71-41a54 54 0 00-30.41-30.41c-21-8.29-71-6.43-94.3-6.43s-73.25-1.93-94.31 6.43a54 54 0 00-30.41 30.41c-8.28 21-6.43 71.05-6.43 94.33s-1.85 73.27 6.47 94.34a54 54 0 0030.41 30.41c21 8.29 71 6.43 94.31 6.43s73.24 1.93 94.3-6.43a54 54 0 0030.41-30.41c8.35-21 6.43-71.05 6.43-94.33s1.92-73.26-6.43-94.33zM224 338a82 82 0 1182-82 81.9 81.9 0 01-82 82zm85.38-148.3a19.14 19.14 0 1119.13-19.14 19.1 19.1 0 01-19.09 19.18zM400 32H48A48 48 0 000 80v352a48 48 0 0048 48h352a48 48 0 0048-48V80a48 48 0 00-48-48zm-17.12 290c-1.29 25.63-7.14 48.34-25.85 67s-41.4 24.63-67 25.85c-26.41 1.49-105.59 1.49-132 0-25.63-1.29-48.26-7.15-67-25.85s-24.63-41.42-25.85-67c-1.49-26.42-1.49-105.61 0-132 1.29-25.63 7.07-48.34 25.85-67s41.47-24.56 67-25.78c26.41-1.49 105.59-1.49 132 0 25.63 1.29 48.33 7.15 67 25.85s24.63 41.42 25.85 67.05c1.49 26.32 1.49 105.44 0 131.88z"></path>
+                  </svg>
+                  <span class="usa-tag external-link__tag" title="Exit EPA Website">
+                    <span aria-hidden="true">Exit</span>
+                    <span class="u-visually-hidden"> Exit EPA Website</span>
+                  </span>
+                </a>
+              </li>
+            </ul>
+            <p class="footer__last-updated">
+              Last updated on March 30, 2022
+            </p>
+          </div>
+        </div>
+      </div>
+    </footer>
+    <a href="#" class="back-to-top" title="">
+      <svg class="back-to-top__icon" role="img" aria-label="">
+      <svg class="back-to-top__icon" role="img" aria-label="" viewBox="0 0 19 12" id="arrow" xmlns="http://www.w3.org/2000/svg">
+        <!-- use xlink:href="https://www.epa.gov/themes/epa_theme/images/sprite.artifact.svg#arrow"></use -->
+        <path fill="currentColor" d="M2.3 12l7.5-7.5 7.5 7.5 2.3-2.3L9.9 0 .2 9.7 2.5 12z"></path>
+      </svg>
+    </a>'
+	)
+) # END fluidPage
+
+# Insert your server code here
+	## Begin example server code
+	server <- function(input, output)
+		{
+		output$distPlot <- renderPlot({
+									 hist(rnorm(input$obs))
+									 })
+		}
+	## End example server code
+
+shinyApp(ui = ui, server = server)
\ No newline at end of file

From 62122f160e493d316e21d0c8b88257dd6f9dc849 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 13 Jul 2022 11:43:13 -0400
Subject: [PATCH 32/57] [EPAD8-1770] add whitelist for intranet links

---
 .../themes/epa_theme/epa_theme.libraries.yml  |  1 +
 .../epa_theme/js/src/protected-links.es6.js   | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js

diff --git a/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml b/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
index 593ee31f96..5fda8b0789 100644
--- a/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
+++ b/services/drupal/web/themes/epa_theme/epa_theme.libraries.yml
@@ -13,6 +13,7 @@ global:
     js/dist/sitewide-alert.min.js: {}
     js/dist/definition.min.js: {}
     js/dist/external-links.min.js: {}
+    js/dist/protected-links.min.js: {}
   dependencies:
     - epa_theme/common
     - core/drupal
diff --git a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
new file mode 100644
index 0000000000..8610a8d1f2
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
@@ -0,0 +1,46 @@
+// Eternal Links script
+import Drupal from 'drupal';
+
+(function(Drupal) {
+  Drupal.behaviors.protectedLinks = {
+    attach(context, settings) {
+      const allowedDomains = [
+        'work.epa.gov',
+        'intranet.epa.gov',
+        'usepa.sharepoint.com',
+      ];
+      function linkIsProtected(linkElement) {
+        let external = false;
+
+        allowedDomains.forEach(domain => {
+          if (
+            linkElement.host === domain ||
+            linkElement.host.endsWith(`.${domain}`)
+          ) {
+            external = true;
+          }
+        });
+
+        return external;
+      }
+      const externalLinks = context.querySelectorAll(
+        "a:not([href=''], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'])"
+      );
+
+      externalLinks.forEach(function(el) {
+        if (el.hasAttribute('href') && linkIsProtected(el)) {
+          const translatedAccessible = Drupal.t('Link to protected area');
+          el.insertAdjacentHTML(
+            'beforeend',
+            `
+<span class="protected-link__tag" title="${translatedAccessible}">
+  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+    <use href="/themes/epa_theme/images/sprite.svg#lock"></use>
+  </svg>
+</span>`
+          );
+        }
+      });
+    },
+  };
+})(Drupal);

From ffe24cfd975099cc6171aea086a58a64d34945c9 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Thu, 14 Jul 2022 15:34:09 -0400
Subject: [PATCH 33/57] [EPAD8-1770] ensure noJS works, update SVG for better
 styling

---
 .../epa_theme/images/lock--blue-base.svg      |  1 +
 .../epa_theme/images/lock--blue-dark.svg      |  1 +
 .../themes/epa_theme/images/lock--gray-2.svg  |  1 +
 .../themes/epa_theme/images/lock--gray-7.svg  |  1 +
 .../themes/epa_theme/images/lock--white.svg   |  1 +
 .../themes/epa_theme/images/lock-hover.svg    |  1 +
 .../web/themes/epa_theme/images/lock.svg      |  2 +-
 .../epa_theme/js/src/protected-links.es6.js   |  7 +-
 .../themes/epa_theme/source/_meta/_foot.twig  |  2 +
 .../_variables.external-urls.scss             |  3 +-
 .../external-link/_external-link.scss         | 87 +++++++++++++++++++
 .../external-link/external-link.twig          |  4 +
 12 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock--white.svg
 create mode 100644 services/drupal/web/themes/epa_theme/images/lock-hover.svg

diff --git a/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg b/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
new file mode 100644
index 0000000000..f160bbdf10
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#005ea2" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg b/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
new file mode 100644
index 0000000000..03cb5cf8f9
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1a4480" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg b/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
new file mode 100644
index 0000000000..6f09a11144
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#dfe1e2" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg b/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
new file mode 100644
index 0000000000..a6f11f781b
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1b1b1b" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock--white.svg b/services/drupal/web/themes/epa_theme/images/lock--white.svg
new file mode 100644
index 0000000000..af9111474d
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock--white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#ffffff" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock-hover.svg b/services/drupal/web/themes/epa_theme/images/lock-hover.svg
new file mode 100644
index 0000000000..ca136295b3
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/images/lock-hover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1A4480" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
diff --git a/services/drupal/web/themes/epa_theme/images/lock.svg b/services/drupal/web/themes/epa_theme/images/lock.svg
index 632817264a..8fd44189da 100644
--- a/services/drupal/web/themes/epa_theme/images/lock.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="52" height="64" viewBox="0 0 52 64"><title>lock</title><path fill="#1B1B1B" fill-rule="evenodd" d="M26 0c10.493 0 19 8.507 19 19v9h3a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V32a4 4 0 0 1 4-4h3v-9C7 8.507 15.507 0 26 0zm0 8c-5.979 0-10.843 4.77-10.996 10.712L15 19v9h22v-9c0-6.075-4.925-11-11-11z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
index 8610a8d1f2..1cceb36f27 100644
--- a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
@@ -32,12 +32,7 @@ import Drupal from 'drupal';
           const translatedAccessible = Drupal.t('Link to protected area');
           el.insertAdjacentHTML(
             'beforeend',
-            `
-<span class="protected-link__tag" title="${translatedAccessible}">
-  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-    <use href="/themes/epa_theme/images/sprite.svg#lock"></use>
-  </svg>
-</span>`
+            `<span class="protected-link__tag" title="${translatedAccessible}"><svg class="usa-icon" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#lock"></use></svg></span>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
index cea4e6100b..a61d6086ca 100644
--- a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
@@ -18,6 +18,7 @@
 
   <script src="../../../js/dist/definition.min.js?{{ cacheBuster }}"></script>
   <script src="../../../js/dist/external-links.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/protected-links.min.js?{{ cacheBuster }}"></script>
   <script src="../../../js/dist/hero-slideshow.min.js?{{ cacheBuster }}"></script>
   <script src="../../../js/dist/image-gallery.min.js?{{ cacheBuster }}"></script>
   <script src="../../../js/dist/media-link.min.js?{{ cacheBuster }}"></script>
@@ -40,6 +41,7 @@
   <script src="https://www.epa.gov/themes/epa_theme/js/dist/sitewide-alert.min.js?v=9.2.6"></script>
   <script src="https://www.epa.gov/themes/epa_theme/js/dist/definition.min.js?v=9.2.6"></script>
   <script src="https://www.epa.gov/themes/epa_theme/js/dist/external-links.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/protected-links.min.js?v=9.2.6"></script>
   <script src="https://www.epa.gov/themes/epa_theme/js/dist/media-link.min.js?v=9.2.6"></script>
   <script src="https://www.epa.gov/themes/epa_theme/js/dist/hero-slideshow.min.js?v=9.2.6"></script>
   <script src="https://www.epa.gov/core/assets/vendor/jquery-form/jquery.form.min.js?v=4.3.0"></script>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
index 596a4bae2d..131fcedfcf 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
@@ -1 +1,2 @@
-$external-urls: ":where([href^='http://'], [href^='https://'], [href^='//']):not([href$='//www.epa.gov'], [href$='//epa.gov'], [href^='http://www.epa.gov/'], [href^='https://www.epa.gov/'], [href^='http://epa.gov/'], [href^='https://epa.gov/'], [href^='//epa.gov/'], [href^='//www.epa.gov/'])";
+$external-urls: ":where([href^='http://'], [href^='https://'], [href^='//']):not([href$='//www.epa.gov'], [href$='//epa.gov'], [href^='http://www.epa.gov/'], [href^='https://www.epa.gov/'], [href^='http://epa.gov/'], [href^='https://epa.gov/'], [href^='//epa.gov/'], [href^='//www.epa.gov/'], [href$='//work.epa.gov'], [href^='http://work.epa.gov'], [href^='https://work.epa.gov'], [href$='//intranet.epa.gov'], [href^='http://intranet.epa.gov'], [href^='https://intranet.epa.gov'], [href$='//usepa.sharepoint.com'], [href^='http://usepa.sharepoint.com'], [href^='https://usepa.sharepoint.com'])";
+$intranet-urls: ":where([href$='//work.epa.gov'], [href^='http://work.epa.gov'], [href^='https://work.epa.gov'], [href$='//intranet.epa.gov'], [href^='http://intranet.epa.gov'], [href^='https://intranet.epa.gov'], [href$='//usepa.sharepoint.com'], [href^='http://usepa.sharepoint.com'], [href^='https://usepa.sharepoint.com'])";
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index 1d8a3666b4..6adb6b5f14 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -78,6 +78,83 @@
   }
 }
 
+%protected-link {
+  &::after {
+    @include svg-background(lock--blue-base);
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    content: '';
+    display: inline-block;
+    height: 0.65em;
+    margin: -1px rem(units(0.5)) 0;
+    width: 0.65em;
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    &::after {
+      @include svg-background(lock--blue-dark);
+    }
+  }
+
+  // External links that are a button.
+  &.button,
+  &.usa-button {
+    &::after {
+      @include svg-background(lock--white);
+    }
+    &:hover,
+    &:focus,
+    &:active {
+      &::after {
+        @include svg-background(lock--white);
+      }
+    }
+  }
+
+  // Button variations.
+  &.usa-button.usa-button--outline,
+  &.usa-button.usa-button--unstyled {
+    &::after {
+      @include svg-background(lock--blue-dark);
+    }
+    &:hover,
+    &:focus,
+    &:active {
+      &::after {
+        @include svg-background(lock-hover);
+      }
+    }
+  }
+
+  &.usa-button.usa-button--outline.usa-button--inverse {
+    &::after {
+      @include svg-background(lock--gray-2);
+    }
+    &:hover,
+    &:focus,
+    &:active {
+      &::after {
+        @include svg-background(lock--gray-2);
+      }
+    }
+  }
+
+  &.usa-button.usa-button--accent-cool {
+    &::after {
+      @include svg-background(lock--gray-7);
+    }
+    &:hover,
+    &:focus,
+    &:active {
+      &::after {
+        @include svg-background(lock--gray-7);
+      }
+    }
+  }
+}
+
 /*
 repeated code in the following, as putting them in the same block breaks
 the string literal in the $external-urls variable
@@ -93,6 +170,11 @@ html.no-js .external-link {
   @extend %external-link;
 }
 
+/* stylelint-disable-next-line selector-no-qualifying-type */
+html.no-js body a#{$intranet-urls} {
+  @extend %protected-link;
+}
+
 // Hide external link icon for anchors without an href attribute.
 a:not([href])::after {
   display: none !important;
@@ -105,3 +187,8 @@ a:not([href])::after {
   padding: 0 0.5em;
   text-decoration: none;
 }
+
+.protected-link__tag {
+  display: inline-block;
+  text-decoration: none;
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
index 7fc21bab65..fe715fe380 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
@@ -76,6 +76,10 @@
   <div><a href="http://sub.urbanwaters.gov">http://sub.urbanwaters.gov</a></div>
   <div><a href="http://westcoastcollaborative.org">http://westcoastcollaborative.org</a></div>
   <div><a href="http://sub.westcoastcollaborative.org">http://sub.westcoastcollaborative.org</a></div>
+  <h2>Protected Internal Links</h2>
+  <div><a href="http://work.epa.gov">http://work.epa.gov</a></div>
+  <div><a href="http://intranet.epa.gov">http://intranet.epa.gov</a></div>
+  <div><a href="http://usepa.sharepoint.com">http://usepa.sharepoint.com</a></div>
 {% endif %}
 
 {% if show_documentation %}

From dc90719e049a5f693bd5b074b7eb430038faabe7 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 14 Jul 2022 17:04:09 -0400
Subject: [PATCH 34/57] EPAD8-1783 fix news release rss feed to ensure it
 includes body text

---
 .../sync/views.view.search_news_releases.yml  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/services/drupal/config/sync/views.view.search_news_releases.yml b/services/drupal/config/sync/views.view.search_news_releases.yml
index 97ec1ba193..e36f298426 100644
--- a/services/drupal/config/sync/views.view.search_news_releases.yml
+++ b/services/drupal/config/sync/views.view.search_news_releases.yml
@@ -3,11 +3,13 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.storage.node.field_paragraphs
     - field.storage.node.field_press_office
     - field.storage.node.field_release
     - search_api.index.news_releases
   module:
     - datetime
+    - entity_reference_revisions
     - epa_core
     - epa_rss
     - search_api
@@ -372,15 +374,16 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-        field_body:
-          id: field_body
-          table: search_api_index_news_releases
-          field: field_body
+        field_paragraphs:
+          id: field_paragraphs
+          table: search_api_datasource_news_releases_entity_node
+          field: field_paragraphs
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
           plugin_id: search_api_field
-          label: 'The main body text'
+          label: ''
           exclude: false
           alter:
             alter_text: false
@@ -391,7 +394,7 @@ display:
             external: false
             replace_spaces: false
             path_case: none
-            trim_whitespace: true
+            trim_whitespace: false
             alt: ''
             rel: ''
             link_class: ''
@@ -405,7 +408,7 @@ display:
             more_link: false
             more_link_text: ''
             more_link_path: ''
-            strip_tags: true
+            strip_tags: false
             trim: false
             preserve_tags: ''
             html: false
@@ -413,19 +416,19 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: true
+          element_label_colon: false
           element_wrapper_type: ''
           element_wrapper_class: ''
-          element_default_classes: false
+          element_default_classes: true
           empty: ''
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: text_trimmed
+          click_sort_column: target_id
+          type: entity_reference_revisions_entity_view
           settings:
-            trim_length: 300
-          group_column: value
+            view_mode: default
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -433,7 +436,7 @@ display:
           delta_reversed: false
           delta_first_last: false
           multi_type: separator
-          separator: ', '
+          separator: ''
           field_api_classes: false
           field_rendering: true
           fallback_handler: search_api
@@ -710,7 +713,7 @@ display:
         options:
           title_field: title
           link_field: nid
-          description_field: field_body
+          description_field: field_paragraphs
           creator_field: field_press_office
           date_field: field_release
           guid_field_options:
@@ -738,6 +741,7 @@ display:
         - 'user.node_grants:view'
         - user.permissions
       tags:
+        - 'config:field.storage.node.field_paragraphs'
         - 'config:field.storage.node.field_press_office'
         - 'config:field.storage.node.field_release'
         - 'config:search_api.index.news_releases'

From b1ab7b8d0ef2884b81f4d5f04f2a8e2cb06a7479 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 15 Jul 2022 10:07:26 -0400
Subject: [PATCH 35/57] EPAD8-1783 use pretty path processing on perspectives
 feed and also ensure perspectives RSS link gets re-written while maintaining
 facets

---
 ..._api__views_feed__search_perspectives__feed_1.yml | 12 ++++++++++++
 .../config/sync/views.view.search_perspectives.yml   |  8 ++------
 .../drupal/web/modules/custom/epa_rss/epa_rss.module |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 services/drupal/config/sync/facets.facet_source.search_api__views_feed__search_perspectives__feed_1.yml

diff --git a/services/drupal/config/sync/facets.facet_source.search_api__views_feed__search_perspectives__feed_1.yml b/services/drupal/config/sync/facets.facet_source.search_api__views_feed__search_perspectives__feed_1.yml
new file mode 100644
index 0000000000..f593e68a30
--- /dev/null
+++ b/services/drupal/config/sync/facets.facet_source.search_api__views_feed__search_perspectives__feed_1.yml
@@ -0,0 +1,12 @@
+uuid: 21a98a1d-ac10-433a-a5c4-5a7c6f36422e
+langcode: en
+status: true
+dependencies: {  }
+id: search_api__views_feed__search_perspectives__feed_1
+name: 'search_api:views_feed__search_perspectives__feed_1'
+filter_key: ''
+url_processor: facets_pretty_paths
+breadcrumb:
+  active: false
+  before: true
+  group: false
diff --git a/services/drupal/config/sync/views.view.search_perspectives.yml b/services/drupal/config/sync/views.view.search_perspectives.yml
index 27657c462c..9e7a8ac17a 100644
--- a/services/drupal/config/sync/views.view.search_perspectives.yml
+++ b/services/drupal/config/sync/views.view.search_perspectives.yml
@@ -677,8 +677,6 @@ display:
     display_plugin: feed
     position: 1
     display_options:
-      cache:
-        type: none
       style:
         type: epa_faceted_rss
         options:
@@ -696,7 +694,7 @@ display:
             guid_field: nid
             guid_field_is_permalink: true
       defaults:
-        cache: false
+        cache: true
       display_extenders:
         views_ajax_get:
           ajax_get: false
@@ -745,8 +743,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-      cache:
-        type: none
       empty:
         area:
           id: area
@@ -773,7 +769,7 @@ display:
               perspective: teaser
       defaults:
         empty: false
-        cache: false
+        cache: true
         title: false
         pager: false
         style: false
diff --git a/services/drupal/web/modules/custom/epa_rss/epa_rss.module b/services/drupal/web/modules/custom/epa_rss/epa_rss.module
index 7417888eae..faa98dd8f2 100644
--- a/services/drupal/web/modules/custom/epa_rss/epa_rss.module
+++ b/services/drupal/web/modules/custom/epa_rss/epa_rss.module
@@ -16,6 +16,7 @@ function epa_rss_search_api_query_alter(QueryInterface &$query) {
     'views_feed:search_news_releases__feed_1' => 'search_api:views_page__search_news_releases__page_1',
     'views_feed:search_public_notices__feed_1' => 'search_api:views_page__search_public_notices__page_1',
     'views_feed:search_faqs__feed_1' => 'search_api:views_page__search_faqs__page_1',
+    'views_feed:search_perspectives__feed_1' => 'search_api:views_page__search_perspectives__page_1',
   ];
 
   // Alter the feed query to match the page query.

From b6f68f413778108e652743dc4a72bd0df8ff3d13 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Tue, 19 Jul 2022 14:31:02 -0500
Subject: [PATCH 36/57] [EPAD8-1290] - adds and enables svg_image module along
 with patch to have it work correctly with focal_point module

---
 services/drupal/composer.json                 |  1 +
 services/drupal/composer.lock                 | 98 ++++++++++++++++++-
 services/drupal/composer.patches.json         |  3 +
 .../drupal/config/sync/core.extension.yml     |  1 +
 4 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
index 0d49893cc8..629bf3a76d 100644
--- a/services/drupal/composer.json
+++ b/services/drupal/composer.json
@@ -309,6 +309,7 @@
         "drupal/smart_trim": "^1.3",
         "drupal/smtp": "1.x-dev",
         "drupal/structure_sync": "^2.0.2",
+        "drupal/svg_image": "^1.16",
         "drupal/token": "^1.9",
         "drupal/token_filter": "^1.3",
         "drupal/transliterate_filenames": "^1.5",
diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 5f305332dd..de7821b1bc 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/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": "b62b3d3dccb269c6e01725cc205d5f15",
+    "content-hash": "7a33b6068089380003d71571d92b7162",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -8816,6 +8816,57 @@
                 "source": "https://git.drupalcode.org/project/structure_sync"
             }
         },
+        {
+            "name": "drupal/svg_image",
+            "version": "1.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/svg_image.git",
+                "reference": "8.x-1.16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.16.zip",
+                "reference": "8.x-1.16",
+                "shasum": "e29b6fff49aacfaf81e58059b09551b45325f633"
+            },
+            "require": {
+                "drupal/core": "^8 || ^9",
+                "enshrined/svg-sanitize": ">=0.15 <1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.16",
+                    "datestamp": "1647314248",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Yaroslav Lushnikov",
+                    "homepage": "https://www.drupal.org/user/2870933",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "See contributors",
+                    "homepage": "https://www.drupal.org/node/2887125/committers"
+                }
+            ],
+            "description": "Overrides the standard image formatter and widget to support SVG files.",
+            "homepage": "http://drupal.org/project/svg_image",
+            "support": {
+                "source": "http://cgit.drupalcode.org/svg_image",
+                "issues": "http://drupal.org/project/svg_image"
+            }
+        },
         {
             "name": "drupal/token",
             "version": "1.9.0",
@@ -10415,6 +10466,51 @@
             },
             "time": "2022-02-21T22:40:16+00:00"
         },
+        {
+            "name": "enshrined/svg-sanitize",
+            "version": "0.15.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/darylldoyle/svg-sanitizer.git",
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": "^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.5 || ^8.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "enshrined\\svgSanitize\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Daryll Doyle",
+                    "email": "daryll@enshrined.co.uk"
+                }
+            ],
+            "description": "An SVG sanitizer for PHP",
+            "support": {
+                "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
+                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
+            },
+            "time": "2022-02-21T09:13:59+00:00"
+        },
         {
             "name": "ezimuel/guzzlestreams",
             "version": "3.0.1",
diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index 7d42f68d2b..e0c9676432 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -229,6 +229,9 @@
     },
     "nodespark/des-connector": {
       "Make magic __wakeup method public for PHP 8 compatibility": "patches/des-connector-php-8-fixes.patch"
+    },
+    "drupal/focal_point": {
+      "Allow SVG uploads in widget": "https://www.drupal.org/files/issues/2021-10-27/svg_support-3122722-13.patch"
     }
   }
 }
diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml
index aa55bc9698..e2b3457662 100644
--- a/services/drupal/config/sync/core.extension.yml
+++ b/services/drupal/config/sync/core.extension.yml
@@ -177,6 +177,7 @@ module:
   smart_date: 0
   smart_trim: 0
   smtp: 0
+  svg_image: 0
   syslog: 0
   system: 0
   taxonomy: 0

From b930e81cfdee9747e12a37e7032f91963486e688 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 19 Jul 2022 17:24:25 -0400
Subject: [PATCH 37/57] EPAD8-1668 display 25 results in the autocomplete

---
 .../custom/epa_core/epa_core.services.yml     |  3 ++
 .../src/Entity/EntityAutocompleteMatcher.php  | 47 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php

diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.services.yml b/services/drupal/web/modules/custom/epa_core/epa_core.services.yml
index 3080238501..bc399bf83c 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.services.yml
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.services.yml
@@ -11,3 +11,6 @@ services:
     arguments: ['@config.factory']
     tags:
       - { name: event_subscriber }
+  entity.autocomplete_matcher:
+    class: Drupal\epa_core\Entity\EntityAutocompleteMatcher
+    arguments: [ '@plugin.manager.entity_reference_selection' ]
diff --git a/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php b/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php
new file mode 100644
index 0000000000..0458a676b4
--- /dev/null
+++ b/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\epa_core\Entity;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Tags;
+
+/**
+ * Matcher class to get autocompletion results for entity reference.
+ */
+class EntityAutocompleteMatcher extends \Drupal\Core\Entity\EntityAutocompleteMatcher {
+  /**
+   * {@inheritDoc}
+   */
+  public function getMatches($target_type, $selection_handler, $selection_settings, $string = '') {
+    $matches = [];
+
+    $options = $selection_settings + [
+      'target_type' => $target_type,
+      'handler' => $selection_handler,
+    ];
+    $handler = $this->selectionManager->getInstance($options);
+
+    if (isset($string)) {
+      // Get an array of matching entities.
+      $match_operator = !empty($selection_settings['match_operator']) ? $selection_settings['match_operator'] : 'CONTAINS';
+      $match_limit = isset($selection_settings['match_limit']) ? (int) $selection_settings['match_limit'] : 25;
+      $entity_labels = $handler->getReferenceableEntities($string, $match_operator, $match_limit);
+
+      // Loop through the entities and convert them into autocomplete output.
+      foreach ($entity_labels as $values) {
+        foreach ($values as $entity_id => $label) {
+          $key = "$label ($entity_id)";
+          // Strip things like starting/trailing white spaces, line breaks and
+          // tags.
+          $key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(Html::decodeEntities(strip_tags($key)))));
+          // Names containing commas or quotes must be wrapped in quotes.
+          $key = Tags::encode($key);
+          $matches[] = ['value' => $key, 'label' => $label];
+        }
+      }
+    }
+
+    return $matches;
+  }
+
+}

From 9b1cfc1265027606c99c948d59cb4e541c4f798d Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 19 Jul 2022 18:03:51 -0400
Subject: [PATCH 38/57] EPAD8-1770: Fix typos

---
 .../drupal/web/themes/epa_theme/js/src/external-links.es6.js    | 2 +-
 .../drupal/web/themes/epa_theme/js/src/protected-links.es6.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index 5e8c2dcf33..fd8d121b0c 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -1,4 +1,4 @@
-// Eternal Links script
+// External Links script
 import Drupal from 'drupal';
 
 (function(Drupal) {
diff --git a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
index 1cceb36f27..5e6bacb408 100644
--- a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
@@ -1,4 +1,4 @@
-// Eternal Links script
+// Protected Links script
 import Drupal from 'drupal';
 
 (function(Drupal) {

From 5918bf3810feb0a9e73995ccdacb085c0d7ba5d9 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Fri, 22 Jul 2022 10:34:30 -0500
Subject: [PATCH 39/57] [EPAD8-1786] - sets up configuration form to add
 default term description, creates new term description token

---
 services/drupal/config/sync/term.settings.yml |  1 +
 .../custom/epa_core/epa_core.links.menu.yml   |  4 ++
 .../modules/custom/epa_core/epa_core.module   | 13 +++++
 .../custom/epa_core/epa_core.routing.yml      |  9 ++++
 .../epa_core/src/Form/TermSettingsForm.php    | 54 +++++++++++++++++++
 5 files changed, 81 insertions(+)
 create mode 100644 services/drupal/config/sync/term.settings.yml
 create mode 100644 services/drupal/web/modules/custom/epa_core/epa_core.links.menu.yml
 create mode 100644 services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php

diff --git a/services/drupal/config/sync/term.settings.yml b/services/drupal/config/sync/term.settings.yml
new file mode 100644
index 0000000000..b28630f542
--- /dev/null
+++ b/services/drupal/config/sync/term.settings.yml
@@ -0,0 +1 @@
+default_description: 'This page shows all of the pages at www.epa.gov that are tagged with [term:name].'
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.links.menu.yml b/services/drupal/web/modules/custom/epa_core/epa_core.links.menu.yml
new file mode 100644
index 0000000000..bd13eae4ee
--- /dev/null
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.links.menu.yml
@@ -0,0 +1,4 @@
+epa_core.term_settings:
+  title: 'Term Description settings'
+  parent: system.admin_config_content
+  route_name: epa_core.term_settings
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index 9d779e873e..8d56b6e0ab 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -251,6 +251,10 @@ function epa_core_token_info() {
   $view_argument_1 = [
     'name' => 'The first argument of the view'
   ];
+  $term_description = [
+    'name' => t('Term description'),
+    'description' => t('Default term description.'),
+  ];
 
   $tokens['tokens'] = [
     'node' => [
@@ -265,6 +269,9 @@ function epa_core_token_info() {
     ],
     'view' => [
       'argument-1' => $view_argument_1,
+    ],
+    'term' => [
+      'term-description' => $term_description
     ]
   ];
   return $tokens;
@@ -357,6 +364,12 @@ function epa_core_tokens($type, $tokens, array $data, array $options, Bubbleable
           }
         }
         break;
+      case 'term-description':
+        $config = \Drupal::config('term.settings');
+        $term_description = $config->get('default_description');
+
+        $replacements[$original] = $term_description;
+        break;
     }
   }
   return $replacements;
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.routing.yml b/services/drupal/web/modules/custom/epa_core/epa_core.routing.yml
index 2af292cb4c..1a2236da31 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.routing.yml
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.routing.yml
@@ -19,3 +19,12 @@ epa_core.webforms_multiple nodes:
     _title: 'Webforms Referenced by Multiple Nodes'
   requirements:
     _permission: 'view any unpublished content'
+epa_core.term_settings:
+  path: '/admin/config/content/terms'
+  defaults:
+    _form: '\Drupal\epa_core\Form\TermSettingsForm'
+    _title: 'Term Description settings'
+  requirements:
+    _permission: 'administer site configuration'
+  options:
+    _admin_route: TRUE
diff --git a/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php b/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php
new file mode 100644
index 0000000000..a684f27ee0
--- /dev/null
+++ b/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\epa_core\Form;
+
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Form for Term Description settings.
+ */
+class TermSettingsForm extends ConfigFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'term_settings';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return ['term.settings'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $config = $this->config('term.settings');
+    $form['default_description'] = [
+      '#type' => 'textarea',
+      '#title' => $this->t('Term Default Description'),
+      '#default_value' => $config->get('default_description'),
+      '#description' => $this->t('Default description for taxonomy terms.')
+    ];
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $config = $this->config('term.settings');
+    $config->set('default_description', $form_state->getValue('default_description'));
+    $config->save();
+
+    parent::submitForm($form, $form_state);
+
+  }
+
+}

From fd42517cddc9c58826f5f946efdcf8f3d569a904 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Mon, 25 Jul 2022 10:43:28 -0500
Subject: [PATCH 40/57] [EPAD8-1786] - creates deploy hook to update term
 description field, renders any tokens within the term description token

---
 .../custom/epa_core/epa_core.deploy.php       | 55 +++++++++++++++++++
 .../modules/custom/epa_core/epa_core.module   | 11 +++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php b/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php
index 15cf3be607..f390c143f6 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php
@@ -1,5 +1,7 @@
 <?php
 
+use Drupal\node\NodeInterface;
+
 function _epa_core_populate_search_index_queue() {
   $queue = \Drupal::queue('epa_search_text_indexer');
   // Query all current revisions that lack a value in the search text field
@@ -44,3 +46,56 @@ function _epa_core_populate_search_index_queue() {
 function epa_core_deploy_0001_populate_search_text(&$sandbox) {
   _epa_core_populate_search_index_queue();
 }
+
+/**
+ * Sets terms with empty description to global term description token.
+ */
+function epa_core_deploy_0001_update_term_descriptions(&$sandbox) {
+  $text = 'This page shows all of the pages at epa.gov that are tagged with \[term:name\] at this time.';
+  if (!isset($sandbox['total'])) {
+    // Query all terms that don't have a description set.
+    $result = \Drupal::database()->query(
+      'SELECT tid FROM taxonomy_term_field_data
+        WHERE description__value IS NULL OR
+              description__value = :value OR
+              description__value REGEXP :regex', [':value' => 'This page shows all of the pages at epa.gov that are tagged with [term:name] at this time.', ':regex' => '^<p>This page shows all of the pages at epa\\.gov that are tagged with \\[term:name\\] at this time\\.<\\/p>[[:space:]]*$'])
+        ->fetchCol();
+
+    $sandbox['total'] = count($result);
+    $sandbox['current'] = 0;
+
+    \Drupal::logger('epa_core')->notice($sandbox['total'] . ' terms with outdated descriptions.');
+  }
+
+  // Query 500 at a time for batch.
+  $tids = \Drupal::database()->query(
+    'SELECT tid FROM taxonomy_term_field_data
+        WHERE description__value IS NULL OR
+              description__value = :value OR
+              description__value REGEXP :regex
+            LIMIT 500;', [':value' => 'This page shows all of the pages at epa.gov that are tagged with [term:name] at this time.', ':regex' => '^<p>This page shows all of the pages at epa\\.gov that are tagged with \\[term:name\\] at this time\\.<\\/p>[[:space:]]*$'])
+    ->fetchCol();
+
+  if (empty($tids)) {
+    $sandbox['#finished'] = 1;
+    return;
+  }
+
+  $terms = \Drupal::entityTypeManager()
+    ->getStorage('taxonomy_term')
+    ->loadMultiple($tids);
+
+  foreach ($terms as $term) {
+    $term->set('description', ['value' => '[term:term-description]', 'format' => 'filtered_html']);
+    $term->save();
+    $sandbox['current']++;
+  }
+
+  \Drupal::logger('epa_core')->notice($sandbox['current'] . ' terms descriptions updated.');
+
+  if ($sandbox['current'] >= $sandbox['total']) {
+    $sandbox['#finished'] = 1;
+  } else {
+    $sandbox['#finished'] = ($sandbox['current'] / $sandbox['total']);
+  }
+}
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index 8d56b6e0ab..df363961be 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -365,10 +365,15 @@ function epa_core_tokens($type, $tokens, array $data, array $options, Bubbleable
         }
         break;
       case 'term-description':
-        $config = \Drupal::config('term.settings');
-        $term_description = $config->get('default_description');
+        if ($type == 'term' && !empty($data['term'])) {
+          $config = \Drupal::config('term.settings');
+          $term_description = $config->get('default_description');
+          // Term description can contain tokens, so we need to replace them.
+          $token = \Drupal::token();
+          $term_description = $token->replace($term_description, ['term' => $data['term']]);
+          $replacements[$original] = $term_description;
+        }
 
-        $replacements[$original] = $term_description;
         break;
     }
   }

From 12100e2a9326666cad177774f082875c928b3775 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Mon, 25 Jul 2022 12:16:51 -0500
Subject: [PATCH 41/57] [EPAD8-1786] - updating settings file to epa_core
 rather than term

---
 services/drupal/config/sync/epa_core.settings.yml           | 1 +
 services/drupal/web/modules/custom/epa_core/epa_core.module | 2 +-
 .../modules/custom/epa_core/src/Form/TermSettingsForm.php   | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 services/drupal/config/sync/epa_core.settings.yml

diff --git a/services/drupal/config/sync/epa_core.settings.yml b/services/drupal/config/sync/epa_core.settings.yml
new file mode 100644
index 0000000000..b28630f542
--- /dev/null
+++ b/services/drupal/config/sync/epa_core.settings.yml
@@ -0,0 +1 @@
+default_description: 'This page shows all of the pages at www.epa.gov that are tagged with [term:name].'
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index df363961be..d675726ff1 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -366,7 +366,7 @@ function epa_core_tokens($type, $tokens, array $data, array $options, Bubbleable
         break;
       case 'term-description':
         if ($type == 'term' && !empty($data['term'])) {
-          $config = \Drupal::config('term.settings');
+          $config = \Drupal::config('epa_core.settings');
           $term_description = $config->get('default_description');
           // Term description can contain tokens, so we need to replace them.
           $token = \Drupal::token();
diff --git a/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php b/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php
index a684f27ee0..ae77fa3779 100644
--- a/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php
+++ b/services/drupal/web/modules/custom/epa_core/src/Form/TermSettingsForm.php
@@ -21,14 +21,14 @@ public function getFormId() {
    * {@inheritdoc}
    */
   protected function getEditableConfigNames() {
-    return ['term.settings'];
+    return ['epa_core.settings'];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('term.settings');
+    $config = $this->config('epa_core.settings');
     $form['default_description'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Term Default Description'),
@@ -43,7 +43,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->config('term.settings');
+    $config = $this->config('epa_core.settings');
     $config->set('default_description', $form_state->getValue('default_description'));
     $config->save();
 

From 8c520d58f32cc7ece82a4932cea3ab8baceae008 Mon Sep 17 00:00:00 2001
From: Patrick Hangauer <phangauer@forumone.com>
Date: Mon, 25 Jul 2022 12:19:23 -0500
Subject: [PATCH 42/57] [EPAD8-1786] - removing term.settings.yml

---
 services/drupal/config/sync/term.settings.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 services/drupal/config/sync/term.settings.yml

diff --git a/services/drupal/config/sync/term.settings.yml b/services/drupal/config/sync/term.settings.yml
deleted file mode 100644
index b28630f542..0000000000
--- a/services/drupal/config/sync/term.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-default_description: 'This page shows all of the pages at www.epa.gov that are tagged with [term:name].'

From d2f2146ce54a432ebbf11486c75a0057d17bb38b Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 26 Jul 2022 12:59:54 -0400
Subject: [PATCH 43/57] Updating redirects per EPA guidance

---
 services/drupal/.ddev/nginx_full/maps/redirect_301.map | 1 -
 services/drupal/redirect_301.map                       | 1 -
 services/drupal/redirect_302.map                       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/services/drupal/.ddev/nginx_full/maps/redirect_301.map b/services/drupal/.ddev/nginx_full/maps/redirect_301.map
index 90bd95a39d..9d2f032ae1 100644
--- a/services/drupal/.ddev/nginx_full/maps/redirect_301.map
+++ b/services/drupal/.ddev/nginx_full/maps/redirect_301.map
@@ -21,7 +21,6 @@ map $request_uri $new_uri_301 {
     ~*^\/airtrends(\/|$).* /air-trends;
     ~*^\/ampd(\/|$).* https://ampd.epa.gov/ampd;
     ~*^\/approved-sips(\/|$).* /air-quality-implementation-plans;
-    ~*^\/apti(\/|$).* https://www.apti-learn.net/LMS/EPAHomePage.aspx;
     ~*^\/aqi(\/|$).* https://www.airnow.gov/;
     ~*^\/arweb(\/|$).* https://semspub.epa.gov;
     ~*^\/beachkids(\/|$).* /beaches;
diff --git a/services/drupal/redirect_301.map b/services/drupal/redirect_301.map
index 82667f421b..935fdb3234 100644
--- a/services/drupal/redirect_301.map
+++ b/services/drupal/redirect_301.map
@@ -21,7 +21,6 @@ map $request_uri $new_uri_301 {
     ~*^\/airtrends(\/|$).* /air-trends;
     ~*^\/ampd(\/|$).* https://ampd.epa.gov/ampd;
     ~*^\/approved-sips(\/|$).* /air-quality-implementation-plans;
-    ~*^\/apti(\/|$).* https://www.apti-learn.net/LMS/EPAHomePage.aspx;
     ~*^\/aqi(\/|$).* https://www.airnow.gov/;
     ~*^\/arweb(\/|$).* https://semspub.epa.gov;
     ~*^\/beachkids(\/|$).* /beaches;
diff --git a/services/drupal/redirect_302.map b/services/drupal/redirect_302.map
index f5137a8971..703b7826f4 100644
--- a/services/drupal/redirect_302.map
+++ b/services/drupal/redirect_302.map
@@ -4,5 +4,4 @@ map $request_uri $new_uri_302 {
 
     # entries of form:
     #/old-url /new-url;
-    /test-302 http://www.google.com;
 }

From d1e8499775902686643534b0bf76d9ac4a51d015 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 26 Jul 2022 13:05:59 -0400
Subject: [PATCH 44/57] Set the URI when running drush cron

---
 services/drupal/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile
index 3c41dcb7ad..4ac85e7773 100644
--- a/services/drupal/Dockerfile
+++ b/services/drupal/Dockerfile
@@ -317,7 +317,7 @@ RUN chmod +x /webcms-entrypoint
 # Replace the default crontab with one that runs Drush every five minutes. By
 # default, cron is not run (since there is no systemd equivalent in containers),
 # but we use this in the Drush ECS service definition.
-RUN echo '*/5 * * * * drush cron 2>&1' | crontab -
+RUN echo '*/5 * * * * drush cron --uri="${WEBCMS_SITE_URL}" 2>&1' | crontab -
 
 # Wrap the entrypoint script with tini to allow graceful signal handling
 ENTRYPOINT ["tini", "--", "/webcms-entrypoint"]

From d0b3a2886222e2b6f742dd383c914f4905a722c7 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 27 Jul 2022 14:10:57 -0400
Subject: [PATCH 45/57] [EPAD8-1768] adjust sizing/styling of icons

---
 .../drupal/web/themes/epa_theme/js/src/external-links.es6.js | 5 ++---
 .../05-components/external-link/_external-link.scss          | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index 9ec6ef6246..f322d3c9ad 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -13,6 +13,7 @@ import Drupal from 'drupal';
         'urbanwaterpartners.gov',
         'urbanwaters.gov',
         'westcoastcollaborative.org',
+        'usepa.sharepoint.com',
       ];
       function linkIsExternal(linkElement) {
         let external = true;
@@ -60,7 +61,6 @@ import Drupal from 'drupal';
       };
       externalLinks.forEach(function(el) {
         if (el.hasAttribute('href') && linkIsExternal(el)) {
-          let translated = Drupal.t('Exit');
           let translatedAccessible = Drupal.t('Exit EPA Website');
           const article = el.closest('article[lang]');
           if (article) {
@@ -68,12 +68,11 @@ import Drupal from 'drupal';
             if (!(lang in translate)) {
               lang = 'en';
             }
-            translated = translate[lang][0];
             translatedAccessible = translate[lang][1];
           }
           el.insertAdjacentHTML(
             'beforeend',
-            `<span class="usa-tag external-link__tag" title="${translatedAccessible}"><span aria-hidden="true">${translated}</span><span class="u-visually-hidden"> ${translatedAccessible}</span></span>`
+            `<span class="external-link__tag" title="${translatedAccessible}"><svg class="usa-icon" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#launch"></use></svg></span>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index 1d8a3666b4..4d83b30559 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -100,8 +100,5 @@ a:not([href])::after {
 
 .external-link__tag {
   display: inline-block;
-  font-size: 0.75rem;
-  margin-left: 0.25em;
-  padding: 0 0.5em;
   text-decoration: none;
 }

From bfa935ff54cff8a2cd57c5ad40862f39f46709d9 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 28 Jul 2022 11:46:47 -0400
Subject: [PATCH 46/57] EPAD8-1774 update text and links on standalone template

---
 .../source/_patterns/07-pages/standalone-template.yml          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
index bc7f751e4a..579fc612c1 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
@@ -62,4 +62,5 @@ content: |-
     <li>The EPA Pattern Lab has examples of pages that conform to this standard. Application developers can copy the HTML from the <a href="/themes/epa_theme/pattern-lab/?p=pages-page-with-sidenav">Page with Sidenav</a>, <a href="/themes/epa_theme/pattern-lab/?p=pages-page">Page with no Sidenav</a>, <a href="/themes/epa_theme/pattern-lab/?p=pages-page-with-sitewide-alerts">Page with Sitewide Alerts</a>, etc.</li>
   </ul>
   <h2>How-To</h2>
-  <p>To build your application template, open this <a href="https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html">page outside of Pattern Lab and copy the HTML (Right-click, View Source)</a>. Modify it to include side navigation or a wide template, etc.</p>
+  <p>To build your application template, visit the <a href="https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html">EPA Template Pattern Lab page and save the HTML file</a>. Before you save the file, double-check the URL, which will look like this: <a href="https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html">https://www.epa.gov/themes/epa_theme/pattern-lab/patterns/pages-standalone-template/pages-standalone-template.rendered.html</a>. If the URL matches, that’s the page you want to save. If it does not match, visit that URL.</p>
+  <p>Modify the saved HTML to suit your application. You can add side navigation, make it a home page, a wide template, whatever you need, by using classes on the body element.</p>

From 961afd824f2d22595372a815d2d2f6acf176c378 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Mon, 15 Aug 2022 13:01:08 -0400
Subject: [PATCH 47/57] EPAD8-1768: Tweak exit icon styling

---
 .../drupal/web/themes/epa_theme/js/src/external-links.es6.js    | 2 +-
 .../epa_theme/source/_patterns/05-components/icon/_icon.scss    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index f322d3c9ad..0091c5bedc 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -72,7 +72,7 @@ import Drupal from 'drupal';
           }
           el.insertAdjacentHTML(
             'beforeend',
-            `<span class="external-link__tag" title="${translatedAccessible}"><svg class="usa-icon" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#launch"></use></svg></span>`
+            `<span class="external-link__tag" title="${translatedAccessible}"><svg class="icon icon--exit is-spaced-before" aria-hidden="true"><use href="/themes/epa_theme/images/sprite.svg#launch"></use></svg></span>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/_icon.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/_icon.scss
index 3b3cc04d20..496912d2cf 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/_icon.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/_icon.scss
@@ -26,6 +26,7 @@
   }
 }
 
+.icon--exit,
 .icon--pager,
 .icon--social {
   top: 0;

From 164286049e3bfcadccdeae42baeef129fab649a2 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 16 Aug 2022 10:01:21 -0400
Subject: [PATCH 48/57] EPAD8-1807 remove all akamai-related variables and
 parameters from terraform

---
 .../sync/key.key.akamai_access_token.yml      |  15 --
 .../sync/key.key.akamai_client_secret.yml     |  15 --
 .../sync/key.key.akamai_client_token.yml      |  15 --
 ...tach_tags_via_purge_plugin-3215246-2.patch | 235 ------------------
 terraform/infrastructure/README.md            |   4 -
 terraform/infrastructure/drupal_iam_exec.tf   |   3 -
 terraform/infrastructure/parameters.tf        |  30 ---
 terraform/infrastructure/secrets.tf           |  33 ---
 terraform/webcms/README.md                    |  23 --
 terraform/webcms/shared.tf                    |  20 --
 terraform/webcms/variables.tf                 |  21 --
 11 files changed, 414 deletions(-)
 delete mode 100644 services/drupal/config/sync/key.key.akamai_access_token.yml
 delete mode 100644 services/drupal/config/sync/key.key.akamai_client_secret.yml
 delete mode 100644 services/drupal/config/sync/key.key.akamai_client_token.yml
 delete mode 100644 services/drupal/patches/akamai-attach_tags_via_purge_plugin-3215246-2.patch

diff --git a/services/drupal/config/sync/key.key.akamai_access_token.yml b/services/drupal/config/sync/key.key.akamai_access_token.yml
deleted file mode 100644
index b94c74e99a..0000000000
--- a/services/drupal/config/sync/key.key.akamai_access_token.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 99ef00fe-7d57-4ca3-b876-5b56074ea50f
-langcode: en
-status: true
-dependencies: {  }
-id: akamai_access_token
-label: 'Akamai access token'
-description: ''
-key_type: authentication
-key_type_settings: {  }
-key_provider: env
-key_provider_settings:
-  env_variable: WEBCMS_AKAMAI_ACCESS_TOKEN
-  strip_line_breaks: true
-key_input: none
-key_input_settings: {  }
diff --git a/services/drupal/config/sync/key.key.akamai_client_secret.yml b/services/drupal/config/sync/key.key.akamai_client_secret.yml
deleted file mode 100644
index d16dea22cf..0000000000
--- a/services/drupal/config/sync/key.key.akamai_client_secret.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 5157ffc1-78ff-4f32-b9eb-4f0a00768618
-langcode: en
-status: true
-dependencies: {  }
-id: akamai_client_secret
-label: 'Akamai client secret'
-description: ''
-key_type: authentication
-key_type_settings: {  }
-key_provider: env
-key_provider_settings:
-  env_variable: WEBCMS_AKAMAI_CLIENT_SECRET
-  strip_line_breaks: true
-key_input: none
-key_input_settings: {  }
diff --git a/services/drupal/config/sync/key.key.akamai_client_token.yml b/services/drupal/config/sync/key.key.akamai_client_token.yml
deleted file mode 100644
index 90bc5703aa..0000000000
--- a/services/drupal/config/sync/key.key.akamai_client_token.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: b6dd359e-2353-4be7-bd0d-ad6d03480ce0
-langcode: en
-status: true
-dependencies: {  }
-id: akamai_client_token
-label: 'Akamai client token'
-description: ''
-key_type: authentication
-key_type_settings: {  }
-key_provider: env
-key_provider_settings:
-  env_variable: WEBCMS_AKAMAI_CLIENT_TOKEN
-  strip_line_breaks: true
-key_input: none
-key_input_settings: {  }
diff --git a/services/drupal/patches/akamai-attach_tags_via_purge_plugin-3215246-2.patch b/services/drupal/patches/akamai-attach_tags_via_purge_plugin-3215246-2.patch
deleted file mode 100644
index 0d610d8698..0000000000
--- a/services/drupal/patches/akamai-attach_tags_via_purge_plugin-3215246-2.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff --git a/akamai.services.yml b/akamai.services.yml
-index b2eb604..dc70131 100644
---- a/akamai.services.yml
-+++ b/akamai.services.yml
-@@ -24,11 +24,6 @@ services:
-     class: Drupal\akamai\EventSubscriber\ConfigSubscriber
-     tags:
-       - { name: event_subscriber }
--  akamai.cacheable_response_subscriber:
--    class: Drupal\akamai\EventSubscriber\CacheableResponseSubscriber
--    arguments: ['@config.factory', '@akamai.helper.cachetagformatter', '@event_dispatcher']
--    tags:
--      - { name: event_subscriber }
-   akamai.helper.cachetagformatter:
-     class: Drupal\akamai\Helper\CacheTagFormatter
-   akamai.helper.edgescape:
-diff --git a/src/EventSubscriber/CacheableResponseSubscriber.php b/src/EventSubscriber/CacheableResponseSubscriber.php
-deleted file mode 100644
-index 4e81790..0000000
---- a/src/EventSubscriber/CacheableResponseSubscriber.php
-+++ /dev/null
-@@ -1,104 +0,0 @@
--<?php
--
--namespace Drupal\akamai\EventSubscriber;
--
--use Drupal\akamai\Event\AkamaiHeaderEvents;
--use Symfony\Component\HttpKernel\KernelEvents;
--use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
--use Symfony\Component\EventDispatcher\EventSubscriberInterface;
--use Symfony\Component\EventDispatcher\EventDispatcherInterface;
--use Drupal\Core\Cache\CacheableResponseInterface;
--use Drupal\Core\Config\ConfigFactoryInterface;
--use Drupal\akamai\Helper\CacheTagFormatter;
--
--/**
-- * Add cache tags headers on cacheable responses, for external caching systems.
-- */
--class CacheableResponseSubscriber implements EventSubscriberInterface {
--
--  /**
--   * The config factory.
--   *
--   * @var \Drupal\Core\Config\ConfigFactoryInterface
--   */
--  protected $configFactory;
--
--  /**
--   * Cache tag formatter.
--   *
--   * @var \Drupal\akamai\Helper\CacheTagFormatter
--   */
--  protected $tagFormatter;
--
--  /**
--   * The event dispatcher.
--   *
--   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
--   */
--  protected $eventDispatcher;
--
--  /**
--   * Constructs a new CacheableResponseSubscriber.
--   *
--   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
--   *   The configuration factory.
--   * @param \Drupal\akamai\Helper\CacheTagFormatter $formatter
--   *   The cache tag formatter.
--   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
--   *   The event dispatcher.
--   */
--  public function __construct(ConfigFactoryInterface $config_factory, CacheTagFormatter $formatter, EventDispatcherInterface $event_dispatcher) {
--    $this->configFactory = $config_factory;
--    $this->tagFormatter = $formatter;
--    $this->eventDispatcher = $event_dispatcher;
--  }
--
--  /**
--   * {@inheritdoc}
--   */
--  public static function getSubscribedEvents() {
--    $events[KernelEvents::RESPONSE][] = ['onRespond'];
--    return $events;
--  }
--
--  /**
--   * Add cache tags header on cacheable responses.
--   *
--   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
--   *   The event to process.
--   */
--  public function onRespond(FilterResponseEvent $event) {
--    if (!$event->isMasterRequest()) {
--      return;
--    }
--
--    $response = $event->getResponse();
--    $config = $this->configFactory->get('akamai.settings');
--    $header = $config->get('edge_cache_tag_header');
--
--    // Send headers if response is cacheable and the setting is enabled.
--    if ($header && $response instanceof CacheableResponseInterface) {
--      $tags = $response->getCacheableMetadata()->getCacheTags();
--      $blacklist = $config->get('edge_cache_tag_header_blacklist');
--      $blacklist = is_array($blacklist) ? $blacklist : [];
--      $tags = array_filter($tags, function ($tag) use ($blacklist) {
--        foreach ($blacklist as $prefix) {
--          if (strpos($tag, $prefix) !== FALSE) {
--            return FALSE;
--          }
--        }
--        return TRUE;
--      });
--
--      // Instantiate our event.
--      $event = new AkamaiHeaderEvents($tags);
--      $this->eventDispatcher->dispatch(AkamaiHeaderEvents::HEADER_CREATION, $event);
--      $tags = $event->data;
--      foreach ($tags as &$tag) {
--        $tag = $this->tagFormatter->format($tag);
--      }
--      $response->headers->set('Edge-Cache-Tag', implode(',', $tags));
--    }
--  }
--
--}
-diff --git a/src/Plugin/Purge/Purger/AkamaiTagPurger.php b/src/Plugin/Purge/Purger/AkamaiTagPurger.php
-index 91395ca..8810790 100644
---- a/src/Plugin/Purge/Purger/AkamaiTagPurger.php
-+++ b/src/Plugin/Purge/Purger/AkamaiTagPurger.php
-@@ -119,7 +119,7 @@ class AkamaiTagPurger extends PurgerBase {
-     $formatter = \Drupal::service('akamai.helper.cachetagformatter');
-     foreach ($invalidations as $invalidation) {
-       $invalidation->setState(InvalidationInterface::PROCESSING);
--      $tag = $formatter->format($invalidation->getExpression());
-+      $tag = $formatter->format($invalidation);
-       if (mb_strlen($tag) > 128) {
-         $this->logger->warning('Cache Tag %tag has exceeded the Akamai 128 character tag maximum length.', ['%tag' => $tag]);
-       }
-diff --git a/src/Plugin/Purge/TagsHeader/AkamaiEdgeCacheTagsHeader.php b/src/Plugin/Purge/TagsHeader/AkamaiEdgeCacheTagsHeader.php
-new file mode 100644
-index 0000000..0aa59ae
---- /dev/null
-+++ b/src/Plugin/Purge/TagsHeader/AkamaiEdgeCacheTagsHeader.php
-@@ -0,0 +1,90 @@
-+<?php
-+
-+namespace Drupal\akamai\Plugin\Purge\TagsHeader;
-+
-+use Drupal\akamai\Event\AkamaiHeaderEvents;
-+use Drupal\purge\Plugin\Purge\TagsHeader\TagsHeaderBase;
-+use Drupal\purge\Plugin\Purge\TagsHeader\TagsHeaderInterface;
-+use Symfony\Component\DependencyInjection\ContainerInterface;
-+
-+/**
-+ * Akamai Edge-Cache-Tag headers.
-+ *
-+ * @PurgeTagsHeader(
-+ *   id = "akamai_edge_cache_tags_header",
-+ *   header_name = "Edge-Cache-Tag",
-+ * )
-+ */
-+class AkamaiEdgeCacheTagsHeader extends TagsHeaderBase implements TagsHeaderInterface {
-+
-+  /**
-+   * The configuration factory.
-+   *
-+   * @var \Drupal\Core\Config\ConfigFactoryInterface
-+   */
-+  protected $configFactory;
-+
-+  /**
-+   * The tag formatter.
-+   *
-+   * @var \Drupal\akamai\Helper\CacheTagFormatter
-+   */
-+  protected $formatter;
-+
-+  /**
-+   * The event dispatcher.
-+   *
-+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-+   */
-+  protected $eventDispatcher;
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-+    $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
-+
-+    $instance->configFactory = $container->get('config.factory');
-+    $instance->formatter = $container->get('akamai.helper.cachetagformatter');
-+    $instance->eventDispatcher = $container->get('event_dispatcher');
-+
-+    return $instance;
-+  }
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function getValue(array $tags) {
-+    $blacklist = $this->configFactory->get('akamai.settings')->get('edge_cache_tag_header_blacklist');
-+    $blacklist = is_array($blacklist) ? $blacklist : [];
-+    $tags = array_filter($tags, function ($tag) use ($blacklist) {
-+      foreach ($blacklist as $prefix) {
-+        if (strpos($tag, $prefix) !== FALSE) {
-+          return FALSE;
-+        }
-+      }
-+      return TRUE;
-+    });
-+
-+    // Instantiate our event.
-+    $event = new AkamaiHeaderEvents($tags);
-+    $this->eventDispatcher->dispatch(AkamaiHeaderEvents::HEADER_CREATION, $event);
-+    $tags = $event->data;
-+
-+    // Call parent to get any formatting added by base class. This really only
-+    // matters for those using this patch:
-+    // https://www.drupal.org/project/purge/issues/2952277
-+    $tags = explode(' ', parent::getValue($tags));
-+
-+    $tags = array_map([$this->formatter, 'format'], $tags);
-+    return implode(' ', $tags);
-+  }
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function isEnabled() {
-+    $header = $this->configFactory->get('akamai.settings')->get('edge_cache_tag_header');
-+    return (bool) $header;
-+  }
-+}
diff --git a/terraform/infrastructure/README.md b/terraform/infrastructure/README.md
index eec1c6bd76..90597f4ad5 100644
--- a/terraform/infrastructure/README.md
+++ b/terraform/infrastructure/README.md
@@ -161,10 +161,6 @@ There are a number of sensitive values that must be populated by an administrato
 1. The Drupal hash salt must be generated and saved in `/webcms/${var.environment}/${site}/${lang}/drupal-hash-salt`. This value **must** differ between site/language combinations in order to prevent one-time tokens such as password resets from being reused. Use a secure random number generator such as the `openssl rand` utility to generate a large number of bytes (at least 32).
 2. For email, the SMTP password must be saved in the secret `/webcms/${var.environment}/${site}/${lang}/mail-password`.
 3. An x509 certificate and private key will need to be generated for each Drupal site and language. The private key needs to be set in `/webcms/${var.environment}/${site}/${lang}/saml-sp-key`.
-4. If Akamai is being used, access credentials will need to be created and stored. See the [Getting Started](https://developer.akamai.com/api/getting-started) documentation for more information. We store three secrets based on these credentials:
-   1. `/webcms/${var.environment}/${site}/${lang}/akamai-access-token`
-   2. `/webcms/${var.environment}/${site}/${lang}/akamai-client-token`
-   3. `/webcms/${var.environment}/${site}/${lang}/akamai-client-secret`
 
 ### Mirror Images
 
diff --git a/terraform/infrastructure/drupal_iam_exec.tf b/terraform/infrastructure/drupal_iam_exec.tf
index d407bab280..1384042d31 100644
--- a/terraform/infrastructure/drupal_iam_exec.tf
+++ b/terraform/infrastructure/drupal_iam_exec.tf
@@ -33,9 +33,6 @@ data "aws_iam_policy_document" "drupal_secrets_access" {
       aws_secretsmanager_secret.hash_salt[each.key].arn,
       aws_secretsmanager_secret.mail_pass[each.key].arn,
       aws_secretsmanager_secret.saml_sp_key[each.key].arn,
-      aws_secretsmanager_secret.akamai_access_token[each.key].arn,
-      aws_secretsmanager_secret.akamai_client_token[each.key].arn,
-      aws_secretsmanager_secret.akamai_client_secret[each.key].arn,
       aws_secretsmanager_secret.newrelic_license[each.value.site].arn,
     ]
   }
diff --git a/terraform/infrastructure/parameters.tf b/terraform/infrastructure/parameters.tf
index 466b04f060..45ad8f51f8 100644
--- a/terraform/infrastructure/parameters.tf
+++ b/terraform/infrastructure/parameters.tf
@@ -352,36 +352,6 @@ resource "aws_ssm_parameter" "saml_sp_key" {
   tags = var.tags
 }
 
-resource "aws_ssm_parameter" "akamai_access_token" {
-  for_each = local.sites
-
-  name  = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/secrets/akamai-access-token"
-  type  = "String"
-  value = aws_secretsmanager_secret.akamai_access_token[each.key].arn
-
-  tags = var.tags
-}
-
-resource "aws_ssm_parameter" "akamai_client_token" {
-  for_each = local.sites
-
-  name  = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/secrets/akamai-client-token"
-  type  = "String"
-  value = aws_secretsmanager_secret.akamai_client_token[each.key].arn
-
-  tags = var.tags
-}
-
-resource "aws_ssm_parameter" "akamai_client_secret" {
-  for_each = local.sites
-
-  name  = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/secrets/akamai-client-secret"
-  type  = "String"
-  value = aws_secretsmanager_secret.akamai_client_secret[each.key].arn
-
-  tags = var.tags
-}
-
 #endregion
 
 #region Terraform configuration
diff --git a/terraform/infrastructure/secrets.tf b/terraform/infrastructure/secrets.tf
index 281587a90f..e2ddf83447 100644
--- a/terraform/infrastructure/secrets.tf
+++ b/terraform/infrastructure/secrets.tf
@@ -91,39 +91,6 @@ resource "aws_secretsmanager_secret" "saml_sp_key" {
   tags = var.tags
 }
 
-resource "aws_secretsmanager_secret" "akamai_access_token" {
-  for_each = local.sites
-
-  name        = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/akamai-access-token"
-  description = "Akamai access token."
-
-  recovery_window_in_days = 0
-
-  tags = var.tags
-}
-
-resource "aws_secretsmanager_secret" "akamai_client_token" {
-  for_each = local.sites
-
-  name        = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/akamai-client-token"
-  description = "Akamai client token."
-
-  recovery_window_in_days = 0
-
-  tags = var.tags
-}
-
-resource "aws_secretsmanager_secret" "akamai_client_secret" {
-  for_each = local.sites
-
-  name        = "/webcms/${var.environment}/${each.value.site}/${each.value.lang}/akamai-client-secret"
-  description = "Akamai client secret."
-
-  recovery_window_in_days = 0
-
-  tags = var.tags
-}
-
 #endregion
 
 #region New Relic
diff --git a/terraform/webcms/README.md b/terraform/webcms/README.md
index 08dd15eae6..1508d1b41e 100644
--- a/terraform/webcms/README.md
+++ b/terraform/webcms/README.md
@@ -18,8 +18,6 @@
       - [Sensitive Values](#sensitive-values)
     - [Email Variables](#email-variables)
       - [Sensitive Values](#sensitive-values-1)
-    - [Akamai Variables](#akamai-variables)
-      - [Sensitive Values](#sensitive-values-2)
     - [SAML Variables](#saml-variables)
       - [Sensitive Values](#sensitive-values-3)
   - [Parameter Store](#parameter-store)
@@ -94,7 +92,6 @@ These values customize the Drupal ECS service's behavior. For instance, it deter
 - `drupal_extra_hostnames`: An optional `list(string)` of additional hostnames that Traefik should allow for routing. This covers use cases such as providing an "origin" host name that can be accessed separately from a caching tier/CDN, or providing VPN-internal addresses. Note that these host names are _not_ provided to Drupal when a request is made.
 - `drupal_min_capacity`: The minimum number of ECS tasks to run for Drupal. While this value defaults to 1, production deployments should use a larger value in order to supply high availability even during low-traffic scenarios.
 - `drupal_max_capacity`: The maximum number of ECS tasks to run for Drupal. This value is only limited by AWS service quotas (and your budget); plan for low values (e.g., 5) for dev environments and large (e.g., 30 or more) for production-ready deployments. Autoscaling rules will ensure this value is only used when demand requires it.
-- `drupal_use_s3_domain`: This determines whether or not Drupal outputs direct links to files in S3, or tells the s3fs module to proxy links to files.
 - `drupal_csrf_origin_whitelist`: This is an optional list of origins provided to [Security Kit](https://www.drupal.org/project/seckit)'s `seckit_csrf.origin_whitelist` configuration. Security Kit checks this list when non-idemptotent (e.g., POST, PUT, DELETE, etc.) requests are sent. If the requesting origin isn't in the list (or is absent entirely), the request is rejected. Note that the value of `var.drupal_hostname` is implicitly added to this list by the module and does not need to be added manually.
 - `drupal_state`: This value exists to work around a chicken-and-egg problem when deploying Drupal for the first time. This value _must_ be one of `"run"` or `"build"`. See the next section for how these influence Drupal's behavior.
 
@@ -136,23 +133,6 @@ SMTP credentials are saved in Secrets Manager instead of being provided in plain
 
 - `/webcms/${var.environment}/${var.site}/${var.lang}/mail-password`: The SMTP password.
 
-#### Akamai Variables
-
-These variables influence how Drupal interacts with Akamai caching. Specifically, they control whether or not Drupal uses content purging and, if enabled, where the API endpoint is. These variables have sensible defaults that disable Akamai, so this can be ignored unless building the production sites.
-
-- `akamai_enabled`: Tells Drupal if Akamai caching is in use.
-- `akamai_api_host`: The URL of the Akamai endpoint to purge content. Only relevant if `akamai_enabled` is true. The default valaue here is a junk URL that can be left alone when Akamai caching is not in use.
-
-##### Sensitive Values
-
-There are three Akamai-related values that need to be populated. These values are required even if Akamai is disabled; in cases such as this, it is acceptable to simply store the empty string or junk data (such as `DISABLED` or another marker) here.
-
-These values correspond to authentication parameters used by Akamai's APIs. See the [Getting Started](https://developer.akamai.com/api/getting-started) documentation for more information.
-
-- `/webcms/${var.environment}/${var.site}/${var.lang}/akamai-access-token`: The Akamai access token.
-- `/webcms/${var.environment}/${var.site}/${var.lang}/akamai-client-token`: The Akamai client token.
-- `/webcms/${var.environment}/${var.site}/${var.lang}/akamai-client-secret`: The Akamai client secret.
-
 #### SAML Variables
 
 These variables determine which SAML identity provider (IdP) it connects to, and how it identifies itself to that IdP.
@@ -206,9 +186,6 @@ As with the infrastructure and database modules, this module assumes that certai
   - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/newrelic-license`: The ARN of the New Relic license key.
   - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/mail-password`: The ARN of the SMTP password.
   - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/saml-sp-key`: The ARN of the private key for Drupal's SAML certificate.
-  - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-access-token`: The ARN of the Akamai API access token.
-  - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-client-token`: The ARN of the Akamai API client token.
-  - `/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-client-secret`: The ARN of the Akamai API client secret.
 
 ## Resources
 
diff --git a/terraform/webcms/shared.tf b/terraform/webcms/shared.tf
index 3e2a9a75ab..879574b329 100644
--- a/terraform/webcms/shared.tf
+++ b/terraform/webcms/shared.tf
@@ -170,18 +170,6 @@ data "aws_ssm_parameter" "saml_sp_key" {
   name = "/webcms/${var.environment}/${var.site}/${var.lang}/secrets/saml-sp-key"
 }
 
-data "aws_ssm_parameter" "akamai_access_token" {
-  name = "/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-access-token"
-}
-
-data "aws_ssm_parameter" "akamai_client_token" {
-  name = "/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-client-token"
-}
-
-data "aws_ssm_parameter" "akamai_client_secret" {
-  name = "/webcms/${var.environment}/${var.site}/${var.lang}/secrets/akamai-client-secret"
-}
-
 #endregion
 
 #region Locals
@@ -197,9 +185,6 @@ locals {
     { name = "WEBCMS_HASH_SALT", valueFrom = data.aws_ssm_parameter.hash_salt.value },
     { name = "WEBCMS_MAIL_PASS", valueFrom = data.aws_ssm_parameter.mail_pass.value },
     { name = "WEBCMS_SAML_SP_KEY", valueFrom = data.aws_ssm_parameter.saml_sp_key.value },
-    { name = "WEBCMS_AKAMAI_ACCESS_TOKEN", valueFrom = data.aws_ssm_parameter.akamai_access_token.value },
-    { name = "WEBCMS_AKAMAI_CLIENT_TOKEN", valueFrom = data.aws_ssm_parameter.akamai_client_token.value },
-    { name = "WEBCMS_AKAMAI_CLIENT_SECRET", valueFrom = data.aws_ssm_parameter.akamai_client_secret.value },
     { name = "WEBCMS_NEW_RELIC_LICENSE", valueFrom = data.aws_ssm_parameter.newrelic_license.value },
   ]
 
@@ -216,14 +201,9 @@ locals {
     { name = "WEBCMS_ENV_STATE", value = var.drupal_state },
     { name = "WEBCMS_SITE", value = var.site },
     { name = "WEBCMS_LANG", value = var.lang },
-    { name = "WEBCMS_S3_USES_DOMAIN", value = var.drupal_use_s3_domain ? "1" : "0" },
     { name = "WEBCMS_CSRF_ORIGIN_WHITELIST", value = join(",", var.drupal_csrf_origin_whitelist) },
     { name = "WEBCMS_LOG_GROUP", value = data.aws_ssm_parameter.drupal_log_group.value },
 
-    # Akamai
-    { name = "WEBCMS_AKAMAI_ENABLED", value = var.akamai_enabled ? "1" : "0" },
-    { name = "WEBCMS_AKAMAI_API_HOST", value = var.akamai_api_host },
-
     # DB info
     { name = "WEBCMS_DB_HOST", value = data.aws_ssm_parameter.rds_proxy_endpoint.value },
     { name = "WEBCMS_DB_NAME", value = "webcms_${var.site}_${var.lang}_d8" },
diff --git a/terraform/webcms/variables.tf b/terraform/webcms/variables.tf
index ea95d60066..ce95e75f18 100644
--- a/terraform/webcms/variables.tf
+++ b/terraform/webcms/variables.tf
@@ -92,11 +92,6 @@ variable "drupal_csrf_origin_whitelist" {
   default     = []
 }
 
-variable "drupal_use_s3_domain" {
-  description = "Determines whether S3 assets will be served from the same domain as the main site. Set to false to serve directly from S3 domain."
-  type        = bool
-}
-
 #endregion
 
 #region Email
@@ -138,22 +133,6 @@ variable "email_enable_workflow_notifications" {
 
 #endregion
 
-#region Akamai
-
-variable "akamai_enabled" {
-  description = "Set to TRUE if this site is being served via Akamai; otherwise FALSE."
-  type        = bool
-  default     = false
-}
-
-variable "akamai_api_host" {
-  description = "The URL of the Akamai CCU API host. It should be in the format *.purge.akamaiapis.net/"
-  type        = string
-  default     = "https://xxxx-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net/"
-}
-
-#endregion
-
 #region SAML
 
 variable "saml_sp_entity_id" {

From aa461fdee4d00417d0e02264f481f61e861f4b30 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 16 Aug 2022 10:18:01 -0400
Subject: [PATCH 49/57] EPAD8-1801 update core to 9.3.21

---
 services/drupal/composer.lock | 331 +++++++++++++++++-----------------
 1 file changed, 165 insertions(+), 166 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 0b397d0db1..f952720c6c 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -1746,34 +1746,31 @@
         },
         {
             "name": "doctrine/event-manager",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f"
+                "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
+                "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "conflict": {
-                "doctrine/common": "<2.9@dev"
+                "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpunit/phpunit": "^7.0"
+                "doctrine/coding-standard": "^9",
+                "phpstan/phpstan": "~1.4.10 || ^1.5.4",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\": "lib/Doctrine/Common"
@@ -1820,7 +1817,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/1.1.x"
+                "source": "https://github.com/doctrine/event-manager/tree/1.1.2"
             },
             "funding": [
                 {
@@ -1836,7 +1833,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-29T18:28:51+00:00"
+            "time": "2022-07-27T22:18:11+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -3318,16 +3315,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.16",
+            "version": "9.3.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "eef5b91fa6689410325d569a0653878b2b1782ed"
+                "reference": "b32e65a1ebc76c24f6036924274d21c222e350ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/eef5b91fa6689410325d569a0653878b2b1782ed",
-                "reference": "eef5b91fa6689410325d569a0653878b2b1782ed",
+                "url": "https://api.github.com/repos/drupal/core/zipball/b32e65a1ebc76c24f6036924274d21c222e350ef",
+                "reference": "b32e65a1ebc76c24f6036924274d21c222e350ef",
                 "shasum": ""
             },
             "require": {
@@ -3349,7 +3346,7 @@
                 "ext-spl": "*",
                 "ext-tokenizer": "*",
                 "ext-xml": "*",
-                "guzzlehttp/guzzle": "^6.5.7",
+                "guzzlehttp/guzzle": "^6.5.8",
                 "laminas/laminas-diactoros": "^2.1",
                 "laminas/laminas-feed": "^2.12",
                 "masterminds/html5": "^2.1",
@@ -3569,13 +3566,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.16"
+                "source": "https://github.com/drupal/core/tree/9.3.21"
             },
-            "time": "2022-06-10T19:08:28+00:00"
+            "time": "2022-08-03T16:34:49+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.16",
+            "version": "9.3.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -3619,22 +3616,22 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.16"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.21"
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.16",
+            "version": "9.3.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "11ea8b32924c646b29d7d767e655ffedd2982092"
+                "reference": "ed55850d6c38bf6dbd82561ff81a12a08974b098"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/11ea8b32924c646b29d7d767e655ffedd2982092",
-                "reference": "11ea8b32924c646b29d7d767e655ffedd2982092",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/ed55850d6c38bf6dbd82561ff81a12a08974b098",
+                "reference": "ed55850d6c38bf6dbd82561ff81a12a08974b098",
                 "shasum": ""
             },
             "require": {
@@ -3643,12 +3640,12 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.16",
+                "drupal/core": "9.3.21",
                 "egulias/email-validator": "3.1.2",
-                "guzzlehttp/guzzle": "6.5.7",
+                "guzzlehttp/guzzle": "6.5.8",
                 "guzzlehttp/promises": "1.5.1",
-                "guzzlehttp/psr7": "1.8.5",
-                "laminas/laminas-diactoros": "2.8.0",
+                "guzzlehttp/psr7": "1.9.0",
+                "laminas/laminas-diactoros": "2.11.1",
                 "laminas/laminas-escaper": "2.9.0",
                 "laminas/laminas-feed": "2.15.0",
                 "laminas/laminas-stdlib": "3.6.1",
@@ -3705,9 +3702,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.16"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.21"
             },
-            "time": "2022-06-10T19:08:28+00:00"
+            "time": "2022-08-03T16:34:49+00:00"
         },
         {
             "name": "drupal/crop",
@@ -10904,24 +10901,24 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.7",
+            "version": "6.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "724562fa861e21a4071c652c8a159934e4f05592"
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
-                "reference": "724562fa861e21a4071c652c8a159934e4f05592",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
+                "guzzlehttp/psr7": "^1.9",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -10999,7 +10996,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
             },
             "funding": [
                 {
@@ -11015,7 +11012,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-09T21:36:50+00:00"
+            "time": "2022-06-20T22:16:07+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -11103,16 +11100,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.5",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
-                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -11133,7 +11130,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -11193,7 +11190,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
             },
             "funding": [
                 {
@@ -11209,7 +11206,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-20T21:51:18+00:00"
+            "time": "2022-06-20T21:43:03+00:00"
         },
         {
             "name": "highlightjs/highlight.js",
@@ -11348,16 +11345,16 @@
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.8.0",
+            "version": "2.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199"
+                "reference": "25b11d422c2e5dad868f68619888763b30f91e2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
-                "reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/25b11d422c2e5dad868f68619888763b30f91e2d",
+                "reference": "25b11d422c2e5dad868f68619888763b30f91e2d",
                 "shasum": ""
             },
             "require": {
@@ -11443,7 +11440,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-09-22T03:54:36+00:00"
+            "time": "2022-06-28T21:07:29+00:00"
         },
         {
             "name": "laminas/laminas-escaper",
@@ -13964,16 +13961,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.39",
+            "version": "v4.4.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35"
+                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/72a5b35fecaa670b13954e6eaf414acbe2a67b35",
-                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5",
+                "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5",
                 "shasum": ""
             },
             "require": {
@@ -14007,7 +14004,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v4.4.39"
+                "source": "https://github.com/symfony/filesystem/tree/v4.4.42"
             },
             "funding": [
                 {
@@ -14023,20 +14020,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T10:38:15+00:00"
+            "time": "2022-05-20T08:49:14+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.41",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
-                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f",
+                "reference": "66bd787edb5e42ff59d3523f623895af05043e4f",
                 "shasum": ""
             },
             "require": {
@@ -14069,7 +14066,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.41"
+                "source": "https://github.com/symfony/finder/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -14085,7 +14082,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-14T15:36:10+00:00"
+            "time": "2022-07-29T07:35:46+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -16464,16 +16461,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.3.1",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
-                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c",
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c",
                 "shasum": ""
             },
             "require": {
@@ -16520,7 +16517,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.3"
             },
             "funding": [
                 {
@@ -16536,20 +16533,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T20:44:15+00:00"
+            "time": "2022-07-20T07:14:26+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "2.2.11",
+            "version": "2.2.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538"
+                "reference": "a8ab5070fb99396e4710baee286478ad697724c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/2f5bcf0480c13b4fa1ac490aa9344e4402507538",
-                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538",
+                "url": "https://api.github.com/repos/composer/composer/zipball/a8ab5070fb99396e4710baee286478ad697724c2",
+                "reference": "a8ab5070fb99396e4710baee286478ad697724c2",
                 "shasum": ""
             },
             "require": {
@@ -16619,7 +16616,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.11"
+                "source": "https://github.com/composer/composer/tree/2.2.17"
             },
             "funding": [
                 {
@@ -16635,7 +16632,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T20:00:52+00:00"
+            "time": "2022-07-13T13:27:38+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -16779,16 +16776,16 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.6",
+            "version": "1.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "a30d487169d799745ca7280bc90fdfa693536901"
+                "reference": "c848241796da2abf65837d51dce1fae55a960149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901",
-                "reference": "a30d487169d799745ca7280bc90fdfa693536901",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149",
+                "reference": "c848241796da2abf65837d51dce1fae55a960149",
                 "shasum": ""
             },
             "require": {
@@ -16839,7 +16836,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/spdx-licenses/issues",
-                "source": "https://github.com/composer/spdx-licenses/tree/1.5.6"
+                "source": "https://github.com/composer/spdx-licenses/tree/1.5.7"
             },
             "funding": [
                 {
@@ -16855,7 +16852,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-18T10:14:14+00:00"
+            "time": "2022-05-23T07:37:50+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -17070,11 +17067,11 @@
         },
         {
             "name": "drupal/coder",
-            "version": "8.3.14",
+            "version": "8.3.15",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/coder.git",
-                "reference": "adb06efa79ba8b91afed2f351014a6b94192622f"
+                "reference": "0cfad3a21f1168bdc3030ae73351c31f88abba74"
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
@@ -17086,8 +17083,8 @@
                 "symfony/yaml": ">=2.0.5"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.2.0",
-                "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0"
+                "phpstan/phpstan": "^1.4.9",
+                "phpunit/phpunit": "^7.0 || ^8.0"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -17111,11 +17108,11 @@
                 "issues": "https://www.drupal.org/project/issues/coder",
                 "source": "https://www.drupal.org/project/coder"
             },
-            "time": "2022-01-28T09:33:01+00:00"
+            "time": "2022-04-02T17:56:30+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.16",
+            "version": "9.3.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -17159,7 +17156,7 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.16"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.21"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
@@ -17302,16 +17299,16 @@
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.11",
+            "version": "1.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83"
+                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/608e8b20a9072f84cac4f2fddb4420893d69eb83",
-                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/200b8df772b74d604bebf25ef42ad6f8ee6380a9",
+                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9",
                 "shasum": ""
             },
             "require": {
@@ -17319,8 +17316,8 @@
                 "php": ">=5.3.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "^1.0||^2.0"
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "satooshi/php-coveralls": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -17359,22 +17356,22 @@
             ],
             "support": {
                 "issues": "https://github.com/instaclick/php-webdriver/issues",
-                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.11"
+                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.14"
             },
-            "time": "2022-03-30T01:28:33+00:00"
+            "time": "2022-04-19T02:06:59+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.11",
+            "version": "5.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
                 "shasum": ""
             },
             "require": {
@@ -17429,22 +17426,22 @@
             ],
             "support": {
                 "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
             },
-            "time": "2021-07-22T09:24:00+00:00"
+            "time": "2022-04-13T08:02:27+00:00"
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.6.10",
+            "version": "v1.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "250c0825537d501e327df879fb3d4cd751933b85"
+                "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/250c0825537d501e327df879fb3d4cd751933b85",
-                "reference": "250c0825537d501e327df879fb3d4cd751933b85",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
+                "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
                 "shasum": ""
             },
             "require": {
@@ -17482,7 +17479,7 @@
                 "source": "https://github.com/bovigo/vfsStream/tree/master",
                 "wiki": "https://github.com/bovigo/vfsStream/wiki"
             },
-            "time": "2021-09-25T08:05:01+00:00"
+            "time": "2022-02-23T02:02:42+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -17883,16 +17880,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.4.2",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d"
+                "reference": "367a8d9d5f7da2a0136422d27ce8840583926955"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
-                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955",
+                "reference": "367a8d9d5f7da2a0136422d27ce8840583926955",
                 "shasum": ""
             },
             "require": {
@@ -17902,6 +17899,7 @@
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan-phpunit": "^1.1",
                 "phpstan/phpstan-strict-rules": "^1.0",
                 "phpunit/phpunit": "^9.5",
                 "symfony/process": "^5.2"
@@ -17921,9 +17919,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.4.2"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0"
             },
-            "time": "2022-03-30T13:33:37+00:00"
+            "time": "2022-08-09T12:23:23+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -19423,28 +19421,29 @@
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
-            "version": "v2.11.3",
+            "version": "v2.11.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git",
-                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8"
+                "reference": "e0c3d7b7572e351914e1c82abc902e129fe4e587"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/c921498b474212fe4552928bbeb68d70250ce5e8",
-                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8",
+                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/e0c3d7b7572e351914e1c82abc902e129fe4e587",
+                "reference": "e0c3d7b7572e351914e1c82abc902e129fe4e587",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": "^3.5"
+                "squizlabs/php_codesniffer": "^3.5.6"
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "limedeck/phpunit-detailed-printer": "^3.1 || ^4.0 || ^5.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^5.0 || ^6.5 || ^7.0 || ^8.0",
-                "sirbrillig/phpcs-import-detection": "^1.1"
+                "phpcsstandards/phpcsdevcs": "^1.1",
+                "phpstan/phpstan": "^1.7",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0",
+                "sirbrillig/phpcs-import-detection": "^1.1",
+                "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0@beta"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -19472,36 +19471,36 @@
                 "source": "https://github.com/sirbrillig/phpcs-variable-analysis",
                 "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki"
             },
-            "time": "2022-02-21T17:01:13+00:00"
+            "time": "2022-08-15T15:38:22+00:00"
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "7.1",
+            "version": "7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "b521bd358b5f7a7d69e9637fd139e036d8adeb6f"
+                "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b521bd358b5f7a7d69e9637fd139e036d8adeb6f",
-                "reference": "b521bd358b5f7a7d69e9637fd139e036d8adeb6f",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90",
+                "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
                 "php": "^7.2 || ^8.0",
-                "phpstan/phpdoc-parser": "^1.4.1",
+                "phpstan/phpdoc-parser": "^1.5.1",
                 "squizlabs/php_codesniffer": "^3.6.2"
             },
             "require-dev": {
-                "phing/phing": "2.17.2",
+                "phing/phing": "2.17.3",
                 "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.4.10|1.5.2",
+                "phpstan/phpstan": "1.4.10|1.7.1",
                 "phpstan/phpstan-deprecation-rules": "1.0.0",
-                "phpstan/phpstan-phpunit": "1.0.0|1.1.0",
-                "phpstan/phpstan-strict-rules": "1.1.0",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.5.19"
+                "phpstan/phpstan-phpunit": "1.0.0|1.1.1",
+                "phpstan/phpstan-strict-rules": "1.2.3",
+                "phpunit/phpunit": "7.5.20|8.5.21|9.5.20"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -19521,7 +19520,7 @@
             "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/7.1"
+                "source": "https://github.com/slevomat/coding-standard/tree/7.2.1"
             },
             "funding": [
                 {
@@ -19533,20 +19532,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-29T12:44:16+00:00"
+            "time": "2022-05-25T10:58:12+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.2",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "shasum": ""
             },
             "require": {
@@ -19589,20 +19588,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-12-12T21:44:58+00:00"
+            "time": "2022-06-18T07:21:10+00:00"
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.4.37",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "6e81008cac62369871cb6b8de64576ed138e3998"
+                "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6e81008cac62369871cb6b8de64576ed138e3998",
-                "reference": "6e81008cac62369871cb6b8de64576ed138e3998",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb",
+                "reference": "2a1ff40723ef6b29c8229a860a9c8f815ad7dbbb",
                 "shasum": ""
             },
             "require": {
@@ -19645,7 +19644,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v4.4.37"
+                "source": "https://github.com/symfony/browser-kit/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -19661,20 +19660,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-07-25T12:56:14+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.4.37",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436"
+                "reference": "bd0a6737e48de45b4b0b7b6fc98c78404ddceaed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/0628e6c6d7c92f1a7bae543959bdc17347be2436",
-                "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/bd0a6737e48de45b4b0b7b6fc98c78404ddceaed",
+                "reference": "bd0a6737e48de45b4b0b7b6fc98c78404ddceaed",
                 "shasum": ""
             },
             "require": {
@@ -19711,7 +19710,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v4.4.37"
+                "source": "https://github.com/symfony/css-selector/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -19727,20 +19726,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-06-27T13:16:42+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.42",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0"
+                "reference": "53cee1108a9748682b1268bc1a76a3d6a665ede2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be5a04618e5d44e71d013f177df80d3ec4b192a0",
-                "reference": "be5a04618e5d44e71d013f177df80d3ec4b192a0",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53cee1108a9748682b1268bc1a76a3d6a665ede2",
+                "reference": "53cee1108a9748682b1268bc1a76a3d6a665ede2",
                 "shasum": ""
             },
             "require": {
@@ -19785,7 +19784,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.42"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.44"
             },
             "funding": [
                 {
@@ -19801,7 +19800,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-30T18:34:00+00:00"
+            "time": "2022-06-27T13:16:42+00:00"
         },
         {
             "name": "symfony/lock",
@@ -19883,16 +19882,16 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.4.7",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348"
+                "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31977d36f253607e1fc4e1fb54df18bd9f1e4348",
-                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31b1549f54b1a1890e725a0c1c8c2de6ef2205b3",
+                "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3",
                 "shasum": ""
             },
             "require": {
@@ -19946,7 +19945,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.7"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -19962,7 +19961,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-06T11:25:32+00:00"
+            "time": "2022-07-28T13:33:28+00:00"
         },
         {
             "name": "theseer/tokenizer",

From f916a16413d1e3544d3dbc99936f9e72739c1b53 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Tue, 16 Aug 2022 12:38:24 -0400
Subject: [PATCH 50/57] [EPAD8-1770] update lock icon sizing

---
 .../web/themes/epa_theme/js/src/protected-links.es6.js       | 2 +-
 .../05-components/external-link/_external-link.scss          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
index 5e6bacb408..7e053e7f6f 100644
--- a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
@@ -32,7 +32,7 @@ import Drupal from 'drupal';
           const translatedAccessible = Drupal.t('Link to protected area');
           el.insertAdjacentHTML(
             'beforeend',
-            `<span class="protected-link__tag" title="${translatedAccessible}"><svg class="usa-icon" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#lock"></use></svg></span>`
+            `<span class="protected-link__tag" title="${translatedAccessible}"><svg class="icon icon--exit is-spaced-before" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#lock"></use></svg></span>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index 6adb6b5f14..82ea296416 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -85,9 +85,10 @@
     background-size: 100% 100%;
     content: '';
     display: inline-block;
-    height: 0.65em;
+    height: 1em;
     margin: -1px rem(units(0.5)) 0;
-    width: 0.65em;
+    vertical-align: middle;
+    width: 1em;
   }
 
   &:hover,

From c4006287bcd602a3f52b4216809728fdcf1c6f1c Mon Sep 17 00:00:00 2001
From: elinork <16242091+elinork@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:13:32 -0400
Subject: [PATCH 51/57] Update OneEPA_template.R

Removing relative link to js/pattern-lab-head-script.js as recommended over email by Mike Hessling
---
 utilities/r/OneEPA_template.R | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utilities/r/OneEPA_template.R b/utilities/r/OneEPA_template.R
index e67fb08da5..04defbf34c 100644
--- a/utilities/r/OneEPA_template.R
+++ b/utilities/r/OneEPA_template.R
@@ -24,7 +24,6 @@ ui <- fluidPage(
     tags$meta(name="HandheldFriendly", content="true"),
     tags$meta(name="viewport", content="width=device-width, initial-scale=1.0"),
     tags$meta(`http-equiv`="x-ua-compatible", content="ie=edge"),
-    tags$script(src = "js/pattern-lab-head-script.js"),
     tags$title('ContDataQC | US EPA'),
     tags$link(rel="icon", type="image/x-icon", href="https://www.epa.gov/themes/epa_theme/images/favicon.ico"),
     tags$meta(name="msapplication-TileColor", content="#FFFFFF"),
@@ -464,4 +463,4 @@ ui <- fluidPage(
 		}
 	## End example server code
 
-shinyApp(ui = ui, server = server)
\ No newline at end of file
+shinyApp(ui = ui, server = server)

From 25c320647de181716f56c0809a3757e47651bbe2 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Wed, 17 Aug 2022 13:55:16 -0400
Subject: [PATCH 52/57] EPAD8-1770: Optimize SVG icons

---
 .../web/themes/epa_theme/images/external-link-alt-hover.svg     | 2 +-
 .../drupal/web/themes/epa_theme/images/external-link-alt.svg    | 2 +-
 .../drupal/web/themes/epa_theme/images/external-link-hover.svg  | 2 +-
 services/drupal/web/themes/epa_theme/images/external-link.svg   | 2 +-
 services/drupal/web/themes/epa_theme/images/lock--blue-base.svg | 2 +-
 services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg | 2 +-
 services/drupal/web/themes/epa_theme/images/lock--gray-2.svg    | 2 +-
 services/drupal/web/themes/epa_theme/images/lock--gray-7.svg    | 2 +-
 services/drupal/web/themes/epa_theme/images/lock--white.svg     | 2 +-
 services/drupal/web/themes/epa_theme/images/lock-hover.svg      | 2 +-
 services/drupal/web/themes/epa_theme/images/lock.svg            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/images/external-link-alt-hover.svg b/services/drupal/web/themes/epa_theme/images/external-link-alt-hover.svg
index 344795eafb..7a6bd3dfba 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link-alt-hover.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link-alt-hover.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="64" height="55" viewBox="0 0 64 55"><title>external-link-alt-hover</title><path fill="#FFF" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
\ No newline at end of file
+<svg height="55" viewBox="0 0 64 55" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32h-24.999c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013v-11.362c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363c0 2.817-1 5.226-3.001 7.226-2 2-4.41 3.001-7.226 3.001h-29.546c-2.817-.001-5.226-1.001-7.227-3.002-2-2-3-4.41-3-7.226v-29.546c0-2.817 1-5.226 3-7.226 2.001-2.001 4.41-3.001 7.227-3.001zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687s-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36s-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1 -.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626s.229-1.168.687-1.626c.457-.457 1-.686 1.625-.686z" fill="#fff" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/external-link-alt.svg b/services/drupal/web/themes/epa_theme/images/external-link-alt.svg
index 58b06336eb..f25ce1d4c3 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link-alt.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link-alt.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="64" height="55" viewBox="0 0 64 55"><title>external-link-alt</title><path fill="#A9AEB1" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
\ No newline at end of file
+<svg height="55" viewBox="0 0 64 55" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32h-24.999c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013v-11.362c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363c0 2.817-1 5.226-3.001 7.226-2 2-4.41 3.001-7.226 3.001h-29.546c-2.817-.001-5.226-1.001-7.227-3.002-2-2-3-4.41-3-7.226v-29.546c0-2.817 1-5.226 3-7.226 2.001-2.001 4.41-3.001 7.227-3.001zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687s-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36s-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1 -.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626s.229-1.168.687-1.626c.457-.457 1-.686 1.625-.686z" fill="#a9aeb1" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/external-link-hover.svg b/services/drupal/web/themes/epa_theme/images/external-link-hover.svg
index eb2a8ae4f7..e67561dbf0 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link-hover.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link-hover.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="64" height="55" viewBox="0 0 64 55"><title>external-link-hover</title><path fill="#1A4480" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
\ No newline at end of file
+<svg height="55" viewBox="0 0 64 55" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32h-24.999c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013v-11.362c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363c0 2.817-1 5.226-3.001 7.226-2 2-4.41 3.001-7.226 3.001h-29.546c-2.817-.001-5.226-1.001-7.227-3.002-2-2-3-4.41-3-7.226v-29.546c0-2.817 1-5.226 3-7.226 2.001-2.001 4.41-3.001 7.227-3.001zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687s-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36s-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1 -.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626s.229-1.168.687-1.626c.457-.457 1-.686 1.625-.686z" fill="#1a4480" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/external-link.svg b/services/drupal/web/themes/epa_theme/images/external-link.svg
index 404d060358..a6561b403b 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="64" height="55" viewBox="0 0 64 55"><title>external-link</title><path fill="#005EA2" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
\ No newline at end of file
+<svg height="55" viewBox="0 0 64 55" width="64" xmlns="http://www.w3.org/2000/svg"><path d="m35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32h-24.999c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013v-11.362c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363c0 2.817-1 5.226-3.001 7.226-2 2-4.41 3.001-7.226 3.001h-29.546c-2.817-.001-5.226-1.001-7.227-3.002-2-2-3-4.41-3-7.226v-29.546c0-2.817 1-5.226 3-7.226 2.001-2.001 4.41-3.001 7.227-3.001zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687s-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36s-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1 -.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626s.229-1.168.687-1.626c.457-.457 1-.686 1.625-.686z" fill="#005ea2" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg b/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
index f160bbdf10..06f91bd6b2 100644
--- a/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock--blue-base.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#005ea2" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#005ea2"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg b/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
index 03cb5cf8f9..8e8a909828 100644
--- a/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock--blue-dark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1a4480" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#1a4480"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg b/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
index 6f09a11144..596a5fddeb 100644
--- a/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock--gray-2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#dfe1e2" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#dfe1e2"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg b/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
index a6f11f781b..e7db572bdc 100644
--- a/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock--gray-7.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1b1b1b" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#1b1b1b"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock--white.svg b/services/drupal/web/themes/epa_theme/images/lock--white.svg
index af9111474d..0ccae45906 100644
--- a/services/drupal/web/themes/epa_theme/images/lock--white.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock--white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#ffffff" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock-hover.svg b/services/drupal/web/themes/epa_theme/images/lock-hover.svg
index ca136295b3..8e8a909828 100644
--- a/services/drupal/web/themes/epa_theme/images/lock-hover.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock-hover.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#1A4480" d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z" fill="#1a4480"/></svg>
\ No newline at end of file
diff --git a/services/drupal/web/themes/epa_theme/images/lock.svg b/services/drupal/web/themes/epa_theme/images/lock.svg
index 8fd44189da..8455126b7d 100644
--- a/services/drupal/web/themes/epa_theme/images/lock.svg
+++ b/services/drupal/web/themes/epa_theme/images/lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m18 8h-1v-2c0-2.76-2.24-5-5-5s-5 2.24-5 5v2h-1c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9h-6.2v-2c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1z"/></svg>
\ No newline at end of file

From 2eef7530cbaafd004d1d647e03a058faf58e8056 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Wed, 17 Aug 2022 15:17:17 -0400
Subject: [PATCH 53/57] EPAD8-1770: Update protected link icon to be accessible

---
 .../web/themes/epa_theme/js/src/protected-links.es6.js       | 2 +-
 .../05-components/external-link/_external-link.scss          | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
index 7e053e7f6f..aec654dfdf 100644
--- a/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/protected-links.es6.js
@@ -32,7 +32,7 @@ import Drupal from 'drupal';
           const translatedAccessible = Drupal.t('Link to protected area');
           el.insertAdjacentHTML(
             'beforeend',
-            `<span class="protected-link__tag" title="${translatedAccessible}"><svg class="icon icon--exit is-spaced-before" aria-hidden="true" focusable="false" role="img"><use href="/themes/epa_theme/images/sprite.svg#lock"></use></svg></span>`
+            `<svg class="icon icon--exit is-spaced-before" role="img"><title>${translatedAccessible}</title><use href="/themes/epa_theme/images/sprite.svg#lock"></use></svg>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index 82ea296416..c37619af0c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -188,8 +188,3 @@ a:not([href])::after {
   padding: 0 0.5em;
   text-decoration: none;
 }
-
-.protected-link__tag {
-  display: inline-block;
-  text-decoration: none;
-}

From 77933f8dd79b32d8bb05f13edc12bd453d95060d Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Wed, 17 Aug 2022 16:11:20 -0400
Subject: [PATCH 54/57] EPAD8-1768: Update external link icon to be accessible
 and update css-only icon to match svg version

---
 .../epa_theme/images/external-link--blue-base.svg  |  3 ++-
 .../epa_theme/images/external-link--blue-dark.svg  |  3 ++-
 .../epa_theme/images/external-link--gray-2.svg     |  3 ++-
 .../epa_theme/images/external-link--gray-7.svg     |  3 ++-
 .../epa_theme/images/external-link--white.svg      |  3 ++-
 .../themes/epa_theme/js/src/external-links.es6.js  |  2 +-
 .../external-link/_external-link.scss              | 14 +++++---------
 .../_external-link--image.scss                     |  2 +-
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/images/external-link--blue-base.svg b/services/drupal/web/themes/epa_theme/images/external-link--blue-base.svg
index ca0d7a454f..e379a5db0c 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link--blue-base.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link--blue-base.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 64 55" xmlns="http://www.w3.org/2000/svg"><path fill="#005ea2" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#005ea2" d="M19 19H5V5h7V3H5a2 2 0 00-2 2v14a2 2 0 002 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</svg>
diff --git a/services/drupal/web/themes/epa_theme/images/external-link--blue-dark.svg b/services/drupal/web/themes/epa_theme/images/external-link--blue-dark.svg
index 658b3363f0..213d5fdc3a 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link--blue-dark.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link--blue-dark.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 64 55" xmlns="http://www.w3.org/2000/svg"><path fill="#1a4480" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#1a4480" d="M19 19H5V5h7V3H5a2 2 0 00-2 2v14a2 2 0 002 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</svg>
diff --git a/services/drupal/web/themes/epa_theme/images/external-link--gray-2.svg b/services/drupal/web/themes/epa_theme/images/external-link--gray-2.svg
index 29277a9421..9f4d9e812c 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link--gray-2.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link--gray-2.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 64 55" xmlns="http://www.w3.org/2000/svg"><path fill="#dfe1e2" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#dfe1e2" d="M19 19H5V5h7V3H5a2 2 0 00-2 2v14a2 2 0 002 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</svg>
diff --git a/services/drupal/web/themes/epa_theme/images/external-link--gray-7.svg b/services/drupal/web/themes/epa_theme/images/external-link--gray-7.svg
index e99ea172dd..6fb1ff09f7 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link--gray-7.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link--gray-7.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 64 55" xmlns="http://www.w3.org/2000/svg"><path fill="#1b1b1b" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#1b1b1b" d="M19 19H5V5h7V3H5a2 2 0 00-2 2v14a2 2 0 002 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</svg>
diff --git a/services/drupal/web/themes/epa_theme/images/external-link--white.svg b/services/drupal/web/themes/epa_theme/images/external-link--white.svg
index b5b89551c5..f35a919ead 100644
--- a/services/drupal/web/themes/epa_theme/images/external-link--white.svg
+++ b/services/drupal/web/themes/epa_theme/images/external-link--white.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 64 55" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" fill-rule="evenodd" d="M35.226 5c.333 0 .605.106.818.32.212.212.319.485.319.816v2.273c0 .332-.107.604-.32.817-.212.212-.484.32-.817.32H10.227c-1.562 0-2.9.555-4.013 1.668s-1.669 2.45-1.669 4.013v29.545c0 1.563.556 2.9 1.669 4.013s2.45 1.668 4.013 1.668h29.546c1.562 0 2.9-.555 4.013-1.668 1.112-1.113 1.668-2.45 1.668-4.013V33.41c0-.332.106-.604.32-.817.212-.213.484-.32.816-.32h2.273c.331 0 .604.107.817.32.214.213.32.485.32.818v11.363C50 47.591 49 50 46.999 52c-2 2-4.41 3.001-7.226 3.001H10.227C7.41 55 5.001 54 3 51.999c-2-2-3-4.41-3-7.226V15.227c0-2.817 1-5.226 3-7.226C5.001 6 7.41 5 10.227 5zm26.46-5c.627 0 1.17.229 1.627.686.457.458.687 1 .687 1.626v18.501c0 .626-.229 1.168-.687 1.626-.457.458-1 .687-1.626.687-.626 0-1.168-.23-1.626-.687l-6.36-6.36-23.558 23.56c-.24.24-.518.36-.831.36-.313 0-.59-.12-.831-.36l-4.12-4.12a1.142 1.142 0 0 1-.361-.831c0-.313.12-.59.361-.83l23.559-23.56-6.36-6.36c-.457-.457-.686-1-.686-1.626 0-.626.229-1.168.687-1.626.457-.457 1-.686 1.625-.686z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M19 19H5V5h7V3H5a2 2 0 00-2 2v14a2 2 0 002 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</svg>
diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index 0091c5bedc..c702f77011 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -72,7 +72,7 @@ import Drupal from 'drupal';
           }
           el.insertAdjacentHTML(
             'beforeend',
-            `<span class="external-link__tag" title="${translatedAccessible}"><svg class="icon icon--exit is-spaced-before" aria-hidden="true"><use href="/themes/epa_theme/images/sprite.svg#launch"></use></svg></span>`
+            `<svg class="icon icon--exit is-spaced-before" role="img"><title>${translatedAccessible}</title><use href="/themes/epa_theme/images/sprite.svg#launch"></use></svg>`
           );
         }
       });
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index 4d83b30559..938033b613 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -8,9 +8,10 @@
     background-size: 100% 100%;
     content: '';
     display: inline-block;
-    height: 0.65em;
+    height: 1em;
     margin: -1px rem(units(0.5)) 0;
-    width: 0.65em;
+    vertical-align: middle;
+    width: 1em;
   }
 
   &:hover,
@@ -40,13 +41,13 @@
   &.usa-button.usa-button--outline,
   &.usa-button.usa-button--unstyled {
     &::after {
-      @include svg-background(external-link--blue-dark);
+      @include svg-background(external-link--blue-base);
     }
     &:hover,
     &:focus,
     &:active {
       &::after {
-        @include svg-background(external-link-hover);
+        @include svg-background(external-link--blue-dark);
       }
     }
   }
@@ -97,8 +98,3 @@ html.no-js .external-link {
 a:not([href])::after {
   display: none !important;
 }
-
-.external-link__tag {
-  display: inline-block;
-  text-decoration: none;
-}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link--image/_external-link--image.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link--image/_external-link--image.scss
index 9de78d112e..5050bf46e5 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link--image/_external-link--image.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link--image/_external-link--image.scss
@@ -20,7 +20,7 @@
     @extend %external-link--image-after;
   }
 
-  .external-link__tag {
+  .icon--exit {
     margin: 0 !important;
     position: absolute;
     right: units('05');

From 99abc078360181b8d87b39f106a081e3418130aa Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Wed, 17 Aug 2022 16:13:21 -0400
Subject: [PATCH 55/57] EPAD8-1770: Fix external link icon color when inside
 UWSDS buttons

---
 .../_patterns/05-components/external-link/_external-link.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
index c37619af0c..4c36e1135b 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/_external-link.scss
@@ -118,13 +118,13 @@
   &.usa-button.usa-button--outline,
   &.usa-button.usa-button--unstyled {
     &::after {
-      @include svg-background(lock--blue-dark);
+      @include svg-background(lock--blue-base);
     }
     &:hover,
     &:focus,
     &:active {
       &::after {
-        @include svg-background(lock-hover);
+        @include svg-background(lock--blue-dark);
       }
     }
   }

From 820e6e468e3d2fd9c9463fd16f2ea7b1f0ebe2c6 Mon Sep 17 00:00:00 2001
From: gustavderdrache <gustavderdrache@gmail.com>
Date: Tue, 23 Aug 2022 09:26:55 -0400
Subject: [PATCH 56/57] Bump Aurora version

---
 terraform/infrastructure/rds.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/infrastructure/rds.tf b/terraform/infrastructure/rds.tf
index 7713a1314c..2a600b5fc1 100644
--- a/terraform/infrastructure/rds.tf
+++ b/terraform/infrastructure/rds.tf
@@ -66,7 +66,7 @@ resource "aws_rds_cluster" "db" {
 
   engine         = "aurora-mysql"
   engine_mode    = "provisioned"
-  engine_version = "5.7.mysql_aurora.2.09.0"
+  engine_version = "5.7.mysql_aurora.2.10.2"
 
   master_username = "root"
   master_password = random_password.rds_root_password.result

From d9daf60d033ca0d9d47d0b36591ccf99b350de2a Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Wed, 31 Aug 2022 11:29:30 -0400
Subject: [PATCH 57/57] EPAD8-1768: Update exit link text

---
 .../web/themes/epa_theme/js/src/external-links.es6.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index c702f77011..750b9375b1 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -42,7 +42,7 @@ import Drupal from 'drupal';
         "a:not([href=''], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'])"
       );
       const translate = {
-        en: ['Exit', 'Exit EPA website'],
+        en: ['Exit', 'Exit EPA’s website'],
         es: ['Salir', 'Salir del sitio web de la EPA'],
         ar: ['خروج', 'الخروج من موقع وكالة حماية البيئة'],
         zh_CN: ['退出', '退出环保署网页'],
@@ -52,7 +52,7 @@ import Drupal from 'drupal';
         fr: ['Quitter', 'Quitter le site de l’EPA'],
         gu: ['બહાર નીકળો', 'EPAની વેબસાઇટમાંથી બહાર નીકળો'],
         ht: ['Sòti', 'Sòti sou sit entènèt EPA a'],
-        it: ['Exit', 'Exit EPA Website'],
+        it: ['Exit', 'Exit EPA’s Website'],
         ko: ['출구', 'EPA 웹사이트 종료'],
         pt: ['Sair', 'Sair do site da EPA'],
         ru: ['Покинуть', 'Покинуть веб сайт EPA'],
@@ -61,7 +61,7 @@ import Drupal from 'drupal';
       };
       externalLinks.forEach(function(el) {
         if (el.hasAttribute('href') && linkIsExternal(el)) {
-          let translatedAccessible = Drupal.t('Exit EPA Website');
+          let translatedAccessible = Drupal.t('Exit EPA’s Website');
           const article = el.closest('article[lang]');
           if (article) {
             let lang = article.getAttribute('lang');