diff --git a/.ember-cli b/.ember-cli
index 4ccb4bf4..4adaaf6d 100644
--- a/.ember-cli
+++ b/.ember-cli
@@ -11,5 +11,5 @@
   Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
   rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
-  "isTypeScriptProject": false
+  "isTypeScriptProject": true
 }
diff --git a/.eslintignore b/.eslintignore
index d474a40b..788ec3d5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -15,6 +15,8 @@
 !.*
 .*/
 .eslintcache
+/.yalc*
+/yalc.lock
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.eslintrc.js b/.eslintrc.js
index 1dd2a810..20b911fc 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,28 @@
 'use strict';
 
+const sharedTSOptions = {
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:@typescript-eslint/recommended-requiring-type-checking',
+    'plugin:@typescript-eslint/strict',
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  rules: {
+    '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
+    '@typescript-eslint/consistent-type-exports': 'error',
+    '@typescript-eslint/consistent-type-imports': 'error',
+    '@typescript-eslint/explicit-function-return-type': 'error',
+    '@typescript-eslint/method-signature-style': 'error',
+    '@typescript-eslint/no-confusing-void-expression': 'error',
+    '@typescript-eslint/no-redundant-type-constituents': 'error',
+    '@typescript-eslint/prefer-enum-initializers': 'error',
+    '@typescript-eslint/prefer-readonly': 'error',
+    '@typescript-eslint/promise-function-async': 'error',
+  },
+};
+
 module.exports = {
   root: true,
   extends: ['eslint:recommended', 'plugin:prettier/recommended'],
@@ -45,6 +68,30 @@ module.exports = {
       extends: ['plugin:node/recommended'],
     },
 
+    // ts files
+    {
+      files: ['**/*.ts'],
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json'],
+      },
+      ...sharedTSOptions,
+    },
+
+    // ts-tests files
+    {
+      files: ['type-tests/**/*.ts'],
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./type-tests/tsconfig.json'],
+      },
+      ...sharedTSOptions,
+      rules: {
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-unused-vars': 'off',
+      },
+    },
+
     // test files
     {
       files: ['tests/**/*.js'],
diff --git a/.gitignore b/.gitignore
index 57f1ade9..06f20ec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,9 @@
 /npm-debug.log*
 /testem.log
 /yarn-error.log
+/.yalc*
+/yalc.lock
+/.vscode*
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/.prettierignore b/.prettierignore
index 4178fd57..a2502fb6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -15,6 +15,8 @@
 !.*
 .eslintcache
 .lint-todo/
+/.yalc*
+/yalc.lock
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/addon-test-support/adapter.js b/addon-test-support/adapter.js
deleted file mode 100644
index 7673f392..00000000
--- a/addon-test-support/adapter.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Ember from 'ember';
-import * as QUnit from 'qunit';
-import hasEmberVersion from '@ember/test-helpers/has-ember-version';
-
-function unhandledRejectionAssertion(current, error) {
-  let message, source;
-
-  if (typeof error === 'object' && error !== null) {
-    message = error.message;
-    source = error.stack;
-  } else if (typeof error === 'string') {
-    message = error;
-    source = 'unknown source';
-  } else {
-    message = 'unhandledRejection occured, but it had no message';
-    source = 'unknown source';
-  }
-
-  current.assert.pushResult({
-    result: false,
-    actual: false,
-    expected: true,
-    message: message,
-    source: source,
-  });
-}
-
-export function nonTestDoneCallback() {}
-
-let Adapter = Ember.Test.Adapter.extend({
-  init() {
-    this.doneCallbacks = [];
-    this.qunit = this.qunit || QUnit;
-  },
-
-  asyncStart() {
-    let currentTest = this.qunit.config.current;
-    let done =
-      currentTest && currentTest.assert
-        ? currentTest.assert.async()
-        : nonTestDoneCallback;
-    this.doneCallbacks.push({ test: currentTest, done });
-  },
-
-  asyncEnd() {
-    let currentTest = this.qunit.config.current;
-
-    if (this.doneCallbacks.length === 0) {
-      throw new Error(
-        'Adapter asyncEnd called when no async was expected. Please create an issue in ember-qunit.'
-      );
-    }
-
-    let { test, done } = this.doneCallbacks.pop();
-
-    // In future, we should explore fixing this at a different level, specifically
-    // addressing the pairing of asyncStart/asyncEnd behavior in a more consistent way.
-    if (test === currentTest) {
-      done();
-    }
-  },
-
-  // clobber default implementation of `exception` will be added back for Ember
-  // < 2.17 just below...
-  exception: null,
-});
-
-// Ember 2.17 and higher do not require the test adapter to have an `exception`
-// method When `exception` is not present, the unhandled rejection is
-// automatically re-thrown and will therefore hit QUnit's own global error
-// handler (therefore appropriately causing test failure)
-if (!hasEmberVersion(2, 17)) {
-  Adapter = Adapter.extend({
-    exception(error) {
-      unhandledRejectionAssertion(QUnit.config.current, error);
-    },
-  });
-}
-
-export default Adapter;
diff --git a/addon-test-support/adapter.ts b/addon-test-support/adapter.ts
new file mode 100644
index 00000000..ed3c2a58
--- /dev/null
+++ b/addon-test-support/adapter.ts
@@ -0,0 +1,106 @@
+import { assert } from '@ember/debug';
+import type EmberTestAdapter from '@ember/test/adapter';
+import hasEmberVersion from '@ember/test-helpers/has-ember-version';
+import Ember from 'ember';
+
+import * as QUnit from 'qunit';
+
+import { isRecord, isTest } from './types/util';
+
+function unhandledRejectionAssertion(current: unknown, error: unknown): void {
+  let message: string;
+  let source: string | undefined;
+
+  if (
+    isRecord(error) &&
+    'message' in error &&
+    typeof error['message'] === 'string'
+  ) {
+    message = error['message'];
+    source = typeof error['stack'] === 'string' ? error['stack'] : undefined;
+  } else if (typeof error === 'string') {
+    message = error;
+    source = 'unknown source';
+  } else {
+    message = 'unhandledRejection occurred, but it had no message';
+    source = 'unknown source';
+  }
+
+  assert(
+    'expected current test to have an assert',
+    isTest(current) && 'assert' in current
+  );
+  current.assert.pushResult({
+    result: false,
+    actual: false,
+    expected: true,
+    message: message,
+    source,
+  });
+}
+
+export function nonTestDoneCallback(): void {
+  // no-op
+}
+
+interface QUnitAdapter extends EmberTestAdapter {
+  doneCallbacks: Array<{ test: unknown; done: () => void }>;
+  qunit: QUnit;
+}
+
+// @ts-expect-error `extend` does not exist on Adapter
+// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+let Adapter = Ember.Test.Adapter.extend({
+  init(this: QUnitAdapter) {
+    this.doneCallbacks = [];
+    this.qunit ??= QUnit;
+  },
+
+  asyncStart(this: QUnitAdapter) {
+    const currentTest: unknown = this.qunit.config.current;
+    const done =
+      isTest(currentTest) && 'assert' in currentTest
+        ? currentTest.assert.async()
+        : nonTestDoneCallback;
+    this.doneCallbacks.push({ test: currentTest, done });
+  },
+
+  asyncEnd(this: QUnitAdapter) {
+    const currentCallback = this.doneCallbacks.pop();
+
+    if (!currentCallback) {
+      throw new Error(
+        'Adapter asyncEnd called when no async was expected. Please create an issue in ember-qunit.'
+      );
+    }
+
+    const { test, done } = currentCallback;
+
+    // In future, we should explore fixing this at a different level, specifically
+    // addressing the pairing of asyncStart/asyncEnd behavior in a more consistent way.
+    if (test === this.qunit.config.current) {
+      done();
+    }
+  },
+
+  // clobber default implementation of `exception` will be added back for Ember
+  // < 2.17 just below...
+  exception: null,
+}) as QUnitAdapter;
+
+// Ember 2.17 and higher do not require the test adapter to have an `exception`
+// method When `exception` is not present, the unhandled rejection is
+// automatically re-thrown and will therefore hit QUnit's own global error
+// handler (therefore appropriately causing test failure)
+if (!hasEmberVersion(2, 17)) {
+  // @ts-expect-error `extend` does not exist on Adapter
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+  Adapter = Adapter.extend({
+    exception(error: unknown) {
+      const currentTest: unknown = QUnit.config.current;
+      unhandledRejectionAssertion(currentTest, error);
+    },
+  }) as QUnitAdapter;
+}
+
+export default Adapter;
diff --git a/addon-test-support/index.js b/addon-test-support/index.js
deleted file mode 100644
index a5258ce4..00000000
--- a/addon-test-support/index.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/* globals Testem */
-
-export { default as QUnitAdapter, nonTestDoneCallback } from './adapter';
-export { loadTests } from './test-loader';
-
-import './qunit-configuration';
-
-if (typeof Testem !== 'undefined') {
-  Testem.hookIntoTestFramework();
-}
-
-import { _backburner } from '@ember/runloop';
-import { resetOnerror, getTestMetadata } from '@ember/test-helpers';
-import { loadTests } from './test-loader';
-import Ember from 'ember';
-import * as QUnit from 'qunit';
-import QUnitAdapter from './adapter';
-import {
-  setupContext,
-  teardownContext,
-  setupRenderingContext,
-  setupApplicationContext,
-  validateErrorHandler,
-} from '@ember/test-helpers';
-import { installTestNotIsolatedHook } from './test-isolation-validation';
-
-let waitForSettled = true;
-
-export function setupTest(hooks, _options) {
-  let options = { waitForSettled, ..._options };
-
-  hooks.beforeEach(function (assert) {
-    let testMetadata = getTestMetadata(this);
-    testMetadata.framework = 'qunit';
-
-    return setupContext(this, options).then(() => {
-      let originalPauseTest = this.pauseTest;
-      this.pauseTest = function QUnit_pauseTest() {
-        assert.timeout(-1); // prevent the test from timing out
-
-        // This is a temporary work around for
-        // https://github.com/emberjs/ember-qunit/issues/496 this clears the
-        // timeout that would fail the test when it hits the global testTimeout
-        // value.
-        clearTimeout(QUnit.config.timeout);
-        return originalPauseTest.call(this);
-      };
-    });
-  });
-
-  hooks.afterEach(function () {
-    return teardownContext(this, options);
-  });
-}
-
-export function setupRenderingTest(hooks, _options) {
-  let options = { waitForSettled, ..._options };
-
-  setupTest(hooks, options);
-
-  hooks.beforeEach(function () {
-    return setupRenderingContext(this);
-  });
-}
-
-export function setupApplicationTest(hooks, _options) {
-  let options = { waitForSettled, ..._options };
-
-  setupTest(hooks, options);
-
-  hooks.beforeEach(function () {
-    return setupApplicationContext(this);
-  });
-}
-
-/**
-   Uses current URL configuration to setup the test container.
-
-   * If `?nocontainer` is set, the test container will be hidden.
-   * If `?devmode` or `?fullscreencontainer` is set, the test container will be
-     made full screen.
-
-   @method setupTestContainer
- */
-export function setupTestContainer() {
-  let testContainer = document.getElementById('ember-testing-container');
-  if (!testContainer) {
-    return;
-  }
-
-  let params = QUnit.urlParams;
-
-  if (params.devmode || params.fullscreencontainer) {
-    testContainer.classList.add('ember-testing-container-full-screen');
-  }
-
-  if (params.nocontainer) {
-    testContainer.classList.add('ember-testing-container-hidden');
-  }
-}
-
-/**
-   Instruct QUnit to start the tests.
-   @method startTests
- */
-export function startTests() {
-  QUnit.start();
-}
-
-/**
-   Sets up the `Ember.Test` adapter for usage with QUnit 2.x.
-
-   @method setupTestAdapter
- */
-export function setupTestAdapter() {
-  Ember.Test.adapter = QUnitAdapter.create();
-}
-
-/**
-  Ensures that `Ember.testing` is set to `true` before each test begins
-  (including `before` / `beforeEach`), and reset to `false` after each test is
-  completed. This is done via `QUnit.testStart` and `QUnit.testDone`.
-
- */
-export function setupEmberTesting() {
-  QUnit.testStart(() => {
-    Ember.testing = true;
-  });
-
-  QUnit.testDone(() => {
-    Ember.testing = false;
-  });
-}
-
-/**
-  Ensures that `Ember.onerror` (if present) is properly configured to re-throw
-  errors that occur while `Ember.testing` is `true`.
-*/
-export function setupEmberOnerrorValidation() {
-  QUnit.module('ember-qunit: Ember.onerror validation', function () {
-    QUnit.test('Ember.onerror is functioning properly', function (assert) {
-      assert.expect(1);
-      let result = validateErrorHandler();
-      assert.ok(
-        result.isValid,
-        `Ember.onerror handler with invalid testing behavior detected. An Ember.onerror handler _must_ rethrow exceptions when \`Ember.testing\` is \`true\` or the test suite is unreliable. See https://git.io/vbine for more details.`
-      );
-    });
-  });
-}
-
-export function setupResetOnerror() {
-  QUnit.testDone(resetOnerror);
-}
-
-export function setupTestIsolationValidation(delay) {
-  waitForSettled = false;
-  _backburner.DEBUG = true;
-  QUnit.on('testStart', () => installTestNotIsolatedHook(delay));
-}
-
-/**
-   @method start
-   @param {Object} [options] Options to be used for enabling/disabling behaviors
-   @param {Boolean} [options.loadTests] If `false` tests will not be loaded automatically.
-   @param {Boolean} [options.setupTestContainer] If `false` the test container will not
-   be setup based on `devmode`, `dockcontainer`, or `nocontainer` URL params.
-   @param {Boolean} [options.startTests] If `false` tests will not be automatically started
-   (you must run `QUnit.start()` to kick them off).
-   @param {Boolean} [options.setupTestAdapter] If `false` the default Ember.Test adapter will
-   not be updated.
-   @param {Boolean} [options.setupEmberTesting] `false` opts out of the
-   default behavior of setting `Ember.testing` to `true` before all tests and
-   back to `false` after each test will.
-   @param {Boolean} [options.setupEmberOnerrorValidation] If `false` validation
-   of `Ember.onerror` will be disabled.
-   @param {Boolean} [options.setupTestIsolationValidation] If `false` test isolation validation
-   will be disabled.
-   @param {Number} [options.testIsolationValidationDelay] When using
-   setupTestIsolationValidation this number represents the maximum amount of
-   time in milliseconds that is allowed _after_ the test is completed for all
-   async to have been completed. The default value is 50.
- */
-export function start(options = {}) {
-  if (options.loadTests !== false) {
-    loadTests();
-  }
-
-  if (options.setupTestContainer !== false) {
-    setupTestContainer();
-  }
-
-  if (options.setupTestAdapter !== false) {
-    setupTestAdapter();
-  }
-
-  if (options.setupEmberTesting !== false) {
-    setupEmberTesting();
-  }
-
-  if (options.setupEmberOnerrorValidation !== false) {
-    setupEmberOnerrorValidation();
-  }
-
-  if (
-    typeof options.setupTestIsolationValidation !== 'undefined' &&
-    options.setupTestIsolationValidation !== false
-  ) {
-    setupTestIsolationValidation(options.testIsolationValidationDelay);
-  }
-
-  if (options.startTests !== false) {
-    startTests();
-  }
-
-  setupResetOnerror();
-}
diff --git a/types/index.d.ts b/addon-test-support/index.ts
similarity index 50%
rename from types/index.d.ts
rename to addon-test-support/index.ts
index d11b83d5..4d6bebdb 100644
--- a/types/index.d.ts
+++ b/addon-test-support/index.ts
@@ -1,48 +1,108 @@
-// Type definitions for ember-qunit 5.0
-// Project: https://github.com/emberjs/ember-qunit#readme
-// Definitions by: Dan Freeman <https://github.com/dfreeman>
-//                 Chris Krycho <https://github.com/chriskrycho>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
-import EmberTestAdapter from '@ember/test/adapter';
-import { Resolver } from '@ember/owner';
-import { TestContext } from '@ember/test-helpers';
+/* globals Testem */
 
