Do not use global ember -- internalize template resolution cache

Author: NullVoxPopuli

addon/addon/index.js

@@ -1,11 +1,13 @@
 /* globals requirejs, require */
 
-import Ember from 'ember';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { dasherize, classify, underscore } from './string';
 import { DEBUG } from '@glimmer/env';
 import classFactory from './utils/class-factory';
+import { getOwner } from '@ember/owner';
+
+import { TEMPLATES } from './template-cache';
 
 if (typeof requirejs.entries === 'undefined') {
   requirejs.entries = requirejs._eak_seen;
@@ -295,7 +297,7 @@ class Resolver extends EmberObject {
   resolveTemplate(parsedName) {
     let resolved = this.resolveOther(parsedName);
     if (resolved == null) {
-      resolved = Ember.TEMPLATES[parsedName.fullNameWithoutType];
+      resolved = TEMPLATES[parsedName.fullNameWithoutType];
     }
     return resolved;
   }
@@ -459,7 +461,9 @@ class Resolver extends EmberObject {
 
   // only needed until 1.6.0-beta.2 can be required
   _logLookup(found, parsedName, description) {
-    if (!Ember.ENV.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) {
+    let owner = getOwner(this);
+    let env = owner?.resolveRegistration?.('config:environment');
+    if (!env?.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) {
       return;
     }
 

addon/addon/template-cache.js

@@ -0,0 +1,8 @@
+/**
+ * Originally: https://github.com/emberjs/ember.js/blob/28444d536fa20debef2a67e2f18c5eb11113a4b5/packages/%40ember/-internals/glimmer/lib/template_registry.ts#L9
+ *
+ * import { TEMPLATES } from 'ember';
+ *
+ * Removed for RFC 1003
+ */
+export let TEMPLATES = {};

test-app/tests/unit/resolvers/classic/-setup-resolver.js

@@ -1,9 +1,13 @@
 import Resolver, { ModuleRegistry } from 'ember-resolver';
+import { setOwner } from '@ember/owner';
 
 export let resolver;
 export let loader;
 
 export function setupResolver(options = {}) {
+  let owner = options.owner;
+  delete options.owner;
+
   if (!options.namespace) {
     options.namespace = { modulePrefix: 'appkit' };
   }
@@ -22,4 +26,8 @@ export function setupResolver(options = {}) {
   };
 
   resolver = Resolver.create(options);
+
+  if (owner) {
+    setOwner(resolver, owner);
+  }
 }

test-app/tests/unit/resolvers/classic/basic-test.js

@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 
-import Ember from 'ember';
 import { module, test } from 'qunit';
 import { setupResolver, resolver, loader } from './-setup-resolver';
+import { TEMPLATES } from 'ember-resolver/template-cache';
 
 let originalConsoleInfo;
 
@@ -434,7 +434,7 @@ module('ember-resolver/resolvers/classic', function (hooks) {
   });
 
   test('can lookup templates via Ember.TEMPLATES', function (assert) {
-    Ember.TEMPLATES['application'] = function () {
+    TEMPLATES['application'] = function () {
       return '<h1>herp</h1>';
     };
 

test-app/tests/unit/resolvers/classic/logging-test.js

@@ -1,18 +1,20 @@
-import Ember from 'ember';
 import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 
 import { setupResolver, resolver, loader } from './-setup-resolver';
 
 let originalConsoleInfo, logCalls;
 
 module('Logging', function (hooks) {
+  setupTest(hooks);
+
   hooks.beforeEach(function () {
     originalConsoleInfo = console ? console.info : null;
     logCalls = [];
     console.info = function (arg) {
       logCalls.push(arg);
     };
-    setupResolver();
+    setupResolver({ owner: this.owner });
   });
 
   hooks.afterEach(function () {
@@ -26,7 +28,8 @@ module('Logging', function (hooks) {
       return 'is logged';
     });
 
-    Ember.ENV.LOG_MODULE_RESOLVER = true;
+    let env = this.owner.resolveRegistration('config:environment');
+    env.LOG_MODULE_RESOLVER = true;
 
     resolver.resolve('fruit:orange');
 
@@ -38,7 +41,8 @@ module('Logging', function (hooks) {
       return 'is not logged';
     });
 
-    Ember.ENV.LOG_MODULE_RESOLVER = false;
+    let env = this.owner.resolveRegistration('config:environment');
+    env.LOG_MODULE_RESOLVER = false;
 
     resolver.resolve('fruit:orange');