From c60e6ec85cca8f83def0a0b710c877cb62b9130b Mon Sep 17 00:00:00 2001
From: Alex Kanunnikov <lifeart92@gmail.com>
Date: Sat, 9 Dec 2023 16:53:31 +0300
Subject: [PATCH 1/3] attempt to get ember 3.25 working

---
 package.json |  28 ++--
 yarn.lock    | 466 ++++++++++++++++++++++-----------------------------
 2 files changed, 211 insertions(+), 283 deletions(-)

diff --git a/package.json b/package.json
index 82b52a4..9fc0db5 100644
--- a/package.json
+++ b/package.json
@@ -60,24 +60,16 @@
     "@ember-data/json-api": "5.1.1",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.9.3",
-    "@glimmer/compiler": "0.84.3",
-    "@glimmer/component": "^1.1.2",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/compiler": "0.65.4",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.84.3",
-    "@glimmer/interfaces": "0.84.3",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/node": "0.84.3",
-    "@glimmer/opcode-compiler": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/program": "0.84.3",
-    "@glimmer/reference": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/syntax": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
-    "@glimmer/vm-babel-plugins": "0.84.3",
-    "@glimmer/tracking": "^1.1.2",
+    "@glimmer/global-context": "0.65.4",
+    "@glimmer/interfaces": "0.65.4",
+    "@glimmer/node": "0.65.4",
+    "@glimmer/opcode-compiler": "0.65.4",
+    "@glimmer/program": "0.65.4",
+    "@glimmer/reference": "0.65.4",
+    "@glimmer/runtime": "0.65.4",
+    "@glimmer/validator": "0.65.4",
     "@glint/environment-ember-template-imports": "^0.9.7",
     "@types/ember": "^4.0.3",
     "@types/jest": "^29.5.0",
@@ -104,7 +96,7 @@
     "ember-resources": "^6.3.1",
     "ember-responsive": "^5.0.0",
     "ember-simple-auth": "6.0.0-rc.1",
-    "ember-source": "5.4.0",
+    "ember-source": "3.24.6",
     "ember-truth-helpers": "^3.1.1",
     "jest": "^29.5.0",
     "nyc": "^15.1.0",
diff --git a/yarn.lock b/yarn.lock
index ff92ab2..cf0d2dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,7 +22,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.6.tgz#15606a20341de59ba02cd2fcc5086fcbe73bf544"
   integrity sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==
 
-"@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.22.5", "@babel/core@^7.3.4", "@babel/core@^7.7.5":
+"@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.16.7", "@babel/core@^7.22.5", "@babel/core@^7.3.4", "@babel/core@^7.7.5":
   version "7.22.8"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.8.tgz#386470abe884302db9c82e8e5e87be9e46c86785"
   integrity sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==
@@ -148,12 +148,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
-  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
 "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.22.5":
   version "7.22.5"
@@ -221,15 +221,15 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+"@babel/helper-string-parser@^7.22.5", "@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
 "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5":
   version "7.22.5"
@@ -453,7 +453,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.16.7", "@babel/plugin-syntax-decorators@^7.19.0":
+"@babel/plugin-syntax-decorators@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
   integrity sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==
@@ -588,10 +588,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
-  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+"@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.22.5", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -728,6 +728,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-object-assign@^7.8.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.23.3.tgz#64177e8cf943460c7f0e1c410277546804f59625"
+  integrity sha512-TPJ6O7gVC2rlQH2hvQGRH273G1xdoloCj9Pc07Q7JbIZYDi+Sv5gaE2fu+r5E7qK4zyt6vj0FbZaZTRU5C3OMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
@@ -813,7 +820,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.16.8", "@babel/plugin-transform-typescript@^7.18.6":
+"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.18.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz#673f49499cd810ae32a1ea5f3f8fab370987e055"
   integrity sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==
@@ -1003,13 +1010,13 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
-  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602"
+  integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1245,36 +1252,7 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/shared-internals@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.2.2.tgz#8f19c9a8621b4c3f061a4af5060a82ec024655eb"
-  integrity sha512-fOED89UjsNT8e/maA1P3co2D7q/UOmH3DMxqAlJyueyo57LKuVDXFDG6JUYiEyHb2H5eCrzIdGoHI5cz9rH3Ow==
-  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"
-
-"@embroider/shared-internals@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.4.0.tgz#0e9fdb0b2df9bad45fab8c54cbb70d8a2cbf01fc"
-  integrity sha512-pFE05ebenWMC9XAPRjadYCXXb6VmqjkhYN5uqkhPo+VUmMHnx7sZYYxqGjxfVuhC/ghS/BNlOffOCXDOoE7k7g==
-  dependencies:
-    babel-import-util "^2.0.0"
-    debug "^4.3.2"
-    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"
-
-"@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.2.3", "@embroider/shared-internals@^2.5.1":
+"@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.5.1":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
   integrity sha512-b+TWDBisH1p6HeTbJIO8pgu1WzfTP0ZSAlZBqjXwOyrS0ZxP1qNYRrEX+IxyzIibEFjXBxeLakiejz3DJvZX5A==
@@ -1488,15 +1466,15 @@
   resolved "https://registry.yarnpkg.com/@gavant/glint-template-types/-/glint-template-types-0.3.4.tgz#8c68f9789b37dbc2dbaf534a85bf58adcf6a8df4"
   integrity sha512-PlHcqp9QbFa8/fszVHeSssS6W4VgYZmynjdLGoNy5pjw/COLSOVhGQJu4YuEcY7bGfJrPactzk3JMAuEcVd90g==
 
-"@glimmer/compiler@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.84.3.tgz#4bcb414c726977f7d290ff56345ea13ac47bf5dd"
-  integrity sha512-cj9sGlnvExP9httxY6ZMivJRGulyaZ31DddCYB5h6LxupR4Nk2d1nAJCWPLsvuQJ8qR+eYw0y9aiY/VeT0krpQ==
+"@glimmer/compiler@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.65.4.tgz#059f1ca39f73841f758df1e1d27c649cc3f6c741"
+  integrity sha512-pPjl0FlNiKoocoPqkahsRClS/WDmme/1u27bp3BpAJqbg7f1lPEk0wbppt88BRXYD/kg4+uiNp6UZBNLBuBd8g==
   dependencies:
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/syntax" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/wire-format" "0.84.3"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/syntax" "0.65.4"
+    "@glimmer/util" "0.65.4"
+    "@glimmer/wire-format" "0.65.4"
     "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/component@^1.0.4", "@glimmer/component@^1.1.0", "@glimmer/component@^1.1.2":
@@ -1519,35 +1497,31 @@
     ember-cli-version-checker "^3.1.3"
     ember-compatibility-helpers "^1.1.2"
 
-"@glimmer/destroyable@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.84.3.tgz#a837ef59bfd64a7b991c76747586205a4a363e41"
-  integrity sha512-4tUw5UR4ntuySPvbcWyCMRjqxMJMV1GewjU3zGq22XvuBVFfq2K9WmuYV9H9FHg8X0MgDwcus+LjxrVSel39Sw==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.84.3"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/util" "0.84.3"
-
 "@glimmer/di@^0.1.9":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
   integrity sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==
 
-"@glimmer/encoder@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.84.3.tgz#3c7291243e6cd595bf22fc2771286d570dc24d47"
-  integrity sha512-T99YQDhNC/1rOFgiz8k4uzgzQsQ+r1my+WVXRv26o0r+/yOnKYndrb6WH/E9d+XtBIZbm1yCSm2BMFYelR0Nrg==
+"@glimmer/encoder@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.65.4.tgz#85bcc7213f13bb4b6c26db86b5b5da81c9cbfc28"
+  integrity sha512-Y/gheKLRtLlaouGG40Tu0pU+jgc8fo87h4EhblTRZvmJ/+AsNgqzCDYlxpb1bAZE6/K4rwb7GdRwMQ0b4vI3Ug==
   dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/vm" "0.84.3"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/vm" "0.65.4"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==
 
