From e9e4b2b4938bd8ae70b888638378bf96a3ff2344 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 13 Aug 2025 10:11:37 -0400
Subject: [PATCH 1/2] Use strict application resolver

---
 files/package.json              |  2 +-
 files/tests/test-helper.__ext__ | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/files/package.json b/files/package.json
index 49f7c9b..b6f13b3 100644
--- a/files/package.json
+++ b/files/package.json
@@ -56,8 +56,8 @@
     "babel-plugin-ember-template-compilation": "^2.2.5",
     "concurrently": "^9.0.1",
     "ember-qunit": "^9.0.2",
-    "ember-resolver": "^13.1.0",
     "ember-source": "^6.3.0",
+    "ember-strict-application-resolver": "^0.1.0",
     "ember-template-lint": "^7.9.0",
     "eslint": "^9.17.0",
     "eslint-config-prettier": "^10.1.5",
diff --git a/files/tests/test-helper.__ext__ b/files/tests/test-helper.__ext__
index 7596fbe..770a20f 100644
--- a/files/tests/test-helper.__ext__
+++ b/files/tests/test-helper.__ext__
@@ -1,5 +1,4 @@
-import EmberApp from '@ember/application';
-import Resolver from 'ember-resolver';
+import EmberApp from 'ember-strict-application-resolver';
 import EmberRouter from '@ember/routing/router';
 import * as QUnit from 'qunit';
 import { setApplication } from '@ember/test-helpers';
@@ -12,11 +11,11 @@ class Router extends EmberRouter {
 }
 
 class TestApp extends EmberApp {
-  modulePrefix = 'test-app';
-  Resolver = Resolver.withModules({
-    'test-app/router': { default: Router },
+  modules = {
+    './router': { default: Router },
     // add any custom services here
-  });
+    // import.meta.glob('./services/*', { eager: true }),
+  }
 }
 
 Router.map(function () {});

From 0cc63dcd084bcf7f29e382785856fd12b3b751f7 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Tue, 30 Sep 2025 22:10:31 +0100
Subject: [PATCH 2/2] fix lint

---
 files/tests/test-helper.__ext__ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/tests/test-helper.__ext__ b/files/tests/test-helper.__ext__
index 770a20f..7ff84dd 100644
--- a/files/tests/test-helper.__ext__
+++ b/files/tests/test-helper.__ext__
@@ -15,7 +15,7 @@ class TestApp extends EmberApp {
     './router': { default: Router },
     // add any custom services here
     // import.meta.glob('./services/*', { eager: true }),
-  }
+  };
 }
 
 Router.map(function () {});