-/**
- * Sets a Resolver globally which will be used to look up objects from each test's container.
- */
-export function setResolver(resolver: Resolver): void;
+export { default as QUnitAdapter, nonTestDoneCallback } from './adapter';
+export { loadTests } from './test-loader';
+
+import './qunit-configuration';
+
+// @ts-expect-error Testem has no types
+if (typeof Testem !== 'undefined') {
+  // @ts-expect-error Testem has no types
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+  Testem.hookIntoTestFramework();
+}
+
+import { _backburner } from '@ember/runloop';
+import type {
+  BaseContext,
+  SetupContextOptions,
+  TeardownContextOptions,
+  TestContext,
+} from '@ember/test-helpers';
+import {
+  getTestMetadata,
+  resetOnerror,
+  setupApplicationContext,
+  setupContext,
+  setupRenderingContext,
+  teardownContext,
+  validateErrorHandler,
+} from '@ember/test-helpers';
+import Ember from 'ember';
+
+import * as QUnit from 'qunit';
+
+import QUnitAdapter from './adapter';
+import { installTestNotIsolatedHook } from './test-isolation-validation';
+import { loadTests } from './test-loader';
+
+let waitForSettled = true;
 
 /**
  * Options for configuring the test runner. Normally, you will not need to
  * customize this. It is exported primarily so that end user app code can name
  * it when passing it back to the framework.
  */
