From c6b89c87f6ba747ecf914cdd4b83ee08eefaf73b Mon Sep 17 00:00:00 2001
From: void_malex <void-mAlex@users.noreply.github.com>
Date: Sat, 7 Oct 2023 13:56:57 +0100
Subject: [PATCH] ember 4.x and 5.x compatibility drop node 12 and 14

---
 .github/workflows/main.yml |  2 +-
 README.md                  |  6 +++---
 config/ember-try.js        |  7 +++++--
 package.json               |  7 ++++---
 yarn.lock                  | 17 ++++++++++++-----
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a85ddc2..dcc2267 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
 
     strategy:
       matrix:
-        ember-version: [ember-beta, ember-lts-3.28]
+        ember-version: [ember-beta, ember-lts-4.8]
 
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index f47d57e..8e8600a 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Provides the legacy implementation of the `Checkbox`, `LinkComponent`,
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.20 or above
-* Ember CLI v3.20 or above
-* Node.js v12 or above
+* Ember.js v4.0 or above
+* Ember CLI v4.0 or above
+* Node.js v16 or above
 
 
 Installation
diff --git a/config/ember-try.js b/config/ember-try.js
index 03898c3..784ca7b 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -8,10 +8,10 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.28',
+        name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.8.6',
           },
         },
       },
@@ -36,9 +36,12 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
+            '@glint/template': '*',
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };
diff --git a/package.json b/package.json
index dcdd00e..64c27ae 100644
--- a/package.json
+++ b/package.json
@@ -41,10 +41,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.4.1",
     "@embroider/test-setup": "^1.0.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
+    "@glint/template": "^1.2.1",
     "@types/ember-qunit": "^5.0.0",
     "@types/ember-resolver": "^5.0.11",
     "@types/ember__application": "^4.0.0",
@@ -77,7 +79,6 @@
     "ember-cli-terser": "^4.0.2",
     "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
@@ -101,10 +102,10 @@
     "webpack": "^5.52.1"
   },
   "peerDependencies": {
-    "ember-source": "*"
+    "ember-source": ">= 4"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": ">= 16"
   },
   "ember": {
     "edition": "octane"
diff --git a/yarn.lock b/yarn.lock
index cdb7978..e91c316 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1027,6 +1027,13 @@
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
 
+"@ember/string@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
+  integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+
 "@ember/test-helpers@^2.4.1":
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.6.0.tgz#d687515c6ab49ba72717fc62046970ef4a72ea9c"
@@ -1206,6 +1213,11 @@
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
+"@glint/template@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@glint/template/-/template-1.2.1.tgz#b17b2e490ad1826d45e7bec3b87149ca926600e3"
+  integrity sha512-rlYy/93fAhYjXmTchWcwCpPFMfrqBYEskzbDYawS2oz4DVwtf4fOITLKB0QddQMI7WUCjgXAiIGZqcNa/R4YeQ==
+
 "@handlebars/parser@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
@@ -4713,11 +4725,6 @@ ember-disable-prototype-extensions@^1.1.3:
   resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
   integrity sha1-GWkTUhdlS14nj5/i2dTkm1cgMp4=
 
-ember-export-application-global@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
-  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
-
 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"