+"@glimmer/global-context@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.4.tgz#1da1d59dd4260ce912c40e474cd39c2e82de51b8"
+  integrity sha512-RSYCPG/uVR5XCDcPREBclncU7R0zkjACbADP+n3FWAH1TfWbXRMDIkvO/ZlwHkjHoCZf6tIM6p5S/MoFzfJEJA==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+
 "@glimmer/global-context@0.83.1":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
@@ -1555,12 +1529,12 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/global-context@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.84.3.tgz#f8bf2cda9562716f2ddf3f96837e7559600635c4"
-  integrity sha512-8Oy9Wg5IZxMEeAnVmzD2NkObf89BeHoFSzJgJROE/deutd3rxg83mvlOez4zBBGYwnTb+VGU2LYRpet92egJjA==
+"@glimmer/interfaces@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.4.tgz#d298cc2b12b8ebcf269f39246ca7ab92816f6680"
+  integrity sha512-R0kby79tGNKZOojVJa/7y0JH9Eq4SV+L1s6GcZy30QUZ1g1AAGS5XwCIXc9Sc09coGcv//q+6NLeSw7nlx1y4A==
   dependencies:
-    "@glimmer/env" "^0.1.7"
+    "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/interfaces@0.83.1":
   version "0.83.1"
@@ -1576,77 +1550,54 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@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/manager@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.84.3.tgz#5be61728713e6c893836540353989462492ca9fe"
-  integrity sha512-FtcwvrQ3HWlGRGChwlXiisMeKf9+XcCkMwVrrO0cxQavT01tIHx40OFtPOhXKGbgXGtRKcJI8XR41aK9t2kvyg==
-  dependencies:
-    "@glimmer/destroyable" "0.84.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.84.3"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/reference" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/validator" "0.84.3"
+"@glimmer/low-level@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.65.4.tgz#7e48985ea2cf9dcfb707ef02051bcc23da4b6bd1"
+  integrity sha512-N3P39WHGrCpI2o4TcFJx8XYuUiOwK2tRv4fvCH3kcnFegTpWtXnsIwYZ246rGvKgl4m0OKl73rkQ8OLQpQSMVg==
 
-"@glimmer/node@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.84.3.tgz#01679eaa33bcb8b3fc55f19cfb7ae078fb79503b"
-  integrity sha512-QXlZjr7X6DDTJ3wiYQIHv2Pq/5sdGeTTW15+U+IosjZuQgvwCPJaeXC2CU8yqgA33yHgMgJpkdvLnPUCPrrhwg==
+"@glimmer/node@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.65.4.tgz#1aac91fa91b9287858cb6b4c5978a0873125ba6f"
+  integrity sha512-+y07vtaOFYhRYEYkeOpUQ80T9Q8Zaz9GhovU1YxVhnVLhNaKrpOSyp9kRgryeoLdEKTpTC33O9shdB0Xw/EsMQ==
   dependencies:
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/runtime" "0.84.3"
-    "@glimmer/util" "0.84.3"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/runtime" "0.65.4"
+    "@glimmer/util" "0.65.4"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.84.3.tgz#aa95000034d10786cb8fdbd199d66fb5498e90f3"
-  integrity sha512-flUuikKLFL9cekJUA10gJxMRCDjUPb61R3UCl1u69TGN0Nm7FTsMhOsVDtJLeeiAROtPx+NvasPw/6UB1rrdyg==
-  dependencies:
-    "@glimmer/encoder" "0.84.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/reference" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/vm" "0.84.3"
-    "@glimmer/wire-format" "0.84.3"
-
-"@glimmer/owner@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.84.3.tgz#e64083b692452031bdf30cba4124d1fc64e6e5e2"
-  integrity sha512-ZwA0rU4V8m0z4ncXtWD2QEU6eh61wkKKQUThahPYhfB+JYceVM6Grx7uWeiAxc2v3ncpvbYqIGdnICXDMloxAA==
-  dependencies:
-    "@glimmer/util" "0.84.3"
-
-"@glimmer/program@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.84.3.tgz#a93d5e2ecd1cb7b9e4582cc4d41d0f92b16f9cf5"
-  integrity sha512-D8z1lP8NEMyzT8gByFsZpmbRThZvGLS0Tl5AngaDbI2FqlcpEV0ujvLTzzgecd9QQ1k3Cd60dTgy/2N2CI82SA==
-  dependencies:
-    "@glimmer/encoder" "0.84.3"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/manager" "0.84.3"
-    "@glimmer/opcode-compiler" "0.84.3"
-    "@glimmer/util" "0.84.3"
-
-"@glimmer/reference@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.84.3.tgz#6420ad9c102633ac83939fd1b2457269d21fb632"
-  integrity sha512-lV+p/aWPVC8vUjmlvYVU7WQJsLh319SdXuAWoX/SE3pq340BJlAJiEcAc6q52y9JNhT57gMwtjMX96W5Xcx/qw==
+"@glimmer/opcode-compiler@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.65.4.tgz#85925441041c701ce31a3901714c90d644073039"
+  integrity sha512-7HFAHu4XNMtKghPN0kMPwZ7GH3pNhybX+2abZ61+UjylsMW9f6NZFKD9415Oo5/tx25K9IEDghNoU/Y8Mj5+Xg==
+  dependencies:
+    "@glimmer/encoder" "0.65.4"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/program" "0.65.4"
+    "@glimmer/reference" "0.65.4"
+    "@glimmer/util" "0.65.4"
+    "@glimmer/vm" "0.65.4"
+    "@glimmer/wire-format" "0.65.4"
+
+"@glimmer/program@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.65.4.tgz#37a6a4e05966e24c8ecd9f158edcbd10219cbeda"
+  integrity sha512-PvRaKMX1pU3Xp4gSy0Hdlj22rt9X3SCm8VdzuRGw4Z6rtO1oIApW4iX0dbZVTAm6oHFAjf59Q73SGBnr4HqD0g==
+  dependencies:
+    "@glimmer/encoder" "0.65.4"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/util" "0.65.4"
+
+"@glimmer/reference@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.4.tgz#bbc8becd6a1bf01fc189b6489e27446437194711"
+  integrity sha512-yuRVE4qyqrlCndDMrHKDWUbDmGDCjPzsFtlTmxxnhDMJAdQsnr2cRLITHvQRDm1tXfigVvyKnomeuYhRRbBqYQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.84.3"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/validator" "0.84.3"
+    "@glimmer/global-context" "0.65.4"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/util" "0.65.4"
+    "@glimmer/validator" "0.65.4"
 
 "@glimmer/reference@^0.83.1":
   version "0.83.1"
@@ -1659,34 +1610,32 @@
     "@glimmer/util" "0.83.1"
     "@glimmer/validator" "0.83.1"
 
-"@glimmer/runtime@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.84.3.tgz#d84c02b21ac127fe3da85c7722371406beb6763a"
-  integrity sha512-LzlJbPDCUH/wjsgJ5kRImvOkqAImSyVRW37t34n/1Qd3v7ZoI8xVQg92lS+2kHZe030sT49ZwKkEIeVZiBreBw==
+"@glimmer/runtime@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.65.4.tgz#07840ad2052977e636bb5483b1bf63a403ae94dd"
+  integrity sha512-B4juUHr8rVs1hHHJOH2dNtir2UCjBD8rYM6NLIGSIUfi2qcyAFs668eSZNazoF27xj5giXG8zPs1OkSAlmfygA==
   dependencies:
