From 00aa96c49cd245be6345c9256f716378489fd6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Thu, 20 Dec 2018 12:35:15 +0100
Subject: [PATCH 1/2] fix(glimmer-wrapper): add `normalize` method for
 `Registry#has`

---
 mu-trees/addon/resolvers/glimmer-wrapper/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mu-trees/addon/resolvers/glimmer-wrapper/index.js b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
index 3aec22e6..ea1926e9 100644
--- a/mu-trees/addon/resolvers/glimmer-wrapper/index.js
+++ b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
@@ -81,7 +81,15 @@ const Resolver = GlobalsResolver.extend({
     this._glimmerResolver = new GlimmerResolver(this.config, this.glimmerModuleRegistry);
   },
 
-  normalize: null,
+  normalize(specifier) {
+    // This method is called by `Registry#validateInjections` in dev mode.
+    // https://github.com/ember-cli/ember-resolver/issues/299
+    const [type, name] = specifier.split(':', 2);
+    if (name && (type === 'service' || type === 'controller')) {
+      return `${type}:${dasherize(name)}`;
+    }
+    return specifier;
+  },
 
   expandLocalLookup(specifier, source, namespace) {
     if (isAbsoluteSpecifier(specifier)) {

From ff5212940c659fe0673be52a3527b1acf4f37e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Tue, 25 Dec 2018 14:53:27 +0100
Subject: [PATCH 2/2] perf(glimmer-wrapper): only add `normalize` for debug
 builds

---
 .../addon/resolvers/glimmer-wrapper/index.js  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/mu-trees/addon/resolvers/glimmer-wrapper/index.js b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
index ea1926e9..14dee728 100644
--- a/mu-trees/addon/resolvers/glimmer-wrapper/index.js
+++ b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
@@ -1,3 +1,4 @@
+import { DEBUG } from '@glimmer/env';
 import GlimmerResolver from '@glimmer/resolver/resolver';
 import RequireJSRegistry from '../../module-registries/requirejs';
 import GlobalsResolver from '@ember/application/globals-resolver';
@@ -81,15 +82,7 @@ const Resolver = GlobalsResolver.extend({
     this._glimmerResolver = new GlimmerResolver(this.config, this.glimmerModuleRegistry);
   },
 
-  normalize(specifier) {
-    // This method is called by `Registry#validateInjections` in dev mode.
-    // https://github.com/ember-cli/ember-resolver/issues/299
-    const [type, name] = specifier.split(':', 2);
-    if (name && (type === 'service' || type === 'controller')) {
-      return `${type}:${dasherize(name)}`;
-    }
-    return specifier;
-  },
+  normalize: null,
 
   expandLocalLookup(specifier, source, namespace) {
     if (isAbsoluteSpecifier(specifier)) {
@@ -147,4 +140,16 @@ const Resolver = GlobalsResolver.extend({
 
 });
 
+if (DEBUG) {
+  Resolver.prototype.normalize = function(specifier) {
+    // This method is called by `Registry#validateInjections` in dev mode.
+    // https://github.com/ember-cli/ember-resolver/issues/299
+    const [type, name] = specifier.split(':', 2);
+    if (name && (type === 'service' || type === 'controller')) {
+      return `${type}:${dasherize(name)}`;
+    }
+    return specifier;
+  }
+}
+
 export default Resolver;