diff --git a/package-lock.json b/package-lock.json
index bde99d1793..47b48571f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@embroider/core": "^3.0.0",
         "@embroider/macros": "^1.12.0",
         "@embroider/router": "^2.1.1",
-        "@embroider/webpack": "^3.0.0",
+        "@embroider/webpack": "^3.1.1",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "@ilios/ember-template-lint-plugin": "^3.0.0",
@@ -2904,19 +2904,16 @@
       "dev": true
     },
     "node_modules/@embroider/core": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@embroider/core/-/core-3.0.2.tgz",
-      "integrity": "sha512-Rirm/Zyo93qR5yl6kHV4YDSSJRASLMCQf/Z0tpbzOwILQPC/26xE7BI+mHJS1HSfEv2Q+yzprMTNIo3g1RPDtw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@embroider/core/-/core-3.1.1.tgz",
+      "integrity": "sha512-YY1UiEM6wd0w5A9iD6pfnIqrItkIpNiE2Zqy8IWcpYXNvOo6WJwcqDwqYiX8x+3+nydbysSO/GeK8dNFGLwCtw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.14.5",
         "@babel/parser": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.14.5",
-        "@babel/runtime": "^7.14.5",
         "@babel/traverse": "^7.14.5",
-        "@embroider/macros": "1.11.1",
-        "@embroider/shared-internals": "2.1.0",
+        "@embroider/macros": "1.12.1",
+        "@embroider/shared-internals": "2.2.1",
         "assert-never": "^1.2.1",
         "babel-plugin-ember-template-compilation": "^2.0.0",
         "broccoli-node-api": "^1.7.0",
@@ -2924,7 +2921,6 @@
         "broccoli-plugin": "^4.0.7",
         "broccoli-source": "^3.0.1",
         "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
         "fast-sourcemap-concat": "^1.4.0",
         "filesize": "^5.0.0",
         "fs-extra": "^9.1.0",
@@ -2942,31 +2938,23 @@
         "node": "12.* || 14.* || >= 16"
       }
     },
-    "node_modules/@embroider/core/node_modules/@embroider/macros": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.11.1.tgz",
-      "integrity": "sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==",
+    "node_modules/@embroider/core/node_modules/@embroider/shared-internals": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+      "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
       "dev": true,
       "dependencies": {
-        "@embroider/shared-internals": "2.1.0",
-        "assert-never": "^1.2.1",
         "babel-import-util": "^1.1.0",
-        "ember-cli-babel": "^7.26.6",
-        "find-up": "^5.0.0",
+        "ember-rfc176-data": "^0.3.17",
+        "fs-extra": "^9.1.0",
+        "js-string-escape": "^1.0.1",
         "lodash": "^4.17.21",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.2"
+        "resolve-package-path": "^4.0.1",
+        "semver": "^7.3.5",
+        "typescript-memoize": "^1.0.1"
       },
       "engines": {
         "node": "12.* || 14.* || >= 16"
-      },
-      "peerDependencies": {
-        "@glint/template": "^1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@glint/template": {
-          "optional": true
-        }
       }
     },
     "node_modules/@embroider/core/node_modules/lru-cache": {
@@ -3016,12 +3004,12 @@
       }
     },
     "node_modules/@embroider/macros": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.0.tgz",
-      "integrity": "sha512-Ja4AnLy/peU7pYY1uHUJxSXT1DLMC2RR18g4udUIlGm1b0LAjvdssWn0yFBgNmBWvkyQvGmz+UA9LUMaw68lCg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.1.tgz",
+      "integrity": "sha512-SrVFlOIJoKAiomzKNPVzRBZXQ5QAUcCzpu280xODEatTIcpSPREL7uHcAwXI7+pDK/lEH3K1aX5MN/EmhmLYZw==",
       "dev": true,
       "dependencies": {
-        "@embroider/shared-internals": "2.2.0",
+        "@embroider/shared-internals": "2.2.1",
         "assert-never": "^1.2.1",
         "babel-import-util": "^1.1.0",
         "ember-cli-babel": "^7.26.6",
@@ -3043,9 +3031,9 @@
       }
     },
     "node_modules/@embroider/macros/node_modules/@embroider/shared-internals": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.0.tgz",