-    "@glimmer/destroyable" "0.84.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.84.3"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.84.3"
-    "@glimmer/program" "0.84.3"
-    "@glimmer/reference" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/validator" "0.84.3"
-    "@glimmer/vm" "0.84.3"
-    "@glimmer/wire-format" "0.84.3"
+    "@glimmer/global-context" "0.65.4"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/low-level" "0.65.4"
+    "@glimmer/program" "0.65.4"
+    "@glimmer/reference" "0.65.4"
+    "@glimmer/util" "0.65.4"
+    "@glimmer/validator" "0.65.4"
+    "@glimmer/vm" "0.65.4"
+    "@glimmer/wire-format" "0.65.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.84.3", "@glimmer/syntax@^0.84.2", "@glimmer/syntax@^0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.3.tgz#4045a1708cef7fd810cff42fe6deeba40c7286d0"
-  integrity sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==
+"@glimmer/syntax@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.4.tgz#49164de5dc9e8b67084ec009bdd865e379d8a971"
+  integrity sha512-y+/C3e8w96efk3a/Z5If9o4ztKJwrr8RtDpbhV2J8X+DUsn5ic2N3IIdlThbt/Zn6tkP1K3dY6uaFUx3pGTvVQ==
   dependencies:
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@handlebars/parser" "~2.0.0"
-    simple-html-tokenizer "^0.5.11"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/util" "0.65.4"
+    "@handlebars/parser" "^1.1.0"
+    simple-html-tokenizer "^0.5.10"
 
 "@glimmer/syntax@^0.83.1":
   version "0.83.1"
@@ -1698,6 +1647,16 @@
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
+"@glimmer/syntax@^0.84.2", "@glimmer/syntax@^0.84.3":
+  version "0.84.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.3.tgz#4045a1708cef7fd810cff42fe6deeba40c7286d0"
+  integrity sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==
+  dependencies:
+    "@glimmer/interfaces" "0.84.3"
+    "@glimmer/util" "0.84.3"
+    "@handlebars/parser" "~2.0.0"
+    simple-html-tokenizer "^0.5.11"
+
 "@glimmer/tracking@^1.0.4", "@glimmer/tracking@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb"
@@ -1706,6 +1665,15 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/validator" "^0.44.0"
 
+"@glimmer/util@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.4.tgz#e464145078f3f40da9013ff2590a6016515455d2"
+  integrity sha512-aofe+rdBhkREKP2GZta6jy1UcbRRMfWx7M18zxGxspPoeD08NscD04Kx+WiOKXmC1TcrfITr8jvqMfrKrMzYWQ==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.65.4"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/util@0.83.1":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
@@ -1729,6 +1697,14 @@
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
   integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
 
+"@glimmer/validator@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.4.tgz#12c27a9a63706c60e6499fd687940e9d1affb32c"
+  integrity sha512-0YUjAyo45DF5JkQxdv5kHn96nMNhvZiEwsAD4Jme0kk5Q9MQcPOUtN76pQAS4f+C6GdF9DeUr2yGXZLFMmb+LA==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.65.4"
+
 "@glimmer/validator@0.83.1", "@glimmer/validator@^0.83.0":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
@@ -1737,41 +1713,26 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/global-context" "0.83.1"
 
-"@glimmer/validator@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.84.3.tgz#cd83b7f9ab78953f23cc11a32d83d7f729c54df2"
-  integrity sha512-RTBV4TokUB0vI31UC7ikpV7lOYpWUlyqaKV//pRC4pexYMlmqnVhkFrdiimB/R1XyNdUOQUmnIAcdic39NkbhQ==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.84.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.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.84.3.tgz#82fc094a75ff20086a45b088825e4d97d49b779a"
-  integrity sha512-fucWuuN7Q9QFB0ODd+PCltcTkmH4fLqYyXGArrfLt/TYN8gLv0yo00mPwFOSY7MWti/MUx88xd20/PycvYtg8w==
+"@glimmer/vm@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.65.4.tgz#17a8a1388ac3427bdc68a50e43123e142691e92d"
+  integrity sha512-o/qXqxjnWHwnfLYYYAqOe1CkTxsZi9w1MyDOGPdZxoerGu1UdIQdnM7C/8aT887DeBq3NQQ5+XcgzAwFIBgXjQ==
   dependencies:
-    babel-plugin-debug-macros "^0.3.4"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/util" "0.65.4"
 
-"@glimmer/vm@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.84.3.tgz#45724ba7b4f90383de78a59071222bdc391ada98"
-  integrity sha512-3mBWvQLEbB8We2EwdmuALMT3zQEcE13ItfLJ0wxlSO2uj1uegeHat++mli8RMxeYNqex27DC+VuhHeWVve6Ngg==
+"@glimmer/wire-format@0.65.4":
+  version "0.65.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.65.4.tgz#1c0139ff6564fbb75bbb94327cb1d6f89b90aff5"
+  integrity sha512-iRbHauya+RgX5AHrKnJ4h09UER1MvVHtJQxzvzVSOiS6zoEFcfZEix2+ZrFCnQd0IquBjDFMZ0bMsLZk6D4Q+A==
   dependencies:
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/util" "0.84.3"
-
-"@glimmer/wire-format@0.84.3":
-  version "0.84.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.84.3.tgz#d31ac85e5f51e67636efe9c5fbd8ae3d5097d8b5"
-  integrity sha512-aZVfQhqv4k7tTo2vwjy+b4mAxKt7cHH75JR3zAeCilimApa+yYTYUyY73NDNSUVbelgAlQ5s6vTiMSQ55WwVow==
-  dependencies:
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/util" "0.84.3"
+    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/util" "0.65.4"
 
 "@glint/config@^0.9.7":
   version "0.9.7"
@@ -1825,6 +1786,11 @@
     "@glimmer/syntax" "^0.84.2"
     "@glint/config" "^0.9.7"
 
+"@handlebars/parser@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
+  integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
+
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
@@ -3419,7 +3385,7 @@ babel-plugin-debug-macros@^0.2.0:
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-debug-macros@^0.3.4:
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
   integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
@@ -3800,7 +3766,7 @@ broccoli-caching-writer@^3.0.3:
     rsvp "^3.0.17"
     walk-sync "^0.3.0"
 
-broccoli-concat@^4.2.5:
+broccoli-concat@^4.2.4:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
   integrity sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==
@@ -5134,7 +5100,7 @@ ember-auto-import@^1.5.3:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.0, ember-auto-import@^2.4.2, ember-auto-import@^2.6.3:
+ember-auto-import@^2.2.3, ember-auto-import@^2.4.0, ember-auto-import@^2.4.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
   integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
@@ -5401,14 +5367,6 @@ ember-cli-test-loader@^3.1.0:
   dependencies:
     ember-cli-babel "^7.23.0"
 
-ember-cli-typescript-blueprint-polyfill@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-typescript-blueprint-polyfill/-/ember-cli-typescript-blueprint-polyfill-0.1.0.tgz#5917646a996b452a3a6b3f306ab2a27e93ea2cc2"
-  integrity sha512-g0weUTOnHmPGqVZzkQTl3Nbk9fzEdFkEXydCs5mT1qBjXh8eQ6VlmjjGD5/998UXKuA0pLSCVVMbSp/linLzGA==
-  dependencies:
-    chalk "^4.0.0"
-    remove-types "^1.0.0"
-
 ember-cli-typescript@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
