Merge pull request #1537 from emberjs/nvp/resolve-deprecations-barrel

Resolve deprecations from ember barrel file

Author: kategengler

addon/src/-internal/-owner-mixin-imports.ts

@@ -2,18 +2,15 @@ import type { Resolver } from '@ember/owner';
 import ApplicationInstance from '@ember/application/instance';
 import Application from '@ember/application';
 import EmberObject from '@ember/object';
-
-import Ember from 'ember';
+import { Registry } from '@ember/-internals/container';
+import { ComponentLookup } from '@ember/-internals/views';
 
 import type { FullName } from '@ember/owner';
 
-// These shenanigans work around the fact that the import locations are not
-// public API and are not stable, so we jump through hoops to get the right
-// types and values to use.
 import {
   ContainerProxyMixin,
   RegistryProxyMixin,
-} from './-owner-mixin-imports.ts';
+} from '@ember/-internals/runtime';
 
 /**
  * Adds methods that are normally only on registry to the container. This is largely to support the legacy APIs
@@ -102,10 +99,9 @@ export default function buildRegistry(resolver: Resolver) {
   const fallbackRegistry = Application.buildRegistry(namespace);
   // TODO: only do this on Ember < 3.13
   // @ts-ignore: this is private API.
-  fallbackRegistry.register('component-lookup:main', Ember.ComponentLookup);
+  fallbackRegistry.register('component-lookup:main', ComponentLookup);
 
-  // @ts-ignore: this is private API.
-  const registry = new Ember.Registry({
+  const registry = new Registry({
     fallback: fallbackRegistry,
   });
 

addon/src/-internal/build-registry.ts

@@ -9,7 +9,7 @@ import { setOwner } from '@ember/application';
 import buildOwner, { type Owner } from './build-owner.ts';
 import { _setupAJAXHooks } from './settled.ts';
 import { _prepareOnerror } from './setup-onerror.ts';
-import Ember from 'ember';
+import { setTesting } from '@ember/debug';
 import {
   assert,
   registerDeprecationHandler,
@@ -379,7 +379,7 @@ export default function setupContext<T extends object>(
   const context = base as T & TestContext;
 
   // SAFETY: this is intimate API *designed* for us to override.
-  (Ember as any).testing = true;
+  setTesting(true);
   setContext(context);
 
   const testMetadata = getTestMetadata(context);

addon/src/setup-context.ts

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { type BaseContext, getContext } from './setup-context.ts';
 
 const cachedOnerror: Map<BaseContext, ((error: Error) => void) | undefined> =
@@ -39,7 +39,7 @@ export default function setupOnerror(onError?: (error: Error) => void): void {
     onError = cachedOnerror.get(context);
   }
 
-  Ember.onerror = onError;
+  setOnerror(onError);
 }
 
 /**
@@ -60,7 +60,7 @@ export function resetOnerror(): void {
   const context = getContext();
 
   if (context && cachedOnerror.has(context)) {
-    Ember.onerror = cachedOnerror.get(context);
+    setOnerror(cachedOnerror.get(context));
   }
 }
 
@@ -76,7 +76,8 @@ export function _prepareOnerror(context: BaseContext) {
     throw new Error('_prepareOnerror should only be called once per-context');
   }
 
-  cachedOnerror.set(context, Ember.onerror);
+  // SAFETY: getOnerror doesn't have correct types
+  cachedOnerror.set(context, getOnerror() as any);
 }
 
 /**

addon/src/setup-onerror.ts

@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import Ember from 'ember';
+import { EventDispatcher } from '@ember/-internals/views';
 import global from './global.ts';
 import {
   type BaseContext,
@@ -265,9 +265,8 @@ export default function setupRenderingContext(
       // manually start the event dispatcher.
       if (owner._emberTestHelpersMockOwner) {
         const dispatcher =
-          owner.lookup('event_dispatcher:main') ||
-          (Ember.EventDispatcher as any).create();
-        dispatcher.setup({}, '#ember-testing');
+          owner.lookup('event_dispatcher:main') || EventDispatcher.create();
+        (dispatcher as any).setup({}, '#ember-testing');
       }
 
       const OutletView = owner.factoryFor

addon/src/setup-rendering-context.ts

@@ -1,5 +1,5 @@
 import type { TestContext } from './setup-context';
-import Ember from 'ember';
+import { setTesting } from '@ember/debug';
 import { unsetContext } from './setup-context.ts';
 import settled, { _teardownAJAXHooks } from './settled.ts';
 import { _cleanupOnerror } from './setup-onerror.ts';
@@ -31,14 +31,10 @@ export default function teardownContext(
   return Promise.resolve()
     .then(() => {
       _cleanupOnerror(context);
-
       _teardownAJAXHooks();
 
-      // SAFETY: this is intimate API *designed* for us to override.
-      (Ember as any).testing = false;
-
+      setTesting(false);
       unsetContext();
-
       destroy(context.owner);
     })
     .finally(() => {

addon/src/teardown-context.ts

@@ -1,4 +1,7 @@
-import Ember from 'ember';
+// Private API
+import { getOnerror } from '@ember/-internals/error-handling';
+// Private API
+import { isTesting, setTesting } from '@ember/debug';
 
 type ErrorHandlerValidation =
   | Readonly<{ isValid: true; message: null }>
@@ -34,24 +37,24 @@ const INVALID = Object.freeze({
  * });
  */
 export default function validateErrorHandler(
-  callback = Ember.onerror,
+  callback = getOnerror(),
 ): ErrorHandlerValidation {
   if (callback === undefined || callback === null) {
     return VALID;
   }
 
   const error = new Error('Error handler validation error!');
 
-  const originalEmberTesting = Ember.testing;
-  (Ember as any).testing = true;
+  const originalEmberTesting = isTesting();
+  setTesting(true);
   try {
     callback(error);
   } catch (e) {
     if (e === error) {
       return VALID;
     }
   } finally {
-    (Ember as any).testing = originalEmberTesting;
+    setTesting(originalEmberTesting);
   }
 
   return INVALID;

addon/src/validate-error-handler.ts

@@ -70,6 +70,7 @@
     "pretender": "^3.4.7",
     "prettier": "^2.8.7",
     "qunit": "^2.21.1",
+    "qunit-console-grouper": "^0.3.0",
     "qunit-dom": "^3.2.0",
     "tracked-built-ins": "^3.1.1",
     "webpack": "^5.78.0"

test-app/package.json

@@ -1,15 +1,16 @@
 import { resolve } from 'rsvp';
+import { setTesting } from '@ember/debug';
 import { module } from 'qunit';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 import { setResolverRegistry } from './resolver';
 import QUnitTestAdapter from './qunit-test-adapter';
-import Ember from 'ember';
+import { setAdapter } from 'ember-testing/lib/setup_for_testing';
 
 export default function (name, options = {}) {
   module(name, {
     beforeEach() {
-      Ember.Test.adapter = QUnitTestAdapter.create();
+      setAdapter(QUnitTestAdapter.create());
 
       if (options.registry) {
         setResolverRegistry(options.registry);
@@ -20,7 +21,7 @@ export default function (name, options = {}) {
       );
       this.fixtureResetValue = testElementContainer.innerHTML;
 
-      Ember.testing = true;
+      setTesting(true);
       this.application = startApp();
 
       if (options.beforeEach) {
@@ -34,7 +35,7 @@ export default function (name, options = {}) {
       return resolve(afterEach)
         .then(() => destroyApp(this.application))
         .finally(() => {
-          Ember.testing = false;
+          setTesting(false);
 
           document.getElementById('ember-testing-container').innerHTML =
             this.fixtureResetValue;