Merge branch 'main' into cleanup-7-0-barrel

Author: ef4

index.html

@@ -15,15 +15,6 @@
       // Test under octane defaults
       EmberENV._DEFAULT_ASYNC_OBSERVERS = true;
 
-      // Test for "hooks in EmberENV.EMBER_LOAD_HOOKS['hookName'] get executed"
-      EmberENV.EMBER_LOAD_HOOKS = EmberENV.EMBER_LOAD_HOOKS || {};
-      EmberENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__ =
-        EmberENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__ || [];
-      EmberENV.__test_hook_count__ = 0;
-      EmberENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__.push(function (object) {
-        EmberENV.__test_hook_count__ += object;
-      });
-
       // Handle testing feature flags
       if (QUnit.urlParams.ENABLE_OPTIONAL_FEATURES) {
         EmberENV.ENABLE_OPTIONAL_FEATURES = true;

lib/index.js

@@ -54,7 +54,6 @@ const shim = addonV1Shim(path.join(__dirname, '..'), {
           './dist/dev/packages/@ember/-internals/views/lib/views/states.js',
           './dist/dev/packages/@ember/application/index.js',
           './dist/dev/packages/@ember/application/instance.js',
-          './dist/dev/packages/@ember/application/lib/lazy_load.js',
           './dist/dev/packages/@ember/application/namespace.js',
           './dist/dev/packages/@ember/array/-internals.js',
           './dist/dev/packages/@ember/array/index.js',

packages/@ember/-internals/environment/lib/env.ts

@@ -144,10 +144,6 @@ export const ENV = {
    */
   _RERENDER_LOOP_LIMIT: 1000,
 
-  EMBER_LOAD_HOOKS: {} as {
-    [hook: string]: Function[];
-  },
-
   FEATURES: {} as {
     [feature: string]: boolean;
   },
@@ -179,18 +175,6 @@ if (typeof EmberENV === 'object' && EmberENV !== null) {
     }
   }
 
-  // TODO this does not seem to be used by anything,
-  //      can we remove it? do we need to deprecate it?
-  let { EMBER_LOAD_HOOKS } = EmberENV;
-  if (typeof EMBER_LOAD_HOOKS === 'object' && EMBER_LOAD_HOOKS !== null) {
-    for (let hookName in EMBER_LOAD_HOOKS) {
-      if (!Object.prototype.hasOwnProperty.call(EMBER_LOAD_HOOKS, hookName)) continue;
-      let hooks = EMBER_LOAD_HOOKS[hookName];
-      if (Array.isArray(hooks)) {
-        ENV.EMBER_LOAD_HOOKS[hookName] = hooks.filter((hook) => typeof hook === 'function');
-      }
-    }
-  }
   let { FEATURES } = EmberENV;
   if (typeof FEATURES === 'object' && FEATURES !== null) {
     for (let feature in FEATURES) {

packages/@ember/application/index.ts

@@ -10,7 +10,6 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { join, once, run, schedule } from '@ember/runloop';
 import { libraries } from '@ember/-internals/metal';
-import { _loaded, onLoad, runLoadHooks } from './lib/lazy_load';
 import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
@@ -711,7 +710,6 @@ class Application extends Engine {
 
     try {
       this.runInitializers();
-      runLoadHooks('application', this);
       this.advanceReadiness();
       // Continues to `didBecomeReady`
     } catch (error) {
@@ -883,10 +881,6 @@ class Application extends Engine {
   willDestroy() {
     super.willDestroy();
 
-    if (_loaded['application'] === this) {
-      _loaded['application'] = undefined;
-    }
-
     if (this._applicationInstances.size) {
       this._applicationInstances.forEach((i) => i.destroy());
       this._applicationInstances.clear();
@@ -1137,4 +1131,4 @@ function commonSetupRegistry(registry: Registry) {
   registry.register('service:router', RouterService);
 }
 
-export { Application as default, _loaded, onLoad, runLoadHooks };
+export { Application as default };

packages/@ember/application/lib/lazy_load.ts

@@ -6,7 +6,6 @@ import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import EmberRoute from '@ember/routing/route';
 import Router from '@ember/routing/router';
 import NoneLocation from '@ember/routing/none-location';
-import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import {
@@ -298,14 +297,6 @@ moduleFor(
       );
     }
 
-    [`@test does not leak itself in onLoad._loaded`](assert) {
-      assert.equal(_loaded.application, undefined);
-      runTask(() => this.createApplication());
-      assert.equal(_loaded.application, this.application);
-      runTask(() => this.application.destroy());
-      assert.equal(_loaded.application, undefined);
-    }
-
     [`@test can build a registry via Application.buildRegistry() --- simulates ember-test-helpers`](
       assert
     ) {

packages/@ember/application/tests/application_test.js

@@ -352,7 +352,6 @@ module.exports = {
     'once',
     'one',
     'oneWay',
-    'onLoad',
     'onUpdateURL',
     'options',
     'optionsForType',
@@ -438,7 +437,6 @@ module.exports = {
     'runInDebug',
     'runInitializers',
     'runInstanceInitializers',
-    'runLoadHooks',
     'schedule',
     'scheduleOnce',
     'send',