-      "integrity": "sha512-bQQJezPsgyDWmYllFg5UY88zP6dGWIOpA+hIxXXnN09IG+TyyIfG1YAgMOITnQzoDQuRTCvXvaydYef3nx7cvw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+      "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
       "dev": true,
       "dependencies": {
         "babel-import-util": "^1.1.0",
@@ -3192,15 +3180,15 @@
       }
     },
     "node_modules/@embroider/webpack": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-3.0.0.tgz",
-      "integrity": "sha512-+4P4fvwLpoKYrYS8S7CwBSVpFJlEvIbCd6XK313bqhrSUV0rBDVp5bbRZusVBeP4fMftzDmvZtqm6JtIEmJDtA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-3.1.1.tgz",
+      "integrity": "sha512-HgNLmE+O3269PS+v9pTZ+WgA2ylEKkZAx4ID3AjfgphAIBx2AmVEaj5I6kpAaUk8RR8Ba7pcihbKhwXXLUKKFw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.14.5",
         "@embroider/babel-loader-8": "3.0.0",
         "@embroider/hbs-loader": "3.0.0",
-        "@embroider/shared-internals": "2.1.0",
+        "@embroider/shared-internals": "2.2.1",
         "@types/supports-color": "^8.1.0",
         "assert-never": "^1.2.1",
         "babel-loader": "^8.2.2",
@@ -3224,10 +3212,29 @@
         "node": "12.* || 14.* || >= 16"
       },
       "peerDependencies": {
-        "@embroider/core": "^3.0.0",
+        "@embroider/core": "^3.1.1",
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/@embroider/webpack/node_modules/@embroider/shared-internals": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+      "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
+      "dev": true,
+      "dependencies": {
+        "babel-import-util": "^1.1.0",
+        "ember-rfc176-data": "^0.3.17",
+        "fs-extra": "^9.1.0",
+        "js-string-escape": "^1.0.1",
+        "lodash": "^4.17.21",
+        "resolve-package-path": "^4.0.1",
+        "semver": "^7.3.5",
+        "typescript-memoize": "^1.0.1"
+      },
+      "engines": {
+        "node": "12.* || 14.* || >= 16"
+      }
+    },
     "node_modules/@embroider/webpack/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -39296,19 +39303,16 @@
       }
     },
     "@embroider/core": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@embroider/core/-/core-3.0.2.tgz",
-      "integrity": "sha512-Rirm/Zyo93qR5yl6kHV4YDSSJRASLMCQf/Z0tpbzOwILQPC/26xE7BI+mHJS1HSfEv2Q+yzprMTNIo3g1RPDtw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@embroider/core/-/core-3.1.1.tgz",
+      "integrity": "sha512-YY1UiEM6wd0w5A9iD6pfnIqrItkIpNiE2Zqy8IWcpYXNvOo6WJwcqDwqYiX8x+3+nydbysSO/GeK8dNFGLwCtw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.14.5",
         "@babel/parser": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.14.5",
-        "@babel/runtime": "^7.14.5",
         "@babel/traverse": "^7.14.5",
-        "@embroider/macros": "1.11.1",
-        "@embroider/shared-internals": "2.1.0",
+        "@embroider/macros": "1.12.1",
+        "@embroider/shared-internals": "2.2.1",
         "assert-never": "^1.2.1",
         "babel-plugin-ember-template-compilation": "^2.0.0",
         "broccoli-node-api": "^1.7.0",
@@ -39316,7 +39320,6 @@
         "broccoli-plugin": "^4.0.7",
         "broccoli-source": "^3.0.1",
         "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
         "fast-sourcemap-concat": "^1.4.0",
         "filesize": "^5.0.0",
         "fs-extra": "^9.1.0",