-export interface SetupTestOptions {
-  /**
-   * The resolver to use when instantiating container-managed entities in the test.
-   */
-  resolver?: Resolver | undefined;
-}
+export type SetupTestOptions = SetupContextOptions;
+
+type PrivateSetupOptions = SetupContextOptions & TeardownContextOptions;
 
 /**
- * Sets up acceptance tests.
+ * Sets up tests that do not need to render snippets of templates.
  *
- * The `setupApplicationTest` function is used for all acceptance tests. It
- * is invoked in the callback scope of a QUnit module (aka "nested module").
+ * The `setupTest` method is used for all types of tests except for those
+ * that need to render snippets of templates. It is invoked in the callback
+ * scope of a QUnit module (aka "nested module").
  *
  * Once invoked, all subsequent hooks.beforeEach and test invocations will
  * have access to the following:
- * * `this.owner` - the owner object that been set on the test context.
- * * `this.pauseTest` and `this.resumeTest` - allow easy pausing/resuming of tests.
- * * `this.element` which returns the DOM element representing the application's root element.
+ * * this.owner - This exposes the standard "owner API" for the test environment.
+ * * this.set / this.setProperties - Allows setting values on the test context.
+ * * this.get / this.getProperties - Retrieves values from the test context.
  */
-export function setupApplicationTest(
+export function setupTest(
   hooks: NestedHooks,
   options?: SetupTestOptions
-): void;
+): void {
+  const allOptions: PrivateSetupOptions = { waitForSettled, ...options };
+
+  hooks.beforeEach(async function (
+    this: BaseContext,
+    assert: Assert
+  ): Promise<void> {
+    const testMetadata = getTestMetadata(this);
+    testMetadata['framework'] = 'qunit';
+
+    await setupContext(this, allOptions);
+
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    const originalPauseTest = (this as TestContext).pauseTest;
+    (this as TestContext).pauseTest =
+      async function QUnit_pauseTest(): Promise<void> {
+        assert.timeout(-1); // prevent the test from timing out
+
+        // This is a temporary work around for
+        // https://github.com/emberjs/ember-qunit/issues/496 this clears the
+        // timeout that would fail the test when it hits the global testTimeout
+        // value.
+        // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/63805#issuecomment-1372408802
+        const timeout = (
+          QUnit.config as unknown as {
+            // https://github.com/qunitjs/qunit/blob/fc278e8c0d7e90ec42e47b47eee1cc85c9a9efaf/src/test.js#L752
+            timeout: ReturnType<typeof setTimeout> | null | undefined;
+          }
+        ).timeout;
+        if (timeout !== null && timeout !== undefined) {
+          clearTimeout(timeout);
+        }
+        await originalPauseTest.call(this);
+      };
+  });
+
+  hooks.afterEach(async function (this: TestContext): Promise<void> {
+    await teardownContext(this, allOptions);
+  });
+}
 
 /**
  * Sets up tests that need to render snippets of templates.
@@ -54,40 +114,142 @@ export function setupApplicationTest(
  * Once invoked, all subsequent hooks.beforeEach and test invocations will
  * have access to the following:
  * * All of the methods / properties listed for `setupTest`
- * * this.render(...) - Renders the provided template snippet returning a
- * promise that resolves once rendering has completed
- * * An importable render function that de-sugars into this.render will be
- * the default output of blueprints
+ * * An importable render function
  * * this.element - Returns the native DOM element representing the element
  * that was rendered via this.render
- * * this.$(...) - When jQuery is present, executes a jQuery selector with
- * the current this.element as its root
  */
 export function setupRenderingTest(
   hooks: NestedHooks,
   options?: SetupTestOptions
-): void;
+): void {
+  const allOptions: PrivateSetupOptions = { waitForSettled, ...options };
+
+  setupTest(hooks, allOptions);
+
+  hooks.beforeEach(async function (this: TestContext) {
+    await setupRenderingContext(this);
+  });
+}
 
 /**
- * Sets up tests that do not need to render snippets of templates.
+ * Sets up acceptance tests.
  *
- * The `setupTest` method is used for all types of tests except for those
- * that need to render snippets of templates. It is invoked in the callback
- * scope of a QUnit module (aka "nested module").
+ * The `setupApplicationTest` function is used for all acceptance tests. It
+ * is invoked in the callback scope of a QUnit module (aka "nested module").
  *
  * Once invoked, all subsequent hooks.beforeEach and test invocations will
  * have access to the following:
- * * this.owner - This exposes the standard "owner API" for the test environment.
- * * this.set / this.setProperties - Allows setting values on the test context.
- * * this.get / this.getProperties - Retrieves values from the test context.
+ * * `this.owner` - the owner object that been set on the test context.
+ * * `this.pauseTest` and `this.resumeTest` - allow easy pausing/resuming of tests.
+ * * `this.element` which returns the DOM element representing the application's root element.
  */
