diff --git a/frontend/app/services/-compile/babel/cjs.ts b/frontend/app/services/-compile/babel/cjs.ts
index a46f71ae5..7d0c9dfd2 100644
--- a/frontend/app/services/-compile/babel/cjs.ts
+++ b/frontend/app/services/-compile/babel/cjs.ts
@@ -1,8 +1,8 @@
 import { getTemplateLocals } from '@glimmer/syntax';
-import { precompileTemplate } from '@ember/template-compilation';
 
 import * as Babel from '@babel/standalone';
 import HTMLBars, { preprocessEmbeddedTemplates } from 'babel-plugin-htmlbars-inline-precompile';
+import { precompile as precompileTemplate } from 'ember-template-compiler';
 
 import { evalSnippet } from './cjs-eval';
 
@@ -44,7 +44,7 @@ async function compileGJS({ code: input, name }: Info) {
         {
           precompile: precompileTemplate,
           // this needs to be true until Ember 3.27+
-          ensureModuleApiPolyfill: true,
+          ensureModuleApiPolyfill: false,
           modules: {
             'ember-template-imports': {
               export: 'hbs',
diff --git a/frontend/ember-cli-build.js b/frontend/ember-cli-build.js
index 8b25c47dd..6665b24e3 100644
--- a/frontend/ember-cli-build.js
+++ b/frontend/ember-cli-build.js
@@ -40,6 +40,9 @@ module.exports = function (defaults) {
 
   let app = new EmberApp(defaults, config);
 
+  // Adds:
+  //  - ember-template-compiler
+  //  - @glimmer/syntax
   app.import('vendor/ember/ember-template-compiler.js');
 
   const { Webpack } = require('@embroider/webpack');
@@ -65,7 +68,10 @@ module.exports = function (defaults) {
     ],
     ...(MAXIMUM_STATIC
       ? {
-          staticAddonTrees: true,
+          // Temporarily disabled until
+          // https://github.com/emberjs/ember.js/issues/19568
+          // is resolved
+          // staticAddonTrees: true,
           staticAddonTestSupportTrees: true,
           staticHelpers: true,
           staticComponents: true,
diff --git a/frontend/package.json b/frontend/package.json
index bac0b976d..158a03322 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,9 +35,8 @@
     "@embroider/webpack": "^0.41.0",
     "@fortawesome/ember-fontawesome": "github:NullVoxPopuli/ember-fontawesome#support-3-20-and-3-24",
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/free-regular-svg-icons": "^5.15.3",
-    "@glimmer/runtime": "^0.79.3",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@nullvoxpopuli/eslint-configs": "1.3.2",
     "@tailwindcss/jit": "^0.1.18",
     "@tailwindcss/typography": "^0.4.1",
@@ -83,7 +82,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-postcss": "^7.0.1",
+    "ember-cli-postcss": "github:jeffjewiss/ember-cli-postcss#remove-library-register",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-cli-typescript": "^4.1.0",
@@ -94,7 +93,7 @@
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "3.26.1",
+    "ember-source": "3.28.0-beta.4",
     "ember-template-lint": "^3.4.2",
     "eslint": "^7.28.0",
     "execa": "^5.1.1",
@@ -129,7 +128,6 @@
     "@babel/standalone": "^7.14.4",
     "@glimmer/compiler": "0.79.3",
     "@glimmer/component": "^1.0.4",
-    "@glimmer/syntax": "^0.79.3",
     "@glimmer/tracking": "^1.0.4",
     "@nullvoxpopuli/horizon-theme": "*",
     "@nullvoxpopuli/limber-codemirror": "*",
diff --git a/frontend/types/global.d.ts b/frontend/types/global.d.ts
index 1f913a146..1bd7ad085 100644
--- a/frontend/types/global.d.ts
+++ b/frontend/types/global.d.ts
@@ -12,6 +12,9 @@ type LazyTrackedArgs = {
   named?: Record<string, unknown>;
 }
 
+// provided by vendor/ember/ember-template-compiler.js (somehow)
+declare module 'ember-template-compiler';
+
 declare module '@sentry/ember';
 declare module 'babel-plugin-htmlbars-inline-precompile';
 declare module '@babel/plugin-proposal-decorators';
diff --git a/frontend/types/overrides.d.ts b/frontend/types/overrides.d.ts
index 411c7af13..72ae93b00 100644
--- a/frontend/types/overrides.d.ts
+++ b/frontend/types/overrides.d.ts
@@ -9,3 +9,8 @@ declare module '@ember/component' {
   export function setComponentTemplate(factory: TemplateFactory, obj: object): object;
 }
 
+
+// provided by vendor/ember/ember-template-compiler.js (somehow)
+declare module '@glimmer/syntax' {
+  export function getTemplateLocals(): unknown;
+}
diff --git a/package.json b/package.json
index e0bcb2f75..d181391a4 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,10 @@
     "packages/*",
     "tests"
   ],
+  "resolutions": {
+    "tracked-maps-and-sets": "github:NullVoxPopuli/tracked-maps-and-sets#resolve-global-ember-issue",
+    "tracked-built-ins": "github:pzuraq/tracked-built-ins#master"
+  },
   "scripts": {
     "predeploy": "yarn build && yarn workspace limber build",
     "build": "npm-run-all --aggregate-output --parallel 'build:*'",
@@ -17,7 +21,7 @@
     "start:prod": "MINIFY=false yarn start --environment=production",
     "_": "_",
     "__": "_ https://github.com/webpack/loader-utils/issues/179",
-    "postinstall": "rm -rf node_modules/@types/loader-utils"
+    "postinstall": "rm -rf node_modules/@types/loader-utils && ( cd node_modules/tracked-maps-and-sets && yarn && yarn build )"
   },
   "volta": {
     "node": "14.17.0",
diff --git a/packages/transpilation/package.json b/packages/transpilation/package.json
index f85e0850c..23cfc8972 100644
--- a/packages/transpilation/package.json
+++ b/packages/transpilation/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/standalone": "^7.14.4",
     "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
-    "ember-source": "^3.26.1",
+    "ember-source": "3.28.0-beta.4",
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 7122626c0..4da558e06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1562,11 +1562,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@fortawesome/ember-fontawesome@^0.2.3":
+"@fortawesome/ember-fontawesome@github:NullVoxPopuli/ember-fontawesome#support-3-20-and-3-24":
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@fortawesome/ember-fontawesome/-/ember-fontawesome-0.2.3.tgz#62d943d0771b8fe291aaed7a8a223c8d7d8b6f02"
-  integrity sha512-wRiP0k1D7J3ecQhrsGpg+j7PbrFOQtDsMuAUYpvbrh+hSmfO0TCbL/BkPRMtgUIvtJiIigomvQKsiGvPJsfSeQ==
+  resolved "https://codeload.github.com/NullVoxPopuli/ember-fontawesome/tar.gz/f097df09371b8ae65f306b3bd0247133aaf02e57"
   dependencies:
+    "@embroider/macros" "^0.41.0"
     "@fortawesome/fontawesome-svg-core" "^1.2.0"
     broccoli-file-creator "^2.1.1"
     broccoli-merge-trees "^4.2.0"
@@ -1577,7 +1577,6 @@
     ember-ast-helpers "0.3.5"
     ember-cli-babel "^7.21.0"
     ember-cli-htmlbars "^5.2.0"
-    ember-get-config "^0.3.0"
     find-yarn-workspace-root "^2.0.0"
     glob "^7.1.2"
     rollup-plugin-node-resolve "^5.2.0"
@@ -1664,30 +1663,11 @@
     ember-cli-version-checker "^3.1.3"
     ember-compatibility-helpers "^1.1.2"
 
-"@glimmer/destroyable@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.3.tgz#a4ee01a5ef7f9e0a5e62668fb992d721c193acd4"
-  integrity sha512-vAvXi/eh6ca0Upqzqg+y/dsiFzHsh4La1J8oCSv33BXhbjoVWp+V++FaEYoGy4E8/gaDdt9fW8xZOvgBSoIBZw==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
-
 "@glimmer/di@^0.1.9":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
   integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
 
-"@glimmer/encoder@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.3.tgz#7f4d957b8c948d04b8594c20ba131701a1bf9453"
-  integrity sha512-BpZqJOPpIYQyDGR/OtgE9jbjNd47DBo5L/CJmQ1PYZ11QUM5DMUHuxpIxWKKT2JpzYJfPE2xdvYrhJrCUC0Zfg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/vm" "0.79.3"
-
 "@glimmer/encoder@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.42.2.tgz#d3ba3dc9f1d4fa582d1d18b63da100fc5c664057"
@@ -1708,13 +1688,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/global-context@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.3.tgz#e50fcfa598a6d9e58a9fba1586efed6d789fe24b"
-  integrity sha512-Aotq1fbYKk8CElF4x1nYJWGufXu7CS/iYUfrpX9v1zIjZMw52tfk1xTlNyRCpM1SCHuUL32QEskGAPDLsIYkVw==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-
 "@glimmer/interfaces@0.65.3":
   version "0.65.3"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.3.tgz#ef3df40b42ab8b6dc36efea81652abddda72f23c"
@@ -1741,60 +1714,11 @@
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.42.2.tgz#9cf8d6f8f5eee6bfcfa36919ca68ae716e1f78db"
   integrity sha512-7LOuQd02cxxNNHChzdHMAU8/qOeQvTro141CU5tXITP7z6aOv2D2gkFdau97lLQiVxezGrh8J7h8GCuF7TEqtg==
 
-"@glimmer/low-level@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
-  integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
-
 "@glimmer/low-level@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.42.2.tgz#52c745414d1d04c4245c369bd132c0e786c816ef"
   integrity sha512-s+Q44SnKdTBTnkgX0deBlVNnNPVas+Pg8xEnwky9VrUqOHKsIZRrPgfVULeC6bIdFXtXOKm5CjTajhb9qnQbXQ==
 
-"@glimmer/manager@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.3.tgz#02dc843bd6cbc1d5b32321029a8b250c33edc1fa"
-  integrity sha512-VhIXX9oxrLABuA34iZrrMxwhbxRJCftPyEXyD2ZNwsr9QugtAg2cYvtIWxlf9RllTACJrSU7Gb+0BPYVG+aaaQ==
-  dependencies:
-    "@glimmer/destroyable" "0.79.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
-
-"@glimmer/opcode-compiler@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.3.tgz#dc27d49d4236060b650e41f16526fd136e7a5d17"
-  integrity sha512-1SDl6YQ/xYAuYD/P70YHkoKri0YZSG8ELx9n1ZKVr1sB0xv6tiIrYOyhhy+omlmcRSQwWd0XEDp/4eeb7UNjlQ==
-  dependencies:
-    "@glimmer/encoder" "0.79.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/vm" "0.79.3"
-    "@glimmer/wire-format" "0.79.3"
-
-"@glimmer/owner@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.3.tgz#0c8aeea009bf2e01653e8419754d7b8ea57607c2"
-  integrity sha512-vEybTpdeiaDHqRX8TaNAIz7fNlE0lii4kPTxl04me8H3YAE3nKluUxgoChWMRcgakGJ8bCzVa7p215Ap/6ULtg==
-  dependencies:
-    "@glimmer/util" "0.79.3"
-
-"@glimmer/program@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.3.tgz#f77b8e81842a7b3cf8a1063fc3167d2cd82d9724"
-  integrity sha512-vIhBlnpt+czkgJhm/OrVcrxbwxgEue6H8UMSoc5vdNiJDHUWOrYdJhr1mh1DGgvM0qqPySKJhgjo3apmA5sW+w==
-  dependencies:
-    "@glimmer/encoder" "0.79.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/manager" "0.79.3"
-    "@glimmer/opcode-compiler" "0.79.3"
-    "@glimmer/util" "0.79.3"
-
 "@glimmer/program@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.42.2.tgz#fe504679ca4df6251dd5fcf3003699bb51fa41fa"
@@ -1804,17 +1728,6 @@
     "@glimmer/interfaces" "^0.42.2"
     "@glimmer/util" "^0.42.2"
 
-"@glimmer/reference@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.3.tgz#4c3eed5e2c810c43145a68cb2fa4f337f0b154b8"
-  integrity sha512-c++SMUVBzpTxd7W9LF2GvCwYIiLPbdrh6kmqOEprH9v/jt4gJkagSBCl84/t6m4NPOYIql19NpK3QqfVSxTDIA==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
-
 "@glimmer/reference@^0.42.1", "@glimmer/reference@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.42.2.tgz#57874e27c825fb7041b5295b5eb153f3f3f92f8f"
@@ -1846,26 +1759,7 @@
     "@glimmer/vm" "^0.42.2"
     "@glimmer/wire-format" "^0.42.2"
 
-"@glimmer/runtime@^0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.3.tgz#1ff2051e22eff68fe27f536059484a7b0a70fdb9"
-  integrity sha512-3GO48ddGTuQQIe/16Y4hLDiweTVdLCIn7q6fpzHf+B/ieoVhxu8YkyKYgGEex3UHz+C+GkJxW1hru4cfp0APmA==
-  dependencies:
-    "@glimmer/destroyable" "0.79.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.3"
-    "@glimmer/program" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
-    "@glimmer/vm" "0.79.3"
-    "@glimmer/wire-format" "0.79.3"
-    "@simple-dom/interface" "^1.4.0"
-
-"@glimmer/syntax@0.79.3", "@glimmer/syntax@^0.79.3":
+"@glimmer/syntax@0.79.3":
   version "0.79.3"
   resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.3.tgz#5beadd53494d0f199b83f016af90fa28c3ecaa8c"
   integrity sha512-IERTn/mqRk0pZnddAnYjGUV4e93rRf5scY0dYQl2EFvBHFaOdFQPe3fhSCozx0hZpagg5LCOsbRgsMwL9IT9fw==
@@ -1954,41 +1848,18 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/global-context" "0.65.3"
 
-"@glimmer/validator@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.3.tgz#1edde5e874629b91a04c5af316b9ba91ecb360ed"
-  integrity sha512-uXUf24RCqj48T2Hgo6ZXfwAGkBgEOQ2W/Bagg83hBv/4TbUWNt03cHq6ga2FPKpqR/T7SvhN9WM4nc5FqIYGCQ==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.3"
-
 "@glimmer/validator@^0.44.0":
   version "0.44.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1"
   integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==
 
-"@glimmer/vm-babel-plugins@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.5.tgz#daffb6507aa6b08ec36f69d652897d339fdd0007"
-  integrity sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==
-  dependencies:
-    babel-plugin-debug-macros "^0.3.4"
-
 "@glimmer/vm-babel-plugins@0.79.3":
   version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.3.tgz#a8e6949f8ecc10786831d188f1001eb80927297f"
+  resolved "https://registry.npmjs.org/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.3.tgz#a8e6949f8ecc10786831d188f1001eb80927297f"
   integrity sha512-346xmhP7J3wqCFKqIlwcaui/A+iHKm0ZWoaKb4lIkuro7/u5j094eEtdbonGq4eTj+UnDPpmzuqLWodXXxxo1Q==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.3.tgz#79b0614116d5b3417e6d0a16c0c91fbf521ccbc4"
-  integrity sha512-JX1Whpm8GGyoZefXj6jJSNBi/qWKYjC5JbHrJ9KALXYCC2JAabVQlOlfRDV4mQOYv7yCzrpM8ZDCycwHTGuJ6A==
-  dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
-
 "@glimmer/vm@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d"
@@ -4649,14 +4520,6 @@ broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
     symlink-or-copy "^1.1.8"
     tree-sync "^1.2.2"
 
-broccoli-file-creator@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz#27f1b25b1b00e7bb7bf3d5d7abed5f4d5388df4d"
-  integrity sha512-l9zthHg6bAtnOfRr/ieZ1srRQEsufMZID7xGYRW3aBDv3u/3Eux+Iawl10tAGYE5pL9YB4n5X4vxkp6iNOoZ9g==
-  dependencies:
-    broccoli-plugin "^1.1.0"
-    mkdirp "^0.5.1"
-
 broccoli-file-creator@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
@@ -4724,7 +4587,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.6:
+broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.6.tgz#2216a802fc2f6d6875a66531cfbc07e4e4c22d6c"
   integrity sha512-pJK+pO+2J6BYPiPNNAe16KiCK8SIVUHzjcDbtYMiAwGDhGrNXO91dm1Z/GOtpjqa3xmfm/IuQwMf01tW+FO2Ow==
@@ -6699,9 +6562,42 @@ ember-cli-babel@^6.0.0-beta.4:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.20.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.20.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.3, ember-cli-babel@^7.7.3:
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.5.tgz#59904d1d73b5c816167238024d18b85c8b51debc"
+  integrity sha512-XLMk59yNJneItn/hkJn+kHjnnszdfXWo1sP95C0kouSfPtIsUC3a/f/FW6c59D8koPANJOIHiHP3zUpTpKsnTA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6:
   version "7.26.6"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
+  resolved "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
   dependencies:
     "@babel/core" "^7.12.0"
@@ -6734,7 +6630,6 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-c
 
 "ember-cli-browserstack@github:NullVoxPopuli/ember-cli-browserstack#patch-1":
   version "1.1.0"
-  uid "72697dbd4369c3f4c20810b6433e49a14cb135a0"
   resolved "https://codeload.github.com/NullVoxPopuli/ember-cli-browserstack/tar.gz/72697dbd4369c3f4c20810b6433e49a14cb135a0"
   dependencies:
     browserstack "^1.6.0"
@@ -6830,17 +6725,15 @@ ember-cli-path-utils@^1.0.0:
   resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
   integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
 
-ember-cli-postcss@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-postcss/-/ember-cli-postcss-7.0.1.tgz#bbd4ba63e013977196643bc6063aca5a645d416e"
-  integrity sha512-mrGGgR1jTASPHLdv14Tl+f+m5BX6OKBnzG9xSpjJFxyPcfgEDZ4n05n5Jgry4Nkt7MI0GsgQv1MLQ0sIeSzdZw==
+"ember-cli-postcss@github:jeffjewiss/ember-cli-postcss#remove-library-register":
+  version "7.0.0"
+  resolved "https://codeload.github.com/jeffjewiss/ember-cli-postcss/tar.gz/d0be987cc34a80ffa78683e8157bed1ce14a4e6a"
   dependencies:
-    broccoli-file-creator "^2.1.1"
     broccoli-merge-trees "^4.0.0"
     broccoli-postcss "^6.0.0"
     broccoli-postcss-single "^5.0.0"
     ember-cli-babel "^7.1.0"
-    merge "^2.1.1"
+    merge "^2.1.0"
 
 ember-cli-preprocess-registry@^3.3.0:
   version "3.3.0"
@@ -7138,14 +7031,6 @@ ember-focus-trap@^0.7.0:
     ember-modifier-manager-polyfill "^1.2.0"
     focus-trap "^6.4.0"
 
-ember-get-config@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.3.0.tgz#a73a1a87b48d9dde4c66a0e52ed5260b8a48cfbd"
-  integrity sha512-0e2pKzwW5lBZ4oJnvu9qHOht4sP1MWz/m3hyz8kpSoMdrlZVf62LDKZ6qfKgy8drcv5YhCMYE6QV7MhnqlrzEQ==
-  dependencies:
-    broccoli-file-creator "^1.1.1"
-    ember-cli-babel "^7.0.0"
-
 ember-load-initializers@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz#8a47a656c1f64f9b10cecdb4e22a9d52ad9c7efa"
@@ -7243,41 +7128,10 @@ ember-source-channel-url@^3.0.0:
   dependencies:
     node-fetch "^2.6.0"
 
-ember-source@3.26.1:
-  version "3.26.1"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.26.1.tgz#8c9e8a314fb0da447b944d64f9d92a80a628d7b5"
-  integrity sha512-5/NATBo5h9m1N52ITVksmjtGlYhGHLl4lDErAWv5/DC9zYe9ZR93NtymR6PEqrRilXc2x0KWd3NlOsWUoJRUOw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-object-assign" "^7.8.3"
-    "@ember/edition-utils" "^1.2.0"
-    "@glimmer/vm-babel-plugins" "0.77.5"
-    babel-plugin-debug-macros "^0.3.3"
-    babel-plugin-filter-imports "^4.0.0"
-    broccoli-concat "^4.2.4"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^4.2.0"
-    chalk "^4.0.0"
-    ember-cli-babel "^7.23.0"
-    ember-cli-get-component-path-option "^1.0.0"
-    ember-cli-is-package-missing "^1.0.0"
-    ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-path-utils "^1.0.0"
-    ember-cli-string-utils "^1.1.0"
-    ember-cli-version-checker "^5.1.1"
-    ember-router-generator "^2.0.0"
-    inflection "^1.12.0"
-    jquery "^3.5.1"
-    resolve "^1.17.0"
-    semver "^7.3.4"
-    silent-error "^1.1.1"
-
-ember-source@^3.26.1:
-  version "3.27.3"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.27.3.tgz#96489643809b95d1804c21f31bbf83cb3b2a30a1"
-  integrity sha512-ouAk/hlrmaFTfwfc66DqXdEWe3Y4kvWkjgPxXctzUdluuaXzhPBwMKMgVLW/+F70UMIrcWhTe+bQiY4ZgKZMnQ==
+ember-source@3.28.0-beta.4:
+  version "3.28.0-beta.4"
+  resolved "https://registry.npmjs.org/ember-source/-/ember-source-3.28.0-beta.4.tgz#74b4454b23bb07aadd9f0aa982eafb36c542729b"
+  integrity sha512-uCKDIy7nst/dg1jHe7XWLOfXclXFdEdn3mi2E/gmaE4cc0Xwd1821pj5tOt5QPvy98x3LsZ4dSB4zZBc4scFgw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
@@ -11032,9 +10886,9 @@ merge2@^1.2.3, merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-merge@^2.1.1:
+merge@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  resolved "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
   integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
 
 methods@~1.1.2:
@@ -14430,22 +14284,20 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-tracked-built-ins@^1.1.1:
+tracked-built-ins@^1.1.1, "tracked-built-ins@github:pzuraq/tracked-built-ins#master":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tracked-built-ins/-/tracked-built-ins-1.1.1.tgz#d472142b268f2e03de719e33c0407b4c8b8ce5fa"
-  integrity sha512-ZPGvTu+7d2tkUe4fJPgKkW8Bh512ZBih1S+DhuCSuT4VGj5qLwKbabSMqRiPSYOwWeM5aER0HMRGUvpWARPaHQ==
+  resolved "https://codeload.github.com/pzuraq/tracked-built-ins/tar.gz/33a24901139e0e666ad6776345faad35d76de2ee"
   dependencies:
     ember-cli-babel "^7.26.3"
     ember-cli-typescript "^4.1.0"
     tracked-maps-and-sets "^2.0.0"
 
-tracked-maps-and-sets@^2.0.0, tracked-maps-and-sets@^2.2.1:
+tracked-maps-and-sets@^2.0.0, tracked-maps-and-sets@^2.2.1, "tracked-maps-and-sets@github:NullVoxPopuli/tracked-maps-and-sets#resolve-global-ember-issue":
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tracked-maps-and-sets/-/tracked-maps-and-sets-2.2.1.tgz#323dd40540c561e8b0ffdec8bf129c68ec5025f9"
-  integrity sha512-XYrXh6L/GpGmVmG3KcN/qoDyi4FxHh8eZY/BA/RuoxynskV+GZSfwrX3R+5DR2CIkzkCx4zi4kkDRg1AMDfDhg==
+  resolved "https://codeload.github.com/NullVoxPopuli/tracked-maps-and-sets/tar.gz/b9925ff4aacbd4e5a9c993bac5b13f7007a8d53a"
   dependencies:
     "@glimmer/tracking" "^1.0.0"
-    ember-cli-babel "^7.17.2"
+    ember-cli-babel "^7.26.5"
 
 tree-sync@^1.2.2:
   version "1.4.0"