@@ -5862,56 +5820,34 @@ ember-simple-auth@6.0.0-rc.1:
     ember-cookies "^1.0.0"
     silent-error "^1.0.0"
 
-ember-source@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-5.4.0.tgz#c18df972074aad8b891c289f4657af63844a242c"
-  integrity sha512-y2fPd7DJ8D9IBjHSf6CPwU8TqNpqytpMgFyzf+9tPvu/u2Wdd45jEd2W1weKE3URQwPTcA0vK8Q1w6uzLOx/EA==
+ember-source@3.24.6:
+  version "3.24.6"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.24.6.tgz#cf185b93fb16ad8475e98ebc47e6fb50b7de2556"
+  integrity sha512-F/CNQQLeF0QFKz7ahJ0JQQBbbvL8sx5XhsNJ9GnfjLA9ozGE1/nFfgkIOrcFszIVjMZKmEvq6RdsbbhOptfeNg==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@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/compiler" "0.84.3"
-    "@glimmer/component" "^1.1.2"
-    "@glimmer/destroyable" "0.84.3"
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.84.3"
-    "@glimmer/interfaces" "0.84.3"
-    "@glimmer/manager" "0.84.3"
-    "@glimmer/node" "0.84.3"
-    "@glimmer/opcode-compiler" "0.84.3"
-    "@glimmer/owner" "0.84.3"
-    "@glimmer/program" "0.84.3"
-    "@glimmer/reference" "0.84.3"
-    "@glimmer/runtime" "0.84.3"
-    "@glimmer/syntax" "0.84.3"
-    "@glimmer/util" "0.84.3"
-    "@glimmer/validator" "0.84.3"
-    "@glimmer/vm-babel-plugins" "0.84.3"
-    "@simple-dom/interface" "^1.4.0"
-    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-debug-macros "^0.3.3"
     babel-plugin-filter-imports "^4.0.0"
-    backburner.js "^2.7.0"
-    broccoli-concat "^4.2.5"
+    broccoli-concat "^4.2.4"
     broccoli-debug "^0.6.4"
-    broccoli-file-creator "^2.1.1"
-    broccoli-funnel "^3.0.8"
+    broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^4.2.0"
     chalk "^4.0.0"
-    ember-auto-import "^2.6.3"
-    ember-cli-babel "^7.26.11"
+    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-typescript-blueprint-polyfill "^0.1.0"
-    ember-cli-version-checker "^5.1.2"
+    ember-cli-version-checker "^5.1.1"
     ember-router-generator "^2.0.0"
-    inflection "^2.0.1"
-    resolve "^1.22.2"
-    route-recognizer "^0.3.4"
-    router_js "^8.0.3"
-    semver "^7.5.2"
+    inflection "^1.12.0"
+    jquery "^3.5.0"
+    resolve "^1.17.0"
+    semver "^6.1.1"
     silent-error "^1.1.1"
 
 ember-style-modifier@^0.8.0:
@@ -7528,7 +7464,12 @@ infer-owner@^1.0.3:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-inflection@^2.0.1, inflection@~2.0.1:
+inflection@^1.12.0:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32"
+  integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==
+
+inflection@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-2.0.1.tgz#bdf3a4c05d4275f41234910cbbe9a102ac72c99b"
   integrity sha512-wzkZHqpb4eGrOKBl34xy3umnYHx8Si5R1U4fwmdxLo5gdH6mEK8gclckTj/qWqy4Je0bsDYe/qazZYuO7xe3XQ==
@@ -7711,7 +7652,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.13.0, is-core-module@^2.9.0:
+is-core-module@^2.13.0:
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
   integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
@@ -8481,6 +8422,11 @@ jest@^29.5.0:
     import-local "^3.0.2"
     jest-cli "^29.5.0"
 
+jquery@^3.5.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
+
 js-sdsl@^4.1.4:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
@@ -10033,7 +9979,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1, prettier@^2.8.3:
+prettier@^2.8.3:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
   integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
@@ -10398,16 +10344,6 @@ remove-trailing-separator@^1.0.1:
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
-remove-types@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/remove-types/-/remove-types-1.0.0.tgz#491119e8fce23f2f961fe2254e5a119a017d9a3d"
-  integrity sha512-G7Hk1Q+UJ5DvlNAoJZObxANkBZGiGdp589rVcTW/tYqJWJ5rwfraSnKSQaETN8Epaytw8J40nS/zC7bcHGv36w==
-  dependencies:
-    "@babel/core" "^7.16.10"
-    "@babel/plugin-syntax-decorators" "^7.16.7"
-    "@babel/plugin-transform-typescript" "^7.16.8"
-    prettier "^2.5.1"
-
 repeat-element@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
@@ -10516,7 +10452,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
   integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -10730,7 +10666,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -10838,7 +10774,7 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1:
   dependencies:
     debug "^2.2.0"
 
-simple-html-tokenizer@^0.5.11:
+simple-html-tokenizer@^0.5.10, simple-html-tokenizer@^0.5.11:
   version "0.5.11"
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
   integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==

From c95ad4d0eb64f2339b41489192b4231cb4ce8aef Mon Sep 17 00:00:00 2001
From: Alex Kanunnikov <lifeart92@gmail.com>
Date: Sat, 9 Dec 2023 16:57:10 +0300
Subject: [PATCH 2/3] remove components and named blocks

