diff --git a/package-lock.json b/package-lock.json
index 53bfdb8da1..a421029a3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@ember/optional-features": "^2.0.0",
         "@ember/string": "^3.1.1",
         "@ember/test-helpers": "^2.9.3",
-        "@embroider/compat": "~3.0.2",
+        "@embroider/compat": "~3.2.1",
         "@embroider/core": "~3.2.1",
         "@embroider/macros": "^1.13.1",
         "@embroider/router": "^2.1.1",
@@ -2819,22 +2819,24 @@
       }
     },
     "node_modules/@embroider/compat": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@embroider/compat/-/compat-3.0.2.tgz",
-      "integrity": "sha512-X94QrkZ7+m85z4exCvmYojBceclf5hQ/Lj88F2ILk1xg4OQY/1Y3y+4ilUvOTLFaGQ9Pjx7JPrzpAt0165fAlA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@embroider/compat/-/compat-3.2.1.tgz",
+      "integrity": "sha512-nni6oQTPkSuZZKjXTFTZchO7chFBGKEN0O/xMGn9SxifM7EDl7+y6JlPQFchQcmLGi2DxglsystV0E/jTyc11Q==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.14.5",
         "@babel/core": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.14.5",
         "@babel/preset-env": "^7.14.5",
+        "@babel/runtime": "^7.18.6",
         "@babel/traverse": "^7.14.5",
-        "@embroider/macros": "1.11.1",
+        "@embroider/macros": "1.13.1",
         "@types/babel__code-frame": "^7.0.2",
         "@types/yargs": "^17.0.3",
         "assert-never": "^1.1.0",
-        "babel-import-util": "^1.1.0",
-        "babel-plugin-ember-template-compilation": "^2.0.0",
+        "babel-import-util": "^2.0.0",
+        "babel-plugin-ember-template-compilation": "^2.1.1",
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
         "babylon": "^6.18.0",
         "bind-decorator": "^1.0.11",
@@ -2848,6 +2850,8 @@
         "broccoli-source": "^3.0.1",
         "chalk": "^4.1.1",
         "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "fast-sourcemap-concat": "^1.4.0",
         "fs-extra": "^9.1.0",
         "fs-tree-diff": "^2.0.1",
         "jsdom": "^16.6.0",
@@ -2869,34 +2873,7 @@
         "node": "12.* || 14.* || >= 16"
       },
       "peerDependencies": {
-        "@embroider/core": "^3.0.2"
-      }
-    },
-    "node_modules/@embroider/compat/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==",
-      "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",
-        "lodash": "^4.17.21",
-        "resolve": "^1.20.0",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": "12.* || 14.* || >= 16"
-      },
-      "peerDependencies": {
-        "@glint/template": "^1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@glint/template": {
-          "optional": true
-        }
+        "@embroider/core": "^3.2.1"
       }
     },
     "node_modules/@embroider/compat/node_modules/ansi-styles": {
@@ -2914,6 +2891,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/@embroider/compat/node_modules/babel-import-util": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz",
+      "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.*"
+      }
+    },
     "node_modules/@embroider/compat/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -39052,22 +39038,24 @@
       }
     },
     "@embroider/compat": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@embroider/compat/-/compat-3.0.2.tgz",
-      "integrity": "sha512-X94QrkZ7+m85z4exCvmYojBceclf5hQ/Lj88F2ILk1xg4OQY/1Y3y+4ilUvOTLFaGQ9Pjx7JPrzpAt0165fAlA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@embroider/compat/-/compat-3.2.1.tgz",
+      "integrity": "sha512-nni6oQTPkSuZZKjXTFTZchO7chFBGKEN0O/xMGn9SxifM7EDl7+y6JlPQFchQcmLGi2DxglsystV0E/jTyc11Q==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.5",
         "@babel/core": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.14.5",
         "@babel/preset-env": "^7.14.5",
+        "@babel/runtime": "^7.18.6",
         "@babel/traverse": "^7.14.5",
-        "@embroider/macros": "1.11.1",
+        "@embroider/macros": "1.13.1",
         "@types/babel__code-frame": "^7.0.2",
         "@types/yargs": "^17.0.3",
         "assert-never": "^1.1.0",
-        "babel-import-util": "^1.1.0",
-        "babel-plugin-ember-template-compilation": "^2.0.0",
+        "babel-import-util": "^2.0.0",
+        "babel-plugin-ember-template-compilation": "^2.1.1",
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
         "babylon": "^6.18.0",
         "bind-decorator": "^1.0.11",
@@ -39081,6 +39069,8 @@
         "broccoli-source": "^3.0.1",
         "chalk": "^4.1.1",
         "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "fast-sourcemap-concat": "^1.4.0",
         "fs-extra": "^9.1.0",
         "fs-tree-diff": "^2.0.1",
         "jsdom": "^16.6.0",
@@ -39096,22 +39086,6 @@
         "yargs": "^17.0.1"
       },
       "dependencies": {
-        "@embroider/macros": {
-          "version": "1.11.1",
-          "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.11.1.tgz",
-          "integrity": "sha512-yg4Pl5Sw26lKrrtLwk2UEgYkKkztq+Hatn67QYL5A3I3T4IE/bRA3o6xvIslrJNnhyER7jCc2pwusxt3O4HubA==",
-          "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",
-            "lodash": "^4.17.21",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.2"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -39121,6 +39095,12 @@
             "color-convert": "^2.0.1"
           }
         },
+        "babel-import-util": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-2.0.0.tgz",
+          "integrity": "sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==",
+          "dev": true
+        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
diff --git a/package.json b/package.json
index d5ac438726..169a59b2c1 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.9.3",
-    "@embroider/compat": "~3.0.2",
+    "@embroider/compat": "~3.2.1",
     "@embroider/core": "~3.2.1",
     "@embroider/macros": "^1.13.1",
     "@embroider/router": "^2.1.1",