-export function setupTest(hooks: NestedHooks, options?: SetupTestOptions): void;
+export function setupApplicationTest(
+  hooks: NestedHooks,
+  options?: SetupTestOptions
+): void {
+  const allOptions: PrivateSetupOptions = { waitForSettled, ...options };
 
-export class QUnitAdapter extends EmberTestAdapter {}
+  setupTest(hooks, allOptions);
 
-export { module, test, skip, only, todo } from 'qunit';
+  hooks.beforeEach(async function (this: TestContext) {
+    await setupApplicationContext(this);
+  });
+}
 
-interface QUnitStartOptions {
+/**
+   Uses current URL configuration to setup the test container.
+
+   * If `?nocontainer` is set, the test container will be hidden.
+   * If `?devmode` or `?fullscreencontainer` is set, the test container will be
+     made full screen.
+
+   @method setupTestContainer
+ */
+export function setupTestContainer(): void {
+  const testContainer = document.getElementById('ember-testing-container');
+  if (!testContainer) {
+    return;
+  }
+
+  const params = QUnit.urlParams;
+
+  if (params['devmode'] || params['fullscreencontainer']) {
+    testContainer.classList.add('ember-testing-container-full-screen');
+  }
+
+  if (params['nocontainer']) {
+    testContainer.classList.add('ember-testing-container-hidden');
+  }
+}
+
+/**
+   Instruct QUnit to start the tests.
+   @method startTests
+ */
+export function startTests(): void {
+  QUnit.start();
+}
+
+/**
+   Sets up the `Ember.Test` adapter for usage with QUnit 2.x.
+
+   @method setupTestAdapter
+ */
+export function setupTestAdapter(): void {
+  // @ts-expect-error Adapter doesn't have `create`
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+  Ember.Test.adapter = QUnitAdapter.create() as typeof QUnitAdapter;
+}
+
+/**
+  Ensures that `Ember.testing` is set to `true` before each test begins
+  (including `before` / `beforeEach`), and reset to `false` after each test is
+  completed. This is done via `QUnit.testStart` and `QUnit.testDone`.
+
+ */
+export function setupEmberTesting(): void {
+  QUnit.testStart(() => {
+    // @ts-expect-error Ember.testing type is readonly
+    Ember.testing = true;
+  });
+
+  QUnit.testDone(() => {
+    // @ts-expect-error Ember.testing type is readonly
+    Ember.testing = false;
+  });
+}
+
+/**
+  Ensures that `Ember.onerror` (if present) is properly configured to re-throw
+  errors that occur while `Ember.testing` is `true`.
+*/
+export function setupEmberOnerrorValidation(): void {
+  QUnit.module('ember-qunit: Ember.onerror validation', function () {
+    QUnit.test('Ember.onerror is functioning properly', function (assert) {
+      assert.expect(1);
+      const result = validateErrorHandler();
+      assert.ok(
+        result.isValid,
+        `Ember.onerror handler with invalid testing behavior detected. An Ember.onerror handler _must_ rethrow exceptions when \`Ember.testing\` is \`true\` or the test suite is unreliable. See https://git.io/vbine for more details.`
+      );
+    });
+  });
+}
+
+export function setupResetOnerror(): void {
+  QUnit.testDone(resetOnerror);
+}
+
+export function setupTestIsolationValidation(delay?: number | undefined): void {
+  waitForSettled = false;
+  _backburner.DEBUG = true;
+  QUnit.testStart(() => {
+    installTestNotIsolatedHook(delay);
+  });
+}
+
+/** Options to be used for enabling/disabling behaviors */
+export interface QUnitStartOptions {
   /**
    * If `false` tests will not be loaded automatically.
    */
@@ -125,9 +287,49 @@ interface QUnitStartOptions {
    * If `false` test isolation validation will be disabled.
    */
   setupTestIsolationValidation?: boolean | undefined;
+
+  /**
+   * When using setupTestIsolationValidation this number represents the maximum
+   * amount of time in milliseconds that is allowed _after_ the test is
+   * completed for all async to have been completed. The default value is 50.
+   */
+  testIsolationValidationDelay?: number | undefined;
 }
 
-export function start(options?: QUnitStartOptions): void;
+export function start(options: QUnitStartOptions = {}): void {
+  if (options.loadTests !== false) {
+    loadTests();
+  }
+
+  if (options.setupTestContainer !== false) {
+    setupTestContainer();
+  }
+
+  if (options.setupTestAdapter !== false) {
+    setupTestAdapter();
+  }
+
+  if (options.setupEmberTesting !== false) {
+    setupEmberTesting();
+  }
+
+  if (options.setupEmberOnerrorValidation !== false) {
+    setupEmberOnerrorValidation();
+  }
+
+  if (
+    typeof options.testIsolationValidationDelay !== 'undefined' &&
+    options.setupTestIsolationValidation !== false
+  ) {
+    setupTestIsolationValidation(options.testIsolationValidationDelay);
+  }
+
+  if (options.startTests !== false) {
+    startTests();
+  }
+
+  setupResetOnerror();
+}
 
 // SAFETY: all of the `TC extends TestContext` generics below are just wildly,
 // impossibly unsafe. QUnit cannot -- ever! -- guarantee that the test context
@@ -136,6 +338,10 @@ export function start(options?: QUnitStartOptions): void;
 // which is slooooowly rolling out across the ecosystem in conjunction with the
 // `<template>` feature.
 
+// We need this style to avoid "Subsequent property declarations must have the
+// same type" errors
+/* eslint-disable @typescript-eslint/method-signature-style */
+
 declare global {
   // NOTE: disables `no-unnecessary-generics` inline because, unfortunately,
   // the design of Ember's test tooling (and indeed *QUnit's* test system)
@@ -151,14 +357,18 @@ declare global {
      * module's queue has emptied, it will not run this hook again.
      */
     after<TC extends TestContext>(
-      fn: (this: TC, assert: Assert) => void | Promise<void>
+      fn:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
      * Runs after each test.
      */
     afterEach<TC extends TestContext>(
-      fn: (this: TC, assert: Assert) => void | Promise<void>
+      fn:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
@@ -166,7 +376,9 @@ declare global {
      */
     // SAFETY: this is just wildly, impossibly unsafe. QUnit cannot -- ever! --
     before<TC extends TestContext>(
-      fn: (this: TC, assert: Assert) => void | Promise<void>
+      fn:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
@@ -174,7 +386,9 @@ declare global {
      */
     // SAFETY: this is just wildly, impossibly unsafe. QUnit cannot -- ever! --
     beforeEach<TC extends TestContext>(
-      fn: (this: TC, assert: Assert) => void | Promise<void>
+      fn:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
   }
 
@@ -200,7 +414,9 @@ declare global {
     // `<template>` and local scope.
     test<TC extends TestContext>(
       name: string,
-      callback: (this: TC, assert: Assert) => void | Promise<unknown>
+      callback:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
@@ -225,7 +441,9 @@ declare global {
     // `<template>` and local scope.
     only<TC extends TestContext>(
       name: string,
-      callback: (this: TC, assert: Assert) => void | Promise<unknown>
+      callback:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
@@ -244,7 +462,9 @@ declare global {
     // `<template>` and local scope.
     todo<TC extends TestContext>(
       name: string,
-      callback: (this: TC, assert: Assert) => void | Promise<unknown>
+      callback:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
 
     /**
@@ -266,7 +486,11 @@ declare global {
     // `<template>` and local scope.
     skip<TC extends TestContext>(
       name: string,
-      callback?: (this: TC, assert: Assert) => void | Promise<unknown>
+      callback?:
+        | ((this: TC, assert: Assert) => void)
+        | ((this: TC, assert: Assert) => Promise<void>)
     ): void;
   }
 }
+
+/* eslint-enable @typescript-eslint/method-signature-style */
diff --git a/addon-test-support/qunit-configuration.js b/addon-test-support/qunit-configuration.ts
similarity index 73%
rename from addon-test-support/qunit-configuration.js
rename to addon-test-support/qunit-configuration.ts
index 20abdd0c..b8d60e53 100644
--- a/addon-test-support/qunit-configuration.js
+++ b/addon-test-support/qunit-configuration.ts
@@ -5,4 +5,4 @@ QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
 QUnit.config.urlConfig.push({ id: 'nolint', label: 'Disable Linting' });
 QUnit.config.urlConfig.push({ id: 'devmode', label: 'Development mode' });
 
-QUnit.config.testTimeout = QUnit.urlParams.devmode ? null : 60000; //Default Test Timeout 60 Seconds
+QUnit.config.testTimeout = QUnit.urlParams['devmode'] ? null : 60000; //Default Test Timeout 60 Seconds
diff --git a/addon-test-support/test-isolation-validation.js b/addon-test-support/test-isolation-validation.ts
similarity index 69%
rename from addon-test-support/test-isolation-validation.js
rename to addon-test-support/test-isolation-validation.ts
index f0cebe51..a56ad14b 100644
--- a/addon-test-support/test-isolation-validation.js
+++ b/addon-test-support/test-isolation-validation.ts
@@ -1,8 +1,18 @@
 /* eslint-disable no-console */
-import * as QUnit from 'qunit';
+
+import { assert } from '@ember/debug';
+// @ts-expect-error _cancelTimers is private
 import { _cancelTimers as cancelTimers } from '@ember/runloop';
-import { waitUntil, isSettled, getSettledState } from '@ember/test-helpers';
-import { getDebugInfo } from '@ember/test-helpers';
+import {
+  getDebugInfo,
+  getSettledState,
+  isSettled,
+  waitUntil,
+} from '@ember/test-helpers';
+
+import * as QUnit from 'qunit';
+
+import { isTest } from './types/util';
 
 /**
  * Detects if a specific test isn't isolated. A test is considered
@@ -18,18 +28,22 @@ import { getDebugInfo } from '@ember/test-helpers';
  * @param {string} testInfo.module The name of the test module
  * @param {string} testInfo.name The test name
  */
-export function detectIfTestNotIsolated(test, message = '') {
+export function detectIfTestNotIsolated(test: QUnit.Test, message = ''): void {
   if (!isSettled()) {
-    let { debugInfo } = getSettledState();
+    const { debugInfo } = getSettledState();
 
     console.group(`${test.module.name}: ${test.testName}`);
     debugInfo.toConsole();
     console.groupEnd();
 
-    test.expected++;
+    assert('detectIfTestNotIsolated called on skipped test', !test.skip);
+
+    test.expected = (test.expected ?? 0) + 1;
     test.assert.pushResult({
       result: false,
       message: `${message} \nMore information has been printed to the console. Please use that information to help in debugging.\n\n`,
+      actual: null,
+      expected: null,
     });
   }
 }
@@ -42,20 +56,29 @@ export function detectIfTestNotIsolated(test, message = '') {
  * @function installTestNotIsolatedHook
  * @param {number} delay the delay delay to use when checking for isolation validation
  */
-export function installTestNotIsolatedHook(delay = 50) {
+export function installTestNotIsolatedHook(delay = 50): void {
   if (!getDebugInfo()) {
     return;
   }
 
-  let test = QUnit.config.current;
-  let finish = test.finish;
-  let pushFailure = test.pushFailure;
+  const test: unknown = QUnit.config.current;
+
+  assert(
+    'installTestNotIsolatedHook called with no current test',
+    isTest(test)
+  );
+
+  const finish = test.finish;
+  const pushFailure = test.pushFailure;
 
-  test.pushFailure = function (message) {
-    if (message.indexOf('Test took longer than') === 0) {
+  test.pushFailure = function (
+    ...args: Parameters<typeof pushFailure>
+  ): ReturnType<typeof pushFailure> {
+    const [message] = args;
+    if (message.startsWith('Test took longer than')) {
       detectIfTestNotIsolated(this, message);
     } else {
-      return pushFailure.apply(this, arguments);
+      pushFailure.apply(this, args);
     }
   };
 
@@ -74,8 +97,10 @@ export function installTestNotIsolatedHook(delay = 50) {
   // - 'QUnit.done'
   //    - it detaches the failure from the actual test that failed, making it
   //      more confusing to the end user.
-  test.finish = function () {
-    let doFinish = () => finish.apply(this, arguments);
+  test.finish = function (
+    ...args: Parameters<typeof finish>
+  ): ReturnType<typeof finish> {
+    const doFinish = (): ReturnType<typeof finish> => finish.apply(this, args);
 
     if (isSettled()) {
       return doFinish();
@@ -96,6 +121,7 @@ export function installTestNotIsolatedHook(delay = 50) {
           // canceling timers here isn't perfect, but is as good as we can do
           // to attempt to prevent future tests from failing due to this test's
           // leakage
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
           cancelTimers();
 
           return doFinish();
diff --git a/addon-test-support/test-loader.js b/addon-test-support/test-loader.ts
similarity index 67%
rename from addon-test-support/test-loader.js
rename to addon-test-support/test-loader.ts
index 1d111f4e..9e4f60a4 100644
--- a/addon-test-support/test-loader.js
+++ b/addon-test-support/test-loader.ts
@@ -1,26 +1,29 @@
-import * as QUnit from 'qunit';
 import AbstractTestLoader, {
   addModuleExcludeMatcher,
   addModuleIncludeMatcher,
 } from 'ember-cli-test-loader/test-support/index';
+import * as QUnit from 'qunit';
 
 addModuleExcludeMatcher(function (moduleName) {
-  return QUnit.urlParams.nolint && moduleName.match(/\.(jshint|lint-test)$/);
+  return (
+    !!QUnit.urlParams['nolint'] && /\.(jshint|lint-test)$/.test(moduleName)
+  );
 });
 
 addModuleIncludeMatcher(function (moduleName) {
-  return moduleName.match(/\.jshint$/);
+  return moduleName.endsWith('.jshint');
 });
 
-let moduleLoadFailures = [];
+let moduleLoadFailures: unknown[] = [];
 
 QUnit.done(function () {
-  let length = moduleLoadFailures.length;
+  const length = moduleLoadFailures.length;
 
   try {
     if (length === 0) {
       // do nothing
     } else if (length === 1) {
+      // eslint-disable-next-line @typescript-eslint/no-throw-literal
       throw moduleLoadFailures[0];
     } else {
       throw new Error('\n' + moduleLoadFailures.join('\n'));
@@ -31,12 +34,13 @@ QUnit.done(function () {
   }
 });
 
-export class TestLoader extends AbstractTestLoader {
-  moduleLoadFailure(moduleName, error) {
+class TestLoader extends AbstractTestLoader {
+  override moduleLoadFailure(moduleName: string, error: unknown): void {
     moduleLoadFailures.push(error);
 
     QUnit.module('TestLoader Failures');
     QUnit.test(moduleName + ': could not be loaded', function () {
+      // eslint-disable-next-line @typescript-eslint/no-throw-literal
       throw error;
     });
   }
@@ -56,6 +60,6 @@ export class TestLoader extends AbstractTestLoader {
 
    @method loadTests
  */
-export function loadTests() {
-  new TestLoader().loadModules();
+export function loadTests(): void {
+  TestLoader.load();
 }
diff --git a/addon-test-support/types/util.ts b/addon-test-support/types/util.ts
new file mode 100644
index 00000000..abd0966e
--- /dev/null
+++ b/addon-test-support/types/util.ts
@@ -0,0 +1,10 @@
+import type { Test } from 'qunit';
+
+/** Checks if the given value is a `Record<string, unknown>`. */
+export function isRecord(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === 'object';
+}
+
+export function isTest(value: unknown): value is Test {
+  return isRecord(value) && 'testId' in value;
+}
diff --git a/package.json b/package.json
index 81366758..babc0be4 100644
--- a/package.json
+++ b/package.json
@@ -21,18 +21,20 @@
     "doc": "doc",
     "test": "tests"
   },
-  "types": "types/index.d.ts",
   "scripts": {
     "build": "ember build --environment=production",
     "lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
+    "lint:ts": "tsc --noEmit",
     "start": "ember serve",
     "test": "npm-run-all --print-name \"lint\" \"test:*\"",
-    "test:types": "tsc --noEmit --project types",
+    "test:types": "tsc --noEmit --project type-tests",
     "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each"
+    "test:ember-compatibility": "ember try:each",
+    "prepack": "ember ts:precompile",
+    "postpack": "ember ts:clean"
   },
   "dependencies": {
     "broccoli-funnel": "^3.0.8",
@@ -41,6 +43,7 @@
     "ember-auto-import": "^2.6.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-test-loader": "^3.0.0",
+    "ember-cli-typescript": "^5.2.1",
     "resolve-package-path": "^4.0.3",
     "silent-error": "^1.1.1",
     "validate-peer-dependencies": "^2.2.0"
@@ -49,12 +52,14 @@
     "@babel/core": "^7.20.5",
     "@babel/eslint-parser": "^7.19.1",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.9.3",
+    "@ember/test-helpers": "emberjs/ember-test-helpers#master",
     "@embroider/test-setup": "^2.1.1",
     "@glimmer/component": "^1.1.2",
     "@tsconfig/ember": "^2.0.0",
     "@types/qunit": "^2.19.4",
     "@types/rsvp": "^4.0.4",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
     "ember-angle-bracket-invocation-polyfill": "^3.0.2",
     "ember-cli": "~4.10.0",
     "ember-cli-dependency-checker": "^3.3.1",
@@ -88,7 +93,7 @@
     "qunit": "^2.13.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": "16.* || >= 18"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -125,7 +130,7 @@
     }
   },
   "volta": {
-    "node": "14.19.1",
+    "node": "16.19.1",
     "yarn": "1.22.18"
   }
 }
diff --git a/tests/dummy/app/config/environment.d.ts b/tests/dummy/app/config/environment.d.ts
new file mode 100644
index 00000000..a8f92b9f
--- /dev/null
+++ b/tests/dummy/app/config/environment.d.ts
@@ -0,0 +1,14 @@
+/**
+ * Type declarations for
+ *    import config from 'my-app/config/environment'
+ */
+declare const config: {
+  environment: string;
+  modulePrefix: string;
+  podModulePrefix: string;
+  locationType: 'history' | 'hash' | 'none' | 'auto';
+  rootURL: string;
+  APP: Record<string, unknown>;
+};
+
+export default config;
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..9988f562
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,37 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    // The combination of `baseUrl` with `paths` allows Ember's classic package
+    // layout, which is not resolvable with the Node resolution algorithm, to
+    // work with TypeScript.
+    "baseUrl": ".",
+    "paths": {
+      "dummy/tests/*": ["tests/*"],
+      "dummy/*": ["tests/dummy/app/*", "app/*"],
+      "ember-qunit": ["addon-test-support"],
+      "ember-qunit/*": ["addon-test-support/*"],
+      "*": ["types/*"]
+    }
+  },
+  "include": [
+    "app/**/*",
+    "addon/**/*",
+    "tests/**/*",
+    "types/**/*",
+    "test-support/**/*",
+    "addon-test-support/**/*"
+  ],
+
+  // type checking
+  "strict": true,
+  "allowUnreachableCode": false,
+  "allowUnusedLabels": false,
+  "exactOptionalPropertyTypes": true,
+  "noFallthroughCasesInSwitch": true,
+  "noImplicitOverride": true,
+  "noImplicitReturns": true,
+  "noPropertyAccessFromIndexSignature": true,
+  "noUncheckedIndexedAccess": true,
+  "noUnusedLocals": true,
+  "noUnusedParameters": true
+}
diff --git a/types/tests.ts b/type-tests/api.ts
similarity index 80%
rename from types/tests.ts
rename to type-tests/api.ts
index 7846beb8..f86305fe 100644
--- a/types/tests.ts
+++ b/type-tests/api.ts
@@ -1,46 +1,36 @@
-// These tests were ported directly from DefinitelyTyped and are unlikely to be
-// 100% desireable for the future.
 import { hbs } from 'ember-cli-htmlbars';
-import { module } from 'qunit';
+import { module, test, skip, only, todo } from 'qunit';
 import {
   start,
-  test,
-  skip,
-  only,
-  todo,
-  setResolver,
   setupRenderingTest,
   setupTest,
   SetupTestOptions,
   setupApplicationTest,
 } from 'ember-qunit';
-import { render, RenderingTestContext, TestContext } from '@ember/test-helpers';
+import type { RenderingTestContext, TestContext } from '@ember/test-helpers';
+import { render } from '@ember/test-helpers';
 import EmberResolver from 'ember-resolver';
-import EmberObject from '@ember/object';
-
-// if you don't have a custom resolver, do it like this:
-setResolver(EmberResolver.create());
+import type EmberObject from '@ember/object';
 
 // (modified) tests ported from ember-test-helpers
 module('rendering', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', function (this: RenderingTestContext, assert) {
+  test('it renders', async function (this: RenderingTestContext, assert) {
     assert.expect(2);
 
     // setup the outer context
     this.set('value', 'cat');
 
     // render the component
-    this.render(hbs`
-            {{ x-foo value=value action="result" }}
-        `);
+    await render(hbs`
+      {{ x-foo value=value action="result" }}
+    `);
 
-    // has to be a template
-    // @ts-expect-error
-    this.render();
-    // @ts-expect-error
-    this.render('{{ x-foo value=value action="result" }}');
+    // @ts-expect-error has to be a template
+    await render();
+    // @ts-expect-error has to be a template
+    await render('{{ x-foo value=value action="result" }}');
 
     const el = this.element.querySelector('div');
     assert.equal(el?.innerText, 'cat', 'The component shows the correct value');
@@ -70,12 +60,13 @@ module('rendering', function (hooks) {
     const inputFormat2 = this.get('inputFormat');
 
     // render the component on the page
-    this.render(hbs`<div>bar</div>`);
+    await render(hbs`<div>bar</div>`);
     assert.equal(this.element.querySelector('div')?.innerText, 'bar');
   });
 });
 
 module('misc and async', function (hooks) {
+  // eslint-disable-next-line @typescript-eslint/require-await
   hooks.beforeEach(async function (assert) {
     assert.ok(true, 'hooks can be async');
   });
@@ -94,13 +85,10 @@ module('misc and async', function (hooks) {
     assert.equal(subject.get('result'), 'bar');
   });
 
-  // This test is intended to ensure the appropriate behavior for @typescript-eslint/no-misused-promises.
-  // However, we don't actually use typescript-eslint in this project and tslint has no equivalent,
-  // so we can't properly test it.
   test('it can be async', async function (this: RenderingTestContext, assert) {
     assert.expect(1);
 
-    await this.render(hbs`<p>Hello</p>`);
+    await render(hbs`<p>Hello</p>`);
 
     assert.ok(true, 'rendered');
   });
@@ -115,34 +103,28 @@ module('misc and async', function (hooks) {
   skip('it can skip async', async function (this: RenderingTestContext, assert) {
     assert.expect(1);
 
-    await this.render(hbs`<p>Hello</p>`);
+    await render(hbs`<p>Hello</p>`);
 
     assert.ok(true, 'rendered');
   });
 
-  // This test is intended to ensure the appropriate behavior for @typescript-eslint/no-misused-promises.
-  // However, we don't actually use typescript-eslint in this project and tslint has no equivalent,
-  // so we can't properly test it.
   only(
     'it can only run async',
     async function (this: RenderingTestContext, assert) {
       assert.expect(1);
 
-      await this.render(hbs`<p>Hello</p>`);
+      await render(hbs`<p>Hello</p>`);
 
       assert.ok(true, 'rendered');
     }
   );
 
-  // This test is intended to ensure the appropriate behavior for @typescript-eslint/no-misused-promises.
-  // However, we don't actually use typescript-eslint in this project and tslint has no equivalent,
-  // so we can't properly test it.
   todo(
     'it can have an async todo',
     async function (this: RenderingTestContext, assert) {
       assert.expect(1);
 
-      await this.render(hbs`<p>Hello</p>`);
+      await render(hbs`<p>Hello</p>`);
 
       assert.ok(true, 'rendered');
     }
@@ -151,11 +133,11 @@ module('misc and async', function (hooks) {
 // end tests ported from ember-test-helpers
 
 module('returning a promise', function () {
-  test('it can return Promise<void>', function (this: TestContext, assert) {
+  test('it can return Promise<void>', async function (this: TestContext, assert) {
     return Promise.resolve();
   });
 
-  test('it can return a non-empty Promise', function (this: TestContext, assert) {
+  test('it can return a non-empty Promise', async function (this: TestContext, assert) {
     return Promise.resolve('foo');
   });
 });
@@ -324,7 +306,7 @@ start();
 
 module('with setup options', function (hooks) {
   // $ExpectType SetupTestOptions | undefined
-  type SetupTestOptions = Parameters<typeof setupTest>[1];
+  type _SetupTestOptions = Parameters<typeof setupTest>[1];
   // $ExpectType SetupTestOptions | undefined
   type SetupRenderingTestOptions = Parameters<typeof setupRenderingTest>[1];
   // $ExpectType SetupTestOptions | undefined
diff --git a/type-tests/tsconfig.json b/type-tests/tsconfig.json
new file mode 100644
index 00000000..aa5bffee
--- /dev/null
+++ b/type-tests/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "@tsconfig/ember",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "paths": {
+      "ember-qunit": ["addon-test-support"],
+      "ember-qunit/*": ["addon-test-support/*"],
+      "*": ["types/*"]
+    }
+  },
+  "include": ["api.ts", "../types/**/*"]
+}
diff --git a/types/local-types.d.ts b/types/dummy/index.d.ts
similarity index 100%
rename from types/local-types.d.ts
rename to types/dummy/index.d.ts
diff --git a/types/ember-cli-test-loader/test-support/index.d.ts b/types/ember-cli-test-loader/test-support/index.d.ts
new file mode 100644
index 00000000..726b2f1d
--- /dev/null
+++ b/types/ember-cli-test-loader/test-support/index.d.ts
@@ -0,0 +1,32 @@
+declare module 'ember-cli-test-loader/test-support/index' {
+  export default class TestLoader {
+    /** Instantiates a new TestLoader and loads the modules. */
+    static load(): void;
+
+    /**
+     * Can be overridden in order to customize the criteria for identifying test
+     * modules.
+     */
+    shouldLoadModule(moduleName: string): boolean;
+
+    moduleLoadFailure(moduleName: string, error: unknown): void;
+
+    /** Use `TestLoader.load()` static method instead. */
+    protected constructor();
+
+    // Assumed private:
+    // loadModules(): void;
+    // listModules(): string[];
+    // listTestModules(): string[];
+    // require(moduleName: string): void;
+    // unsee(moduleName: string): void;
+  }
+
+  export function addModuleExcludeMatcher(
+    matcher: (moduleName: string) => boolean
+  ): void;
+
+  export function addModuleIncludeMatcher(
+    matcher: (moduleName: string) => boolean
+  ): void;
+}
diff --git a/types/global.d.ts b/types/global.d.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/types/tsconfig.json b/types/tsconfig.json
deleted file mode 100644
index 9b0a3352..00000000
--- a/types/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "@tsconfig/ember",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "ember-qunit": [
-        "./index.d.ts"
-      ],
-    }
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 1c24c17f..60f7502d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1100,21 +1100,20 @@
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
 
-"@ember/test-helpers@^2.9.3":
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.3.tgz#c2a9d6ab1c367af92cf1a334f97eb19b8e06e6e1"
-  integrity sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==
+"@ember/test-helpers@emberjs/ember-test-helpers#master":
+  version "2.9.0"
+  resolved "https://codeload.github.com/emberjs/ember-test-helpers/tar.gz/22bd212187b14b63d448332e0755a2b9ea5cef31"
   dependencies:
-    "@ember/test-waiters" "^3.0.0"
+    "@ember/test-waiters" "^3.0.2"
     "@embroider/macros" "^1.10.0"
     "@embroider/util" "^1.9.0"
     broccoli-debug "^0.6.5"
     broccoli-funnel "^3.0.8"
+    ember-auto-import "^2.6.0"
     ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.1.1"
-    ember-destroyable-polyfill "^2.0.3"
+    ember-cli-htmlbars "^6.2.0"
 
-"@ember/test-waiters@^3.0.0":
+"@ember/test-waiters@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f"
   integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ==
@@ -1124,7 +1123,21 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.9.0":
+"@embroider/macros@^1.0.0", "@embroider/macros@^1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.9.0.tgz#0df2a56fdd93f11fddea450b6ca83cc2119b5008"
+  integrity sha512-12ElrRT+mX3aSixGHjHnfsnyoH1hw5nM+P+Ax0ITZdp6TaAvWZ8dENnVHltdnv4ssHiX0EsVEXmqbIIdMN4nLA==
+  dependencies:
+    "@embroider/shared-internals" "1.8.3"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
+"@embroider/macros@^1.10.0":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
   integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
@@ -1138,6 +1151,20 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/shared-internals@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9"
+  integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==
+  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.0.0", "@embroider/shared-internals@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
@@ -1691,6 +1718,11 @@
   resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
   integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+
 "@types/serve-static@*":
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
@@ -1709,6 +1741,90 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
   integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
 
+"@typescript-eslint/eslint-plugin@^5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz#2c821ad81b2c786d142279a8292090f77d1881f4"
+  integrity sha512-+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.54.0"
+    "@typescript-eslint/type-utils" "5.54.0"
+    "@typescript-eslint/utils" "5.54.0"
+    debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    regexpp "^3.2.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.54.0.tgz#def186eb1b1dbd0439df0dacc44fb6d8d5c417fe"
+  integrity sha512-aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.54.0"
+    "@typescript-eslint/types" "5.54.0"
+    "@typescript-eslint/typescript-estree" "5.54.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz#74b28ac9a3fc8166f04e806c957adb8c1fd00536"
+  integrity sha512-VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==
+  dependencies:
+    "@typescript-eslint/types" "5.54.0"
+    "@typescript-eslint/visitor-keys" "5.54.0"
+
+"@typescript-eslint/type-utils@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz#390717216eb61393a0cad2995da154b613ba7b26"
+  integrity sha512-WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.54.0"
+    "@typescript-eslint/utils" "5.54.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.0.tgz#7d519df01f50739254d89378e0dcac504cab2740"
+  integrity sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==
+
+"@typescript-eslint/typescript-estree@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz#f6f3440cabee8a43a0b25fa498213ebb61fdfe99"
+  integrity sha512-X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==
+  dependencies:
+    "@typescript-eslint/types" "5.54.0"
+    "@typescript-eslint/visitor-keys" "5.54.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.54.0.tgz#3db758aae078be7b54b8ea8ea4537ff6cd3fbc21"
+  integrity sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.54.0"
+    "@typescript-eslint/types" "5.54.0"
+    "@typescript-eslint/typescript-estree" "5.54.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.54.0":
+  version "5.54.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz#846878afbf0cd67c19cfa8d75947383d4490db8f"
+  integrity sha512-xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==
+  dependencies:
+    "@typescript-eslint/types" "5.54.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -2034,7 +2150,7 @@ ansi-styles@^6.1.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
-ansi-to-html@^0.6.6:
+ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
   version "0.6.15"
   resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
   integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
@@ -2240,7 +2356,7 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-babel-import-util@^1.1.0, babel-import-util@^1.2.0:
+babel-import-util@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
   integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
@@ -2288,16 +2404,6 @@ babel-plugin-ember-modules-api-polyfill@^3.5.0:
   dependencies:
     ember-rfc176-data "^0.3.17"
 
-babel-plugin-ember-template-compilation@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.2.tgz#e0695b8ad5a8fe6b2cbdff1eadb01cf402731ad6"
-  integrity sha512-4HBMksmlYsWEf/C/n3uW5rkBRbUp4FNaspzdQTAHgLbfCJnkLze8R6i6sUSge48y/Wne7mx+vcImI1o6rlUwXQ==
-  dependencies:
-    babel-import-util "^1.2.0"
-    line-column "^1.0.2"
-    magic-string "^0.26.0"
-    string.prototype.matchall "^4.0.5"
-
 babel-plugin-ember-template-compilation@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57"
@@ -3671,7 +3777,7 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3904,7 +4010,43 @@ ember-angle-bracket-invocation-polyfill@^3.0.2:
     ember-compatibility-helpers "^1.0.2"
     silent-error "^1.1.1"
 
-ember-auto-import@^2.4.1, ember-auto-import@^2.6.0:
+ember-auto-import@^2.4.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
+  integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
+  dependencies:
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^2.0.0"
+    babel-loader "^8.0.6"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-htmlbars-inline-precompile "^5.2.1"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    css-loader "^5.2.0"
+    debug "^4.3.1"
+    fs-extra "^10.0.0"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mini-css-extract-plugin "^2.5.2"
+    parse5 "^6.0.1"
+    resolve "^1.20.0"
+    resolve-package-path "^4.0.3"
+    semver "^7.3.4"
+    style-loader "^2.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^3.0.0"
+
+ember-auto-import@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.0.tgz#c7a2f799c9b700d74648cb02e35cf7bc1b44ac02"
   integrity sha512-xUyypxlaqWvrx2KSseLus0H8K7Dt+sXNCvcxtquT2EmIM6r67NuQUT9woiEMa9UBvqcaX2k9hNLeubDl78saig==
@@ -3945,7 +4087,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -3997,26 +4139,6 @@ ember-cli-get-component-path-option@^1.0.0:
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
   integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==
 
-ember-cli-htmlbars@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
-  integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
-  dependencies:
-    "@ember/edition-utils" "^1.2.0"
-    babel-plugin-ember-template-compilation "^1.0.0"
-    babel-plugin-htmlbars-inline-precompile "^5.3.0"
-    broccoli-debug "^0.6.5"
-    broccoli-persistent-filter "^3.1.2"
-    broccoli-plugin "^4.0.3"
-    ember-cli-version-checker "^5.1.2"
-    fs-tree-diff "^2.0.1"
-    hash-for-dep "^1.5.1"
-    heimdalljs-logger "^0.1.10"
-    js-string-escape "^1.0.1"
-    semver "^7.3.4"
-    silent-error "^1.1.1"
-    walk-sync "^2.2.0"
-
 ember-cli-htmlbars@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
@@ -4139,6 +4261,22 @@ ember-cli-typescript@^2.0.2:
     stagehand "^1.0.0"
     walk-sync "^1.0.0"
 
+ember-cli-typescript@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.2.1.tgz#553030f1ce3e8958b8e4fc34909acd1218cb35f2"
+  integrity sha512-qqp5TAIuPHxHiGXJKL+78Euyhy0zSKQMovPh8sJpN/ZBYx0H90pONufHR3anaMcp1snVfx4B+mb9+7ijOik8ZA==
+  dependencies:
+    ansi-to-html "^0.6.15"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.0"
+
 ember-cli-version-checker@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@@ -4273,7 +4411,7 @@ ember-cli@~4.10.0:
     workerpool "^6.2.1"
     yam "^1.0.0"
 
-ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1:
+ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
   integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
@@ -4284,15 +4422,6 @@ ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.2, ember-co
     fs-extra "^9.1.0"
     semver "^5.4.1"
 
-ember-destroyable-polyfill@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1"
-  integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==
-  dependencies:
-    ember-cli-babel "^7.22.1"
-    ember-cli-version-checker "^5.1.1"
-    ember-compatibility-helpers "^1.2.1"
-
 ember-disable-prototype-extensions@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
@@ -4693,7 +4822,7 @@ eslint-plugin-prettier@^4.2.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-scope@5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -5054,7 +5183,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.0.3, fast-glob@^3.2.11:
+fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -5778,6 +5907,18 @@ globby@13.1.2:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 globrex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
@@ -7336,13 +7477,6 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.26.0:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
-  integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
-  dependencies:
-    sourcemap-codec "^1.4.8"
-
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -7997,6 +8131,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -10494,7 +10633,7 @@ tree-sync@^2.0.0, tree-sync@^2.1.0:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
-tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -10504,6 +10643,13 @@ tslib@^2.0.1, tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"