---
 src/components/HelloWorld/index.ts | 54 +++++++++++++++---------------
 src/config/registry.ts             | 10 +++---
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/components/HelloWorld/index.ts b/src/components/HelloWorld/index.ts
index a621d93..ad7bc9d 100644
--- a/src/components/HelloWorld/index.ts
+++ b/src/components/HelloWorld/index.ts
@@ -27,8 +27,8 @@ export default class HelloWorld extends Component {
     `
 
     <FeaturePanel>
-      <:title><code>t</code> helper test:</:title>
-      <:description>
+      <title><code>t</code> helper test:</title>
+      <description>
         <div class="mt-2" data-test-welcome-msg>
           {{t 'hello.world'}}
         </div>
@@ -37,62 +37,62 @@ export default class HelloWorld extends Component {
         <Button data-test-lang="fr-fr" {{on "click" (fn this.setLanguage "fr-fr")}}>fr-fr</Button>
         <Button data-test-lang="ru-ru" {{on "click" (fn this.setLanguage "ru-ru")}}>ru-ru</Button>
         </div>
-      </:description>
+      </description>
     </FeaturePanel>
    
     <FeaturePanel>
-      <:title>Reactivity test:</:title>
-      <:description>
+      <title>Reactivity test:</title>
+      <description>
         <pre class="font-mono">{{format-date this.dateService._date}} {{this.dateService.date}}</pre>
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title><code>eq</code>, <code>and</code> helpers test:</:title>
-      <:description>
+      <title><code>eq</code>, <code>and</code> helpers test:</title>
+      <description>
         {{if (eq "a" "a") "equal" "not equal"}}
         {{if (and (eq "a" "a") (eq "b" "b")) "equal" "not equal"}}
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>Template only component test:</:title>
-      <:description>
+      <title>Template only component test:</title>
+      <description>
         <TemplateOnlyComponent />
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>Local imported component:</:title>
-      <:description>
+      <title>Local imported component:</title>
+      <description>
         <Local />
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>Summary calculation helper test:</:title>
-      <:description>
+      <title>Summary calculation helper test:</title>
+      <description>
         {{calculateSummary 3 2}}
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>Ember Power Select test:</:title>
-      <:description>
+      <title>Ember Power Select test:</title>
+      <description>
         <Select />
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>.gts component test:</:title>
-      <:description>
+      <title>.gts component test:</title>
+      <description>
         <Sample />
-      </:description>
+      </description>
     </FeaturePanel>
 
     <FeaturePanel>
-      <:title>ember-resources</:title>
-      <:description>
+      <title>ember-resources</title>
+      <description>
         <h4 class="text-md mt-2 font-medium leading-5">Cell</h4>
         <Cell />
 
@@ -104,7 +104,7 @@ export default class HelloWorld extends Component {
 
         <h4 class="text-md mt-2 font-medium leading-5">RemoteData</h4>
         <RemoteData />
-      </:description>
+      </description>
     </FeaturePanel>
 
     `,
diff --git a/src/config/registry.ts b/src/config/registry.ts
index a399d52..cfa733f 100644
--- a/src/config/registry.ts
+++ b/src/config/registry.ts
@@ -61,12 +61,12 @@ const InitialRegistry = {
   'template:about': AboutTemplate,
   'template:login': LoginTemplate,
 
-  'component:hello-world': HelloWorld,
-  'component:button': Button,
-  'component:header': Header,
-  'component:footer': Footer,
+  // 'component:hello-world': HelloWorld,
+  // 'component:button': Button,
+  // 'component:header': Header,
+  // 'component:footer': Footer,
 
-  'component:hot': DEBUG ? Hot : null,
+  // 'component:hot': DEBUG ? Hot : null,
 
   'helper:memory-usage': MemoryUsage as unknown as () => string, // glint fix
   'helper:is-dev': IsDev,

From 6f0eb104eb98d6d81b02fbb6ecdf4f81c9a2393d Mon Sep 17 00:00:00 2001
From: Alex Kanunnikov <lifeart92@gmail.com>
Date: Sat, 9 Dec 2023 17:31:03 +0300
Subject: [PATCH 3/3] woo

---
 compat/ember-array/index.ts                   |  0
 compat/ember-owner/index.ts                   |  6 ++
 compat/ember-routing/route.ts                 |  0
 compat/ember-routing/router.ts                |  0
 .../ember-routing/routing/router-service.ts   |  0
 compat/ember-routing/routing/transition.ts    |  0
 compat/ember-template-factory/index.ts        |  0
 compat/ember-template/index.ts                |  3 +
 compat/ember-test/index.ts                    |  3 +
 compat/ember-utils/index.ts                   |  0
 compat/embroider-macros/index.ts              | 18 ++--
 compat/emner-template-compilation/index.ts    |  5 ++
 compat/glimmer-manager/index.ts               |  0
 compat/glimmer-tracking/primitives/cache.ts   |  5 ++
 compat/node-module/index.ts                   |  2 +
 plugins/ember-vendor.ts                       |  6 +-
 src/addons/ember-truth-helpers.ts             | 26 +++---
 src/addons/index.ts                           |  8 +-
 src/authenticators/custom.ts                  |  5 +-
 src/config/initializer.ts                     |  4 +-
 src/config/registry.ts                        | 16 ++--
 src/config/router.ts                          |  2 +-
 src/controllers/application.ts                |  4 +-
 src/controllers/login.ts                      |  4 +-
 src/initializers/ember-data.ts                | 30 +++----
 src/models/person.ts                          | 12 +--
 src/models/pet.ts                             | 10 +--
 src/routes/application.ts                     |  8 +-
 src/routes/login.ts                           |  6 +-
 src/routes/logout.ts                          | 10 +--
 src/routes/profile.ts                         | 16 ++--
 src/services/date.ts                          |  2 -
 src/services/store.ts                         | 42 ++++-----
 vite.config.ts                                | 87 +++++++++++++------
 34 files changed, 201 insertions(+), 139 deletions(-)
 create mode 100644 compat/ember-array/index.ts
 create mode 100644 compat/ember-owner/index.ts
 create mode 100644 compat/ember-routing/route.ts
 create mode 100644 compat/ember-routing/router.ts
 create mode 100644 compat/ember-routing/routing/router-service.ts
 create mode 100644 compat/ember-routing/routing/transition.ts
 create mode 100644 compat/ember-template-factory/index.ts
 create mode 100644 compat/ember-template/index.ts
 create mode 100644 compat/ember-test/index.ts
 create mode 100644 compat/ember-utils/index.ts
 create mode 100644 compat/emner-template-compilation/index.ts
 create mode 100644 compat/glimmer-manager/index.ts
 create mode 100644 compat/glimmer-tracking/primitives/cache.ts
 create mode 100644 compat/node-module/index.ts

diff --git a/compat/ember-array/index.ts b/compat/ember-array/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-owner/index.ts b/compat/ember-owner/index.ts
new file mode 100644
index 0000000..fb4be56
--- /dev/null
+++ b/compat/ember-owner/index.ts
@@ -0,0 +1,6 @@
+export function getOwner(context) {
+    console.log('getOwner', context);
+}
+export function setOwner(context, owner) {
+    console.log('setOwner', context, owner);
+}
\ No newline at end of file
diff --git a/compat/ember-routing/route.ts b/compat/ember-routing/route.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-routing/router.ts b/compat/ember-routing/router.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-routing/routing/router-service.ts b/compat/ember-routing/routing/router-service.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-routing/routing/transition.ts b/compat/ember-routing/routing/transition.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-template-factory/index.ts b/compat/ember-template-factory/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/ember-template/index.ts b/compat/ember-template/index.ts
new file mode 100644
index 0000000..46775d5
--- /dev/null
+++ b/compat/ember-template/index.ts
@@ -0,0 +1,3 @@
+export function isHTMLSafe() {
+    return true;
+}
\ No newline at end of file
diff --git a/compat/ember-test/index.ts b/compat/ember-test/index.ts
new file mode 100644
index 0000000..3fe2abf
--- /dev/null
+++ b/compat/ember-test/index.ts
@@ -0,0 +1,3 @@
+export function registerWaiter() {
+    console.log('registerWaiter');
+}
\ No newline at end of file
diff --git a/compat/ember-utils/index.ts b/compat/ember-utils/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/embroider-macros/index.ts b/compat/embroider-macros/index.ts
index 78cf489..2d72567 100644
--- a/compat/embroider-macros/index.ts
+++ b/compat/embroider-macros/index.ts
@@ -1,11 +1,11 @@
-import * as renderer from '@ember/renderer';
+// import * as renderer from '@ember/renderer';
 import * as validator from '@glimmer/validator';
 import * as manager from '@glimmer/manager';
 import { DEBUG } from '@glimmer/env';
-import * as recordData from '@ember-data/json-api';
-import * as model from '@ember-data/model/-private';
-import * as graph from '@ember-data/graph/-private';
-import { getDataConfig } from './../ember-data-private-build-infra';
+// import * as recordData from '@ember-data/json-api';
+// import * as model from '@ember-data/model/-private';
+// import * as graph from '@ember-data/graph/-private';
+// import { getDataConfig } from './../ember-data-private-build-infra';
 import * as owner from '@ember/owner';
 
 export function isDevelopingApp() {
@@ -62,7 +62,7 @@ export function macroCondition(value: boolean) {
 
 export function importSync(name: string) {
   if (name === '@ember/renderer') {
-    return renderer;
+    return {};
   }
   if (name === '@glimmer/validator') {
     return validator;
@@ -71,13 +71,13 @@ export function importSync(name: string) {
     return manager;
   }
   if (name === '@ember-data/json-api') {
-    return recordData;
+    // return recordData;
   }
   if (name === '@ember-data/model/-private') {
-    return model;
+    // return model;
   }
   if (name === '@ember-data/graph/-private') {
-    return graph;
+    // return graph;
   }
   if (name === '@ember/owner') {
     return owner;
diff --git a/compat/emner-template-compilation/index.ts b/compat/emner-template-compilation/index.ts
new file mode 100644
index 0000000..b39fc65
--- /dev/null
+++ b/compat/emner-template-compilation/index.ts
@@ -0,0 +1,5 @@
+export function precompileTemplate() {
+  return null;
+}
+
+export type PrecompiledTemplate = unknown;
diff --git a/compat/glimmer-manager/index.ts b/compat/glimmer-manager/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/compat/glimmer-tracking/primitives/cache.ts b/compat/glimmer-tracking/primitives/cache.ts
new file mode 100644
index 0000000..538c734
--- /dev/null
+++ b/compat/glimmer-tracking/primitives/cache.ts
@@ -0,0 +1,5 @@
+export function createCache() {
+
+}
+export function getValue() {
+}
\ No newline at end of file
diff --git a/compat/node-module/index.ts b/compat/node-module/index.ts
new file mode 100644
index 0000000..0764309
--- /dev/null
+++ b/compat/node-module/index.ts
@@ -0,0 +1,2 @@
+export const IS_NODE = false;
+export const module = globalThis;
diff --git a/plugins/ember-vendor.ts b/plugins/ember-vendor.ts
index c956251..4d17579 100644
--- a/plugins/ember-vendor.ts
+++ b/plugins/ember-vendor.ts
@@ -64,9 +64,9 @@ export function internalPackages(mode: string) {
       '@ember/test-helpers/addon-test-support/@ember/test-helpers'
     ),
 
-    Addon('@ember/test-waiters', mode).addSelfAlias(
-      '@ember/test-waiters/addon/@ember/test-waiters'
-    ),
+    // Addon('@ember/test-waiters', mode).addSelfAlias(
+    //   '@ember/test-waiters/addon/@ember/test-waiters'
+    // ),
 
     Addon('ember-compatibility-helpers', mode).addSelfAlias(
       compatPath('ember-compatibility-helpers/index.ts')
diff --git a/src/addons/ember-truth-helpers.ts b/src/addons/ember-truth-helpers.ts
index a05867b..b09e7eb 100644
--- a/src/addons/ember-truth-helpers.ts
+++ b/src/addons/ember-truth-helpers.ts
@@ -1,15 +1,15 @@
-import and from 'ember-truth-helpers/addon/helpers/and.js';
-import eq from 'ember-truth-helpers/addon/helpers/equal.js';
-import or from 'ember-truth-helpers/addon/helpers/or.js';
-import not from 'ember-truth-helpers/addon/helpers/not.js';
-import notEq from 'ember-truth-helpers/addon/helpers/not-equal.js';
+// import and from 'ember-truth-helpers/addon/helpers/and.js';
+// import eq from 'ember-truth-helpers/addon/helpers/equal.js';
+// import or from 'ember-truth-helpers/addon/helpers/or.js';
+// import not from 'ember-truth-helpers/addon/helpers/not.js';
+// import notEq from 'ember-truth-helpers/addon/helpers/not-equal.js';
 
-const registry = {
-  'helper:and': and,
-  'helper:eq': eq,
-  'helper:or': or,
-  'helper:not': not,
-  'helper:not-eq': notEq,
-};
+// const registry = {
+//   'helper:and': and,
+//   'helper:eq': eq,
+//   'helper:or': or,
+//   'helper:not': not,
+//   'helper:not-eq': notEq,
+// };
 
-export default registry;
+// export default registry;
diff --git a/src/addons/index.ts b/src/addons/index.ts
index 17cf797..c7b50b3 100644
--- a/src/addons/index.ts
+++ b/src/addons/index.ts
@@ -1,4 +1,4 @@
-import EmberSimpleAuthRegistry from './ember-simple-auth';
+// import EmberSimpleAuthRegistry from './ember-simple-auth';
 import EmberTruthHelpers from './ember-truth-helpers';
 import EmberPowerSelect from './ember-power-select';
 import EmberBasicDropdown from './ember-basic-dropdown';
@@ -8,7 +8,7 @@ import EmberRenderModifiers from './ember-render-modifiers';
 import EmberStyleModifier from './ember-style-modifier';
 import EmberIntl from './ember-intl';
 import EmberPageTitle from './ember-page-title';
-import EmberData from './ember-data';
+// import EmberData from './ember-data';
 import EmberNotify from './ember-notify';
 import EmberModalDialog from './ember-modal-dialog';
 import EmberResponsive from './ember-responsive';
@@ -25,11 +25,11 @@ const registry = {
   ...EmberPowerSelect,
   ...EmberIntl,
   ...EmberPageTitle,
-  ...EmberData,
+  // ...EmberData,
   ...EmberNotify,
   ...EmberModalDialog,
   ...EmberResponsive,
   ...EmberEventHelpers,
 };
 
-export default registry;
+export default {};
diff --git a/src/authenticators/custom.ts b/src/authenticators/custom.ts
index 134498e..fc358ff 100644
--- a/src/authenticators/custom.ts
+++ b/src/authenticators/custom.ts
@@ -1,10 +1,13 @@
-import Base from 'ember-simple-auth/authenticators/base';
+// import Base from 'ember-simple-auth/authenticators/base';
 
 interface IUserData {
   id: string;
   name: string;
 }
 
+class Base {
+  
+}
 export default class CustomAuthenticator extends Base {
   restore(data: IUserData): Promise<IUserData> {
     return Promise.resolve(data);
diff --git a/src/config/initializer.ts b/src/config/initializer.ts
index 2c6b5ce..86c30b3 100644
--- a/src/config/initializer.ts
+++ b/src/config/initializer.ts
@@ -5,7 +5,7 @@ import type RouteClass from './router';
 import { default as initializer } from '../initializers/logger';
 import { default as logger } from '../instance-initializers/logger';
 import { default as modalDialog } from '../instance-initializers/ember-modal-dialog';
-import { default as emberDataInitializer } from '../initializers/ember-data';
+// import { default as emberDataInitializer } from '../initializers/ember-data';
 import { default as emberResponsive } from '../initializers/ember-responsive';
 import breakpoints from './breakpoints';
 
@@ -15,7 +15,7 @@ export function init(
 ) {
   // Init initializers
   Application.initializer(initializer);
-  Application.initializer(emberDataInitializer);
+  // Application.initializer(emberDataInitializer);
   Application.initializer(emberResponsive);
 
   // Init instance initializers
diff --git a/src/config/registry.ts b/src/config/registry.ts
index cfa733f..29c4bc4 100644
--- a/src/config/registry.ts
+++ b/src/config/registry.ts
@@ -35,18 +35,18 @@ import IsDev from '@/helpers/is-dev';
 import ClickTracker from '@/modifiers/click-tracker';
 
 // ember-data debug adapter
-import DataDebugAdapter from '@ember-data/debug';
-import StoreService from '@/services/store';
+// import DataDebugAdapter from '@ember-data/debug';
+// import StoreService from '@/services/store';
 /* ember-data stuff */
-import Pet from '@/models/pet';
-import Person from '@/models/person';
+// import Pet from '@/models/pet';
+// import Person from '@/models/person';
 
 const InitialRegistry = {
-  'service:store': StoreService,
-  'model:pet': Pet,
-  'model:person': Person,
+  // 'service:store': StoreService,
+  // 'model:pet': Pet,
+  // 'model:person': Person,
   // debug ember-data adapter
-  'data-adapter:main': DataDebugAdapter,
+  // 'data-adapter:main': DataDebugAdapter,
 
   'authenticator:custom': CustomAuthenticator,
   'service:date': DateService,
diff --git a/src/config/router.ts b/src/config/router.ts
index fc139b8..03258e6 100644
--- a/src/config/router.ts
+++ b/src/config/router.ts
@@ -2,7 +2,7 @@ import EmberRouter from '@ember/routing/router';
 import config from './env';
 import type Controller from '@ember/controller';
 import Route from '@ember/routing/route';
-import { PrecompiledTemplate } from '@ember/template-compilation';
+import type { PrecompiledTemplate } from '@ember/template-compilation';
 import { getOwner } from '@ember/application';
 
 /*
diff --git a/src/controllers/application.ts b/src/controllers/application.ts
index 1a9a998..9601b40 100644
--- a/src/controllers/application.ts
+++ b/src/controllers/application.ts
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { service } from '@ember/service';
-import type SessionService from 'ember-simple-auth/addon/services/session';
+// import type SessionService from 'ember-simple-auth/addon/services/session';
 import type EmberNotify from 'ember-notify';
 import { tracked } from '@glimmer/tracking';
 import { restartableTask, timeout } from 'ember-concurrency';
@@ -9,7 +9,7 @@ import type { Task } from 'ember-concurrency';
 type MyTaskType = Task<void, []>;
 
 export class ApplicationController extends Controller {
-  @service session: SessionService;
+  // @service session: SessionService;
   @service notify: EmberNotify;
   @tracked showModal = true;
 
diff --git a/src/controllers/login.ts b/src/controllers/login.ts
index 91c42b5..73f0700 100644
--- a/src/controllers/login.ts
+++ b/src/controllers/login.ts
@@ -1,11 +1,11 @@
 import Controller from '@ember/controller';
 import { service } from '@ember/service';
 import { action } from '@ember/object';
-import SessionService from 'ember-simple-auth/addon/services/session';
+// import SessionService from 'ember-simple-auth/addon/services/session';
 import RouterService from '@ember/routing/router-service';
 
 export class LoginController extends Controller {
-  @service session: SessionService;
+  // @service session: SessionService;
   @service router!: RouterService;
 
   @action
diff --git a/src/initializers/ember-data.ts b/src/initializers/ember-data.ts
index 808a21d..104a041 100644
--- a/src/initializers/ember-data.ts
+++ b/src/initializers/ember-data.ts
@@ -1,18 +1,18 @@
-import type Application from '@ember/application';
+// import type Application from '@ember/application';
 
-function initializeStore(application: Application) {
-  application.registerOptionsForType('serializer', { singleton: false });
-  application.registerOptionsForType('adapter', { singleton: false });
-}
+// function initializeStore(application: Application) {
+//   application.registerOptionsForType('serializer', { singleton: false });
+//   application.registerOptionsForType('adapter', { singleton: false });
+// }
 
-function setupContainer(application: Application) {
-  initializeStore(application);
-}
+// function setupContainer(application: Application) {
+//   initializeStore(application);
+// }
 
-/*
-  This code initializes EmberData in an Ember application.
-*/
-export default {
-  name: 'ember-data',
-  initialize: setupContainer,
-};
+// /*
+//   This code initializes EmberData in an Ember application.
+// */
+// export default {
+//   name: 'ember-data',
+//   initialize: setupContainer,
+// };
diff --git a/src/models/person.ts b/src/models/person.ts
index f1156f1..c3e897e 100644
--- a/src/models/person.ts
+++ b/src/models/person.ts
@@ -1,7 +1,7 @@
-import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+// import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
-export default class PersonModel extends Model {
-  @attr name;
-  @belongsTo('pet', { inverse: 'owner', async: false }) dog;
-  @hasMany('person', { inverse: 'friends', async: false }) friends;
-}
+// export default class PersonModel extends Model {
+//   @attr name;
+//   @belongsTo('pet', { inverse: 'owner', async: false }) dog;
+//   @hasMany('person', { inverse: 'friends', async: false }) friends;
+// }
diff --git a/src/models/pet.ts b/src/models/pet.ts
index ce55c58..41f8b32 100644
--- a/src/models/pet.ts
+++ b/src/models/pet.ts
@@ -1,6 +1,6 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
+// import Model, { attr, belongsTo } from '@ember-data/model';
 
-export default class PetModel extends Model {
-  @attr name;
-  @belongsTo('person', { inverse: 'dog', async: false }) owner;
-}
+// export default class PetModel extends Model {
+//   @attr name;
+//   @belongsTo('person', { inverse: 'dog', async: false }) owner;
+// }
diff --git a/src/routes/application.ts b/src/routes/application.ts
index 621448f..1a22095 100644
--- a/src/routes/application.ts
+++ b/src/routes/application.ts
@@ -1,14 +1,14 @@
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 import translations from 'ember-intl/translations';
-import SessionService from 'ember-simple-auth/addon/services/session';
+// import SessionService from 'ember-simple-auth/addon/services/session';
 import type IntlService from 'ember-intl/addon/services/intl';
-import type Store from '@/services/store';
+// import type Store from '@/services/store';
 
 export class ApplicationRoute extends Route {
-  @service session: SessionService;
+  // @service session: SessionService;
   @service intl!: IntlService;
-  @service store!: Store;
+  // @service store!: Store;
 
   async beforeModel() {
     await this.session.setup();
diff --git a/src/routes/login.ts b/src/routes/login.ts
index 43de4c1..2241578 100644
--- a/src/routes/login.ts
+++ b/src/routes/login.ts
@@ -1,11 +1,11 @@
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-import SessionService from 'ember-simple-auth/addon/services/session';
+// import SessionService from 'ember-simple-auth/addon/services/session';
 
 export default class LoginRoute extends Route {
-  @service session: SessionService;
+  // @service session: SessionService;
 
   beforeModel() {
-    this.session.prohibitAuthentication('main');
+    // this.session.prohibitAuthentication('main');
   }
 }
diff --git a/src/routes/logout.ts b/src/routes/logout.ts
index 9cfc522..c12862c 100644
--- a/src/routes/logout.ts
+++ b/src/routes/logout.ts
@@ -2,17 +2,17 @@ import Route from '@ember/routing/route';
 import RouterService from '@ember/routing/router-service';
 import Transition from '@ember/routing/transition';
 import { service } from '@ember/service';
-import SessionService from 'ember-simple-auth/addon/services/session';
+// import SessionService from 'ember-simple-auth/addon/services/session';
 
 export default class LogoutRoute extends Route {
-  @service session: SessionService;
+  // @service session: SessionService;
   @service router!: RouterService;
 
   async beforeModel(transition: Transition) {
-    this.session.requireAuthentication(transition, 'login');
+    // this.session.requireAuthentication(transition, 'login');
 
-    await this.session.invalidate();
+    // await this.session.invalidate();
 
-    this.router.transitionTo('main');
+    // this.router.transitionTo('main');
   }
 }
diff --git a/src/routes/profile.ts b/src/routes/profile.ts
index e9ecee7..ee766bb 100644
--- a/src/routes/profile.ts
+++ b/src/routes/profile.ts
@@ -1,20 +1,20 @@
 import Route from '@ember/routing/route';
 import type Transition from '@ember/routing/transition';
 import { service } from '@ember/service';
-import SessionService from 'ember-simple-auth/addon/services/session';
-import StoreService from '@/services/store';
+// import SessionService from 'ember-simple-auth/addon/services/session';
+// import StoreService from '@/services/store';
 
 export default class ProfileRoute extends Route {
-  @service session: SessionService;
-  @service store: StoreService;
+  // @service session: SessionService;
+  // @service store: StoreService;
 
   beforeModel(transition: Transition) {
-    this.session.requireAuthentication(transition, 'login');
+    // this.session.requireAuthentication(transition, 'login');
   }
 
   model() {
-    const model = this.session.data.authenticated;
-    const user = this.store.peekRecord('person', model.id);
-    return user ?? this.store.createRecord('person', model);
+    // const model = this.session.data.authenticated;
+    // const user = this.store.peekRecord('person', model.id);
+    // return user ?? this.store.createRecord('person', model);
   }
 }
diff --git a/src/services/date.ts b/src/services/date.ts
index 57e6e05..461708d 100644
--- a/src/services/date.ts
+++ b/src/services/date.ts
@@ -1,6 +1,5 @@
 import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { cached } from 'tracked-toolbox';
 
 export default class DateService extends Service {
   interval: ReturnType<(typeof window)['setInterval']> | null = null;
@@ -21,7 +20,6 @@ export default class DateService extends Service {
     }
   }
 
-  @cached
   get date() {
     console.log('ama cached getter, recalculating only on value change')
     return this._date.toLocaleTimeString();
diff --git a/src/services/store.ts b/src/services/store.ts
index 8ed8aa0..21cc232 100644
--- a/src/services/store.ts
+++ b/src/services/store.ts
@@ -1,23 +1,23 @@
-import Cache from '@ember-data/json-api';
-import EDataStore, { CacheHandler } from '@ember-data/store';
-import RequestManager from '@ember-data/request';
-import Fetch from '@ember-data/request/fetch';
-import Adapter from '@ember-data/adapter/json-api';
+// import Cache from '@ember-data/json-api';
+// import EDataStore, { CacheHandler } from '@ember-data/store';
+// import RequestManager from '@ember-data/request';
+// import Fetch from '@ember-data/request/fetch';
+// import Adapter from '@ember-data/adapter/json-api';
 
-export default class Store extends EDataStore {
-  #adapter = new Adapter();
+// export default class Store extends EDataStore {
+//   #adapter = new Adapter();
 
-  adapterFor() {
-    return this.#adapter;
-  }
-  constructor() {
-    // eslint-disable-next-line prefer-rest-params
-    super(...arguments);
-    this.requestManager = new RequestManager();
-    this.requestManager.use([Fetch]);
-    this.requestManager.useCache(CacheHandler);
-  }
-  createCache(storeWrapper) {
-    return new Cache(storeWrapper);
-  }
-}
+//   adapterFor() {
+//     return this.#adapter;
+//   }
+//   constructor() {
+//     // eslint-disable-next-line prefer-rest-params
+//     super(...arguments);
+//     this.requestManager = new RequestManager();
+//     this.requestManager.use([Fetch]);
+//     this.requestManager.useCache(CacheHandler);
+//   }
+//   createCache(storeWrapper) {
+//     return new Cache(storeWrapper);
+//   }
+// }
diff --git a/vite.config.ts b/vite.config.ts
index 6de53ad..ed889a7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'vite';
 import { fileURLToPath, URL } from 'node:url';
 import { resolve } from 'node:path';
-import { generateDefineConfig } from './compat/ember-data-private-build-infra/index.ts';
+// import { generateDefineConfig } from './compat/ember-data-private-build-infra/index.ts';
 import {
   Addon,
   compatPath,
@@ -41,7 +41,7 @@ export default defineConfig(({ mode }) => {
       define: {
         ENV_DEBUG: isProd ? false : true,
         ENV_CI: false,
-        ...generateDefineConfig(isProd),
+        // ...generateDefineConfig(isProd),
       },
       resolve: {
         extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.hbs'],
@@ -63,19 +63,56 @@ export default defineConfig(({ mode }) => {
 
       ...internalPackages(mode),
 
-      Addon('@ember-data', mode)
-        .needBabel()
-        .addAliases(
-          eDataPackages().map((pkg) => ({
-            find: `@ember-data/${pkg}`,
-            replacement: nodePath(`@ember-data/${pkg}/addon`),
-          }))
-        )
-        .addAlias(/^ember-data$/, 'ember-data/addon')
-        .addAlias(
-          /^@ember-data\/private-build-infra$/,
-          compatPath('ember-data-private-build-infra')
-        ),
+      // compat things for 3.24
+      Addon('@ember/template-compilation', mode).addSelfAlias(
+        compatPath('ember-template-compilation/index.ts')
+      ),
+      Addon('@ember/owner', mode).addSelfAlias(
+        compatPath('ember-owner/index.ts')
+      ),
+      Addon('@ember/routing', mode).addSelfAlias(compatPath('ember-routing')),
+      Addon('@glimmer/manager', mode).addSelfAlias(
+        compatPath('glimmer-manager')
+      ),
+      Addon('ember-source', mode).addAlias(
+        'ember-source/dist/packages/@ember/template-factory/index.js',
+        compatPath('ember-template-factory/index.ts')
+      ),
+      Addon('@ember/array', mode).addSelfAlias(
+        compatPath('ember-array/index.ts')
+      ),
+      Addon('@ember/utils', mode).addSelfAlias(
+        compatPath('ember-utils/index.ts')
+      ),
+      Addon('@glimmer/tracking', mode).addAlias(
+        '@glimmer/tracking/primitives/cache',
+        compatPath('glimmer-tracking/primitives/cache.ts')
+      ),
+      Addon('node-module', mode).addSelfAlias(
+        compatPath('node-module/index.ts')
+      ),
+      Addon('@ember/template', mode).addSelfAlias(
+        compatPath('ember-template/index.ts')
+      ),
+      Addon('@ember/test', mode).addSelfAlias(
+        compatPath('ember-test/index.ts')
+      ),
+
+      //
+
+      // Addon('@ember-data', mode)
+      //   .needBabel()
+      //   .addAliases(
+      //     eDataPackages().map((pkg) => ({
+      //       find: `@ember-data/${pkg}`,
+      //       replacement: nodePath(`@ember-data/${pkg}/addon`),
+      //     }))
+      //   )
+      //   .addAlias(/^ember-data$/, 'ember-data/addon')
+      //   .addAlias(
+      //     /^@ember-data\/private-build-infra$/,
+      //     compatPath('ember-data-private-build-infra')
+      //   ),
       Addon('ember-notify', mode)
         .needAlias()
         .needBabel({ removeLegacyLayout: true }),
@@ -89,7 +126,7 @@ export default defineConfig(({ mode }) => {
       Addon('ember-basic-dropdown', mode).needBabel(),
       Addon('ember-ref-bucket', mode).needAlias().needBabel(),
       Addon('ember-page-title', mode).needBabel(),
-      Addon('tracked-toolbox', mode).needAlias().needBabel(),
+      // Addon('tracked-toolbox', mode).needAlias().needBabel(),
       Addon('@ember-decorators/object', mode).needAlias(),
       Addon('@ember-decorators/component', mode).needAlias(),
       Addon('@ember-decorators/utils', mode).needAlias(),
@@ -101,15 +138,15 @@ export default defineConfig(({ mode }) => {
         'ember-intl/-private',
         nodePath('ember-intl/addon/-private')
       ),
-      Addon('ember-simple-auth', mode)
-        .addNestedAlias(
-          'use-session-setup-method',
-          './compat/ember-simple-auth/use-session-setup-method.ts'
-        )
-        .addAlias(
-          /ember-simple-auth\/(?!(app|addon)\/)(.+)/,
-          'ember-simple-auth/addon/$2'
-        ),
+      // Addon('ember-simple-auth', mode)
+      //   .addNestedAlias(
+      //     'use-session-setup-method',
+      //     './compat/ember-simple-auth/use-session-setup-method.ts'
+      //   )
+      //   .addAlias(
+      //     /ember-simple-auth\/(?!(app|addon)\/)(.+)/,
+      //     'ember-simple-auth/addon/$2'
+      //   ),
     ]
   );
 });