@@ -39331,20 +39334,20 @@
         "walk-sync": "^3.0.0"
       },
       "dependencies": {
-        "@embroider/macros": {
-          "version": "1.11.1",
-          "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.11.1.tgz",
-          "integrity": "sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==",
+        "@embroider/shared-internals": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+          "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
           "dev": true,
           "requires": {
-            "@embroider/shared-internals": "2.1.0",
-            "assert-never": "^1.2.1",
             "babel-import-util": "^1.1.0",
-            "ember-cli-babel": "^7.26.6",
-            "find-up": "^5.0.0",
+            "ember-rfc176-data": "^0.3.17",
+            "fs-extra": "^9.1.0",
+            "js-string-escape": "^1.0.1",
             "lodash": "^4.17.21",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.2"
+            "resolve-package-path": "^4.0.1",
+            "semver": "^7.3.5",
+            "typescript-memoize": "^1.0.1"
           }
         },
         "lru-cache": {
@@ -39381,12 +39384,12 @@
       "requires": {}
     },
     "@embroider/macros": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.0.tgz",
-      "integrity": "sha512-Ja4AnLy/peU7pYY1uHUJxSXT1DLMC2RR18g4udUIlGm1b0LAjvdssWn0yFBgNmBWvkyQvGmz+UA9LUMaw68lCg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.12.1.tgz",
+      "integrity": "sha512-SrVFlOIJoKAiomzKNPVzRBZXQ5QAUcCzpu280xODEatTIcpSPREL7uHcAwXI7+pDK/lEH3K1aX5MN/EmhmLYZw==",
       "dev": true,
       "requires": {
-        "@embroider/shared-internals": "2.2.0",
+        "@embroider/shared-internals": "2.2.1",
         "assert-never": "^1.2.1",
         "babel-import-util": "^1.1.0",
         "ember-cli-babel": "^7.26.6",
@@ -39397,9 +39400,9 @@
       },
       "dependencies": {
         "@embroider/shared-internals": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.0.tgz",
-          "integrity": "sha512-bQQJezPsgyDWmYllFg5UY88zP6dGWIOpA+hIxXXnN09IG+TyyIfG1YAgMOITnQzoDQuRTCvXvaydYef3nx7cvw==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+          "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
           "dev": true,
           "requires": {
             "babel-import-util": "^1.1.0",
@@ -39502,15 +39505,15 @@
       }
     },
     "@embroider/webpack": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-3.0.0.tgz",
-      "integrity": "sha512-+4P4fvwLpoKYrYS8S7CwBSVpFJlEvIbCd6XK313bqhrSUV0rBDVp5bbRZusVBeP4fMftzDmvZtqm6JtIEmJDtA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@embroider/webpack/-/webpack-3.1.1.tgz",
+      "integrity": "sha512-HgNLmE+O3269PS+v9pTZ+WgA2ylEKkZAx4ID3AjfgphAIBx2AmVEaj5I6kpAaUk8RR8Ba7pcihbKhwXXLUKKFw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.14.5",
         "@embroider/babel-loader-8": "3.0.0",
         "@embroider/hbs-loader": "3.0.0",
-        "@embroider/shared-internals": "2.1.0",
+        "@embroider/shared-internals": "2.2.1",
         "@types/supports-color": "^8.1.0",
         "assert-never": "^1.2.1",
         "babel-loader": "^8.2.2",
@@ -39531,6 +39534,22 @@
         "thread-loader": "^3.0.4"
       },
       "dependencies": {
+        "@embroider/shared-internals": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.2.1.tgz",
+          "integrity": "sha512-btA8ZY4JkPXWJnpcIuNNld7kSz8OYTA3ocppt5qQsOw9gA4cpAU7QJdP3xtpcNrghSAeWTo2vOSpACA638in8A==",
+          "dev": true,
+          "requires": {
+            "babel-import-util": "^1.1.0",
+            "ember-rfc176-data": "^0.3.17",
+            "fs-extra": "^9.1.0",
+            "js-string-escape": "^1.0.1",
+            "lodash": "^4.17.21",
+            "resolve-package-path": "^4.0.1",
+            "semver": "^7.3.5",
+            "typescript-memoize": "^1.0.1"
+          }
+        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
diff --git a/package.json b/package.json
index 7495e11a06..66175a1f37 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@embroider/core": "^3.0.0",
     "@embroider/macros": "^1.12.0",
     "@embroider/router": "^2.1.1",
-    "@embroider/webpack": "^3.0.0",
+    "@embroider/webpack": "^3.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@ilios/ember-template-lint-plugin": "